Rewrote full-screen support on Windows. O3D now always creates its own...

core/cross/gl/renderer_gl.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 47 matching lines @@
   static RendererGL* CreateDefault(ServiceLocator* service_locator);
   virtual ~RendererGL();
 
   // Initialises the renderer for use, claiming hardware resources.
   virtual InitStatus InitPlatformSpecific(const DisplayWindow& display,
                                           bool off_screen);
 
   // Released all hardware resources.
   virtual void Destroy();
 
-  // Turns fullscreen display on or off.
-  // Parameters:
-  //  fullscreen: true for fullscreen, false for in-browser display
-  //  display: a platform-specific display identifier
-  //  mode_id: a mode returned by GetDisplayModes, for fullscreen use.
-  //  (Ignored in non-fullscreen mode.)
-  // Returns true on success, false on failure.
-  virtual bool SetFullscreen(bool fullscreen,
-                             const DisplayWindow& display,
-                             int mode_id);
+  // Overridden from Renderer.
+  virtual bool GoFullscreen(const DisplayWindow& display,
+                            int mode_id);
+
+  // Overridden from Renderer.
+  virtual bool CancelFullscreen(const DisplayWindow& display,
+                                int width, int height);
 
   // Tells whether we're currently displayed fullscreen or not.
   virtual bool fullscreen() const {
     return fullscreen_;
   }
 
   // Resizes the viewport in OpenGL.
   virtual void Resize(int width, int height);
 
   // Creates a StreamBank, returning a platform specific implementation class.
@@ skipping 23 matching lines @@
   virtual RenderDepthStencilSurface::Ref CreateDepthStencilSurface(
       int width,
       int height);
 
   // Overridden from Renderer.
   virtual const int* GetRGBAUByteNSwizzleTable();
 
   // Makes this renderer active on the current thread if it is not active
   // already.
   void MakeCurrentLazy() {
-    if (!IsCurrent()) MakeCurrent();
+    if (!IsCurrent())
+      MakeCurrent();
   }
 
   // Returns whether or not this renderer is active on the current thread.
-  // In the Mac case, also requires the correct GL context to be active.
   // Don't worry, the "get" calls are el cheapo.
   bool IsCurrent() {
-#ifdef OS_MACOSX
+#if defined(OS_MACOSX)
     if ((mac_agl_context_ != NULL) &&
-        (mac_agl_context_ != aglGetCurrentContext())) {
-      return false;
+        (mac_agl_context_ == aglGetCurrentContext())) {
+      return true;
     } else if ((mac_cgl_context_ != NULL) &&
-               (mac_cgl_context_ != CGLGetCurrentContext())) {
-      return false;
+               (mac_cgl_context_ == CGLGetCurrentContext())) {
+      return true;
     }
+#elif defined(OS_WIN)
+    if ((gl_context_ != NULL) &&
+        (gl_context_ == wglGetCurrentContext())) {
+      return true;
+    }
+#elif defined(OS_LINUX)
+    if ((context_ != NULL) &&
+        (context_ == glXGetCurrentContext())) {
+      return true;
+    }
+#else
+    Error: must port RendererGL::IsCurrent() to your platform.
 #endif
-    return this == current_renderer_;
+    return false;
   }
 
   // Makes this renderer active on the current thread.
   bool MakeCurrent();
 
   inline CGcontext cg_context() const { return cg_context_; }
   inline CGprofile cg_vertex_profile() const { return cg_vertex_profile_; }
   inline CGprofile cg_fragment_profile() const { return cg_fragment_profile_; }
 
  protected:
@@ skipping 66 matching lines @@
   InitStatus InitCommonGL();
 
   // Platform-independent GL destruction
   void DestroyCommonGL();
 
   // Updates the helper constant used to remap D3D clip coordinates to GL ones.
   void UpdateHelperConstant(float width, float height);
 
   ServiceDependency<SemanticManager> semantic_manager_;
 
-  // Current renderer, tracking which renderer has last called wglMakeCurrent
-  // (or equivalent on other platforms).
-  // NOTE: this should really be thread-local, but since we don't handle
-  // multiple threads currently, this is enough.
-  static RendererGL *current_renderer_;
-
   // Indicates we're rendering fullscreen rather than in the plugin region.
   bool fullscreen_;
 
 
 #ifdef OS_WIN
   // Handle to the GL device.
   HWND window_;
   HDC device_context_;
   HGLRC gl_context_;
 #endif
@@ skipping 75 matching lines @@
   float polygon_offset_factor_;
   float polygon_offset_bias_;
 
   // Sets the stencils states for either front, back or both facing polys.
   void SetStencilStates(GLenum face, const StencilStates& stencil_states);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_GL_RENDERER_GL_H_