Implemented offscreen rendering path for GLES2CmdDecoder on Linux....

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 13 matching lines @@
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
 #include "gpu/command_buffer/service/id_manager.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #if defined(UNIT_TEST)
 #elif defined(OS_LINUX)
-// XWindowWrapper is stubbed out for unit-tests.
+// GLXContextWrapper is stubbed out for unit-tests.
 #include "gpu/command_buffer/service/x_utils.h"
 #elif defined(OS_MACOSX)
 #include "app/surface/accelerated_surface_mac.h"
 #endif
 
 #if !defined(GL_DEPTH24_STENCIL8)
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
 namespace gpu {
@@ skipping 208 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FrameBuffer);
 };
 // }  // anonymous namespace.
 
 GLES2Decoder::GLES2Decoder(ContextGroup* group)
     : group_(group),
 #if defined(UNIT_TEST)
       debug_(false) {
 #elif defined(OS_LINUX)
       debug_(false),
-      window_(NULL) {
+      context_(NULL) {
 #elif defined(OS_WIN)
       debug_(false),
       hwnd_(NULL) {
 #else
       debug_(false) {
 #endif
 }
 
 GLES2Decoder::~GLES2Decoder() {
 }
@@ skipping 1262 matching lines @@
       ::wglGetCurrentContext() == gl_context_) {
     return true;
   }
   if (!::wglMakeCurrent(gl_device_context_, gl_context_)) {
     DLOG(ERROR) << "Unable to make gl context current.";
     return false;
   }
   return true;
 #elif defined(OS_LINUX)
   // TODO(apatrick): offscreen rendering not yet supported on this platform.
-  return window()->MakeCurrent();
+  return context()->MakeCurrent();
 #elif defined(OS_MACOSX)
   if (gl_context_) {
     if (CGLGetCurrentContext() != gl_context_) {
       if (CGLSetCurrentContext(gl_context_) != kCGLNoError) {
         DLOG(ERROR) << "Unable to make gl context current.";
         return false;
       }
     }
     return true;
   } else {
@@ skipping 43 matching lines @@
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (id_manager()->GetServiceId(client_ids[ii], &service_ids[ii])) {
       id_manager()->RemoveMapping(client_ids[ii], service_ids[ii]);
     } else {
       service_ids[ii] = 0;
     }
   }
 }
 
 bool GLES2DecoderImpl::InitPlatformSpecific() {
-#if !defined(UNIT_TEST)
+#if !defined(UNIT_TEST) && !defined(OS_LINUX)
   bool offscreen = pending_size_.width() > 0 && pending_size_.height() > 0;
 #endif
 #if defined(UNIT_TEST)
 #elif defined(GLES2_GPU_SERVICE_BACKEND_NATIVE_GLES2)
 #elif defined(OS_WIN)
   // Do one-off initialization.
   static bool success = InitializeOneOff(anti_aliased_);
   if (!success)
     return false;
 
@@ skipping 44 matching lines @@
 
   if (parent_) {
     if (!wglShareLists(parent_->gl_context_, gl_context_)) {
       DLOG(ERROR) << "Could not share GL contexts.";
       DestroyPlatformSpecific();
       return false;
     }
   }
 
 #elif defined(OS_LINUX)
-  // TODO(apatrick): offscreen rendering not yet supported on this platform.
-  DCHECK(!offscreen);
-
   // TODO(apatrick): parent contexts not yet supported on this platform.
   DCHECK(!parent_);
 
-  DCHECK(window());
-  if (!window()->Initialize())
+  DCHECK(context());
+
+  // Offscreen / onscreen handling done earlier on this platform (in
+  // GPUProcessor::Initialize).
+
+  if (!context()->Initialize())
     return false;
 #elif defined(OS_MACOSX)
   // TODO(apatrick): parent contexts not yet supported on this platform.
   DCHECK(!parent_);
 
   if (offscreen) {
     // Create a 1x1 pbuffer and associated context to bootstrap things
     static const CGLPixelFormatAttribute attribs[] = {
       (CGLPixelFormatAttribute) kCGLPFAPBuffer,
       (CGLPixelFormatAttribute) 0
@@ skipping 271 matching lines @@
 
   if (temporary_frame_buffer_.get())
     temporary_frame_buffer_->Destroy();
 
   if (offscreen_saved_color_texture_.get())
     offscreen_saved_color_texture_->Destroy();
 
 #if defined(UNIT_TEST)
 #elif defined(GLES2_GPU_SERVICE_BACKEND_NATIVE_GLES2)
 #elif defined(OS_LINUX)
-  DCHECK(window());
-  window()->Destroy();
+  DCHECK(context());
+  context()->Destroy();
 #elif defined(OS_MACOSX)
   surface_.Destroy();
 #endif
 
   DestroyPlatformSpecific();
 }
 
 void GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
   // We can't resize the render buffers immediately because there might be a
   // partial frame rendered into them and we don't want the tail end of that
@@ skipping 1684 matching lines @@
       return error::kLostContext;
 
     ScopedFrameBufferBinder binder(this, offscreen_target_frame_buffer_->id());
     offscreen_saved_color_texture_->Copy(current_size_);
   } else {
 #if defined(UNIT_TEST)
 #elif defined(GLES2_GPU_SERVICE_BACKEND_NATIVE_GLES2)
 #elif defined(OS_WIN)
     ::SwapBuffers(gl_device_context_);
 #elif defined(OS_LINUX)
-    DCHECK(window());
-    window()->SwapBuffers();
+    DCHECK(context());
+    context()->SwapBuffers();
 #elif defined(OS_MACOSX)
     // TODO(kbr): Need to property hook up and track the OpenGL state and hook
     // up the notion of the currently bound FBO.
     surface_.SwapBuffers();
 #endif
   }
 
   if (swap_buffers_callback_.get()) {
     swap_buffers_callback_->Run();
   }
 
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu