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

core/cross/gl/renderer_gl.cc

 /*
  * 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 633 matching lines @@
                   new BoolHandler(&separate_alpha_blend_enable_,
                                   &alpha_blend_settings_changed_));
   AddStateHandler(State::kSourceBlendAlphaFunctionParamName,
                   new BlendFunctionHandler(&blend_function_[SRC][ALPHA]));
   AddStateHandler(State::kDestinationBlendAlphaFunctionParamName,
                   new BlendFunctionHandler(&blend_function_[DST][ALPHA]));
   AddStateHandler(State::kBlendAlphaEquationParamName,
                   new BlendEquationHandler(&blend_equation_[ALPHA]));
 }
 
-RendererGL *RendererGL::current_renderer_ = NULL;
-
 RendererGL::~RendererGL() {
   Destroy();
 }
 
 // platform neutral initialization code
 //
 Renderer::InitStatus RendererGL::InitCommonGL() {
   GLenum glew_error = glewInit();
   if (glew_error != GLEW_OK) {
     DLOG(ERROR) << "Unable to initialise GLEW : "
@@ skipping 428 matching lines @@
     display_ = NULL;
     window_ = 0;
   }
   return init_status;
 }
 
 void RendererGL::Destroy() {
   DestroyCommonGL();
   if (display_) {
     ::glXMakeCurrent(display_, 0, 0);
-    current_renderer_ = NULL;
     if (context_) {
       ::glXDestroyContext(display_, context_);
       context_ = 0;
     }
     display_ = NULL;
     window_ = 0;
   }
 }
 
 #endif
 
 bool RendererGL::MakeCurrent() {
 #ifdef OS_WIN
   if (!device_context_ || !gl_context_) return false;
   bool result = ::wglMakeCurrent(device_context_, gl_context_) != 0;
-  if (result) current_renderer_ = this;
   return result;
 #endif
 #ifdef OS_MACOSX
   if (mac_cgl_context_ != NULL) {
     ::CGLSetCurrentContext(mac_cgl_context_);
-    current_renderer_ = this;
     return true;
   } else if (mac_agl_context_ != NULL) {
     ::aglSetCurrentContext(mac_agl_context_);
-    current_renderer_ = this;
     return true;
   } else {
     return false;
   }
 #endif
 #ifdef OS_LINUX
   if (context_ != NULL) {
     bool result = ::glXMakeCurrent(display_, window_, context_) == True;
-    if (result) current_renderer_ = this;
     return result;
   } else {
     return false;
   }
 #endif
 }
 
 void RendererGL::PlatformSpecificClear(const Float4 &color,
                                        bool color_flag,
                                        float depth,
@@ skipping 62 matching lines @@
   ::glDepthRange(min_z, max_z);
 }
 
 // Resizes the viewport.
 void RendererGL::Resize(int width, int height) {
   MakeCurrentLazy();
   SetClientSize(width, height);
   CHECK_GL_ERROR();
 }
 
-bool RendererGL::SetFullscreen(bool fullscreen,
-                               const DisplayWindow& display,
-                               int mode_id) {
-  if (fullscreen != fullscreen_) {
-    fullscreen_ = fullscreen;
-  }
+bool RendererGL::GoFullscreen(const DisplayWindow& display,
+                              int mode_id) {
+  fullscreen_ = true;
+  return true;
+}
+
+bool RendererGL::CancelFullscreen(const DisplayWindow& display,
+                                  int width, int height) {
+  fullscreen_ = false;
   return true;
 }
 
 bool RendererGL::PlatformSpecificStartRendering() {
   DLOG_FIRST_N(INFO, 10) << "RendererGL StartRendering";
   MakeCurrentLazy();
 
   // Currently always returns true.
   // Should be modified if current behavior changes.
   CHECK_GL_ERROR();
@@ skipping 264 matching lines @@
   return swizzle_table;
 }
 
 // This is a factory function for creating Renderer objects.  Since
 // we're implementing GL, we only ever return a GL renderer.
 Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) {
   return RendererGL::CreateDefault(service_locator);
 }
 
 }  // namespace o3d