Add support for runtime fall-back from o3d to o2d.

core/cross/client_info.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 59 matching lines @@
   bool glsl() const {
 #if defined(RENDERER_GLES2)
     return true;
 #else
     return false;
 #endif
   }
 
   // Whether render in 2d Mode
   bool render_2d() const {
-#if defined(SUPPORT_CAIRO) && defined(FORCE_CAIRO)
-    // Force Cairo o2d mode for testing purposes
-    return true;
-#elif defined(SUPPORT_CAIRO)
-    // Some day when we have fallback from o3d to o2d,
-    // this will have to support logic returning actual o2d vs. o3d mode.
-    return false;
-#else
-    return false;
-#endif
+    return render_2d_;
   }
 
   // Whether or not the underlying GPU supports non power of 2 textures.
   // NOTE: O3D always supports non power of 2 textures from a public API
   // point of view and massages the data underneath to make this work.
   // The point of this flag is mostly that if you are doing any kind of
   // dynamic texture updating, like video, then you might want to use a
   // power of two texture so O3D doesn't have to do extra work of converting
   // your NPOT texture into a POT texture behind the scenes.
   bool non_power_of_two_textures() const {
     return non_power_of_two_textures_;
   }
 
   // Gets the O3D version.
   const String& version() const {
     return version_;
   }
 
  private:
   friend class ClientInfoManager;
 
   int num_objects_;
   int texture_memory_used_;
   int buffer_memory_used_;
   bool software_renderer_;
   bool non_power_of_two_textures_;
+  bool render_2d_;
   String version_;
 };
 
 // A class to manage the client info so other classes can easily look it up.
 class ClientInfoManager {
  public:
   static const InterfaceId kInterfaceId;
 
   explicit ClientInfoManager(ServiceLocator* service_locator);
 
@@ skipping 12 matching lines @@
   }
 
   void SetSoftwareRenderer(bool used) {
     client_info_.software_renderer_ = used;
   }
 
   void SetNonPowerOfTwoTextures(bool npot) {
     client_info_.non_power_of_two_textures_ = npot;
   }
 
+  void SetRenderer2d(bool render2d) {

[Tristan Schmelcher 2, 2011/02/23 02:08:51]

This should be SetRender2d to match the property name.

+    client_info_.render_2d_ = render2d;
+  }
+
 private:
   ServiceImplementation<ClientInfoManager> service_;
 
   ClientInfo client_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientInfoManager);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_CLIENT_INFO_H_