Fix a misuse of framebuffer target in GLHelper (2)

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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 <list>
@@ skipping 1273 matching lines @@
     NOTREACHED();
     return 0;
   }
 
   // Gets the framebuffer info for a particular target.
   FramebufferManager::FramebufferInfo* GetFramebufferInfoForTarget(
       GLenum target) {
     FramebufferManager::FramebufferInfo* info = NULL;
     switch (target) {
       case GL_FRAMEBUFFER:
-      case GL_DRAW_FRAMEBUFFER:
+      case GL_DRAW_FRAMEBUFFER_EXT:
         info = bound_draw_framebuffer_;
         break;
-      case GL_READ_FRAMEBUFFER:
+      case GL_READ_FRAMEBUFFER_EXT:
         info = bound_read_framebuffer_;
         break;
       default:
         NOTREACHED();
         break;
     }
     return info;
   }
 
   RenderbufferManager::RenderbufferInfo* GetRenderbufferInfoForTarget(
@@ skipping 1183 matching lines @@
       if (bound_element_array_buffer_ == buffer) {
         bound_element_array_buffer_ = NULL;
       }
       RemoveBufferInfo(client_ids[ii]);
     }
   }
 }
 
 void GLES2DecoderImpl::DeleteFramebuffersHelper(
     GLsizei n, const GLuint* client_ids) {
-  bool supports_seperate_framebuffer_binds =
+  bool supports_separate_framebuffer_binds =
      feature_info_->feature_flags().chromium_framebuffer_multisample;
 
   for (GLsizei ii = 0; ii < n; ++ii) {
     FramebufferManager::FramebufferInfo* framebuffer =
         GetFramebufferInfo(client_ids[ii]);
     if (framebuffer && !framebuffer->IsDeleted()) {
       if (framebuffer == bound_draw_framebuffer_) {
         bound_draw_framebuffer_ = NULL;
         state_dirty_ = true;
-        GLenum target = supports_seperate_framebuffer_binds ?
-            GL_DRAW_FRAMEBUFFER : GL_FRAMEBUFFER;
+        GLenum target = supports_separate_framebuffer_binds ?
+            GL_DRAW_FRAMEBUFFER_EXT : GL_FRAMEBUFFER;
         glBindFramebufferEXT(target, GetBackbufferServiceId());
       }
       if (framebuffer == bound_read_framebuffer_) {
         bound_read_framebuffer_ = NULL;
-        GLenum target = supports_seperate_framebuffer_binds ?
-            GL_READ_FRAMEBUFFER : GL_FRAMEBUFFER;
+        GLenum target = supports_separate_framebuffer_binds ?
+            GL_READ_FRAMEBUFFER_EXT : GL_FRAMEBUFFER;
         glBindFramebufferEXT(target, GetBackbufferServiceId());
       }
       RemoveFramebufferInfo(client_ids[ii]);
     }
   }
 }
 
 void GLES2DecoderImpl::DeleteRenderbuffersHelper(
     GLsizei n, const GLuint* client_ids) {
-  bool supports_seperate_framebuffer_binds =
+  bool supports_separate_framebuffer_binds =
      feature_info_->feature_flags().chromium_framebuffer_multisample;
   for (GLsizei ii = 0; ii < n; ++ii) {
     RenderbufferManager::RenderbufferInfo* renderbuffer =
         GetRenderbufferInfo(client_ids[ii]);
     if (renderbuffer && !renderbuffer->IsDeleted()) {
       if (bound_renderbuffer_ == renderbuffer) {
         bound_renderbuffer_ = NULL;
       }
       // Unbind from current framebuffers.
-      if (supports_seperate_framebuffer_binds) {
+      if (supports_separate_framebuffer_binds) {
         if (bound_read_framebuffer_) {
           bound_read_framebuffer_->UnbindRenderbuffer(
-              GL_READ_FRAMEBUFFER, renderbuffer);
+              GL_READ_FRAMEBUFFER_EXT, renderbuffer);
         }
         if (bound_draw_framebuffer_) {
           bound_draw_framebuffer_->UnbindRenderbuffer(
-              GL_DRAW_FRAMEBUFFER, renderbuffer);
+              GL_DRAW_FRAMEBUFFER_EXT, renderbuffer);
         }
       } else {
         if (bound_draw_framebuffer_) {
           bound_draw_framebuffer_->UnbindRenderbuffer(
               GL_FRAMEBUFFER, renderbuffer);
         }
       }
       state_dirty_ = true;
       RemoveRenderbufferInfo(client_ids[ii]);
     }
   }
 }
 
 void GLES2DecoderImpl::DeleteTexturesHelper(
     GLsizei n, const GLuint* client_ids) {
-  bool supports_seperate_framebuffer_binds =
+  bool supports_separate_framebuffer_binds =
      feature_info_->feature_flags().chromium_framebuffer_multisample;
   for (GLsizei ii = 0; ii < n; ++ii) {
     TextureManager::TextureInfo* texture = GetTextureInfo(client_ids[ii]);
     if (texture && !texture->IsDeleted()) {
       if (texture->IsAttachedToFramebuffer()) {
         state_dirty_ = true;
       }
       // Unbind texture from texture units.
       for (size_t jj = 0; jj < group_->max_texture_units(); ++jj) {
         texture_units_[ii].Unbind(texture);
       }
       // Unbind from current framebuffers.
-      if (supports_seperate_framebuffer_binds) {
+      if (supports_separate_framebuffer_binds) {
         if (bound_read_framebuffer_) {
-          bound_read_framebuffer_->UnbindTexture(GL_READ_FRAMEBUFFER, texture);
+          bound_read_framebuffer_->UnbindTexture(
+              GL_READ_FRAMEBUFFER_EXT, texture);
         }
         if (bound_draw_framebuffer_) {
-          bound_draw_framebuffer_->UnbindTexture(GL_DRAW_FRAMEBUFFER, texture);
+          bound_draw_framebuffer_->UnbindTexture(
+              GL_DRAW_FRAMEBUFFER_EXT, texture);
         }
       } else {
         if (bound_draw_framebuffer_) {
           bound_draw_framebuffer_->UnbindTexture(GL_FRAMEBUFFER, texture);
         }
       }
       GLuint service_id = texture->service_id();
       if (texture->IsStreamTexture() && stream_texture_manager_) {
         stream_texture_manager_->DestroyStreamTexture(service_id);
       }
@@ skipping 133 matching lines @@
         bound_draw_framebuffer_, GL_FRAMEBUFFER_EXT, func_name);
   }
   return CheckFramebufferValid(
              bound_draw_framebuffer_, GL_DRAW_FRAMEBUFFER_EXT, func_name) &&
          CheckFramebufferValid(
              bound_read_framebuffer_, GL_READ_FRAMEBUFFER_EXT, func_name);
 }
 
 gfx::Size GLES2DecoderImpl::GetBoundReadFrameBufferSize() {
   FramebufferManager::FramebufferInfo* framebuffer =
-      GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+      GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
   if (framebuffer != NULL) {
     const FramebufferManager::FramebufferInfo::Attachment* attachment =
         framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0);
     if (attachment) {
       return gfx::Size(attachment->width(), attachment->height());
     }
     return gfx::Size(0, 0);
   } else if (offscreen_target_frame_buffer_.get()) {
     return offscreen_size_;
   } else {
     return surface_->GetSize();
   }
 }
 
 GLenum GLES2DecoderImpl::GetBoundReadFrameBufferInternalFormat() {
   FramebufferManager::FramebufferInfo* framebuffer =
-      GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+      GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
   if (framebuffer != NULL) {
     return framebuffer->GetColorAttachmentFormat();
   } else if (offscreen_target_frame_buffer_.get()) {
     return offscreen_target_color_format_;
   } else {
     return back_buffer_color_format_;
   }
 }
 
 GLenum GLES2DecoderImpl::GetBoundDrawFrameBufferInternalFormat() {
   FramebufferManager::FramebufferInfo* framebuffer =
-      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
   if (framebuffer != NULL) {
     return framebuffer->GetColorAttachmentFormat();
   } else if (offscreen_target_frame_buffer_.get()) {
     return offscreen_target_color_format_;
   } else {
     return back_buffer_color_format_;
   }
 }
 
 void GLES2DecoderImpl::UpdateParentTextureInfo() {
@@ skipping 573 matching lines @@
   glBindBuffer(target, service_id);
 }
 
 bool GLES2DecoderImpl::BoundFramebufferHasColorAttachmentWithAlpha() {
   return (GLES2Util::GetChannelsForFormat(
       GetBoundDrawFrameBufferInternalFormat()) & 0x0008) != 0;
 }
 
 bool GLES2DecoderImpl::BoundFramebufferHasDepthAttachment() {
   FramebufferManager::FramebufferInfo* framebuffer =
-      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
   if (framebuffer) {
     return framebuffer->HasDepthAttachment();
   }
   if (offscreen_target_frame_buffer_.get()) {
     return offscreen_target_depth_format_ != 0;
   }
   return back_buffer_has_depth_;
 }
 
 bool GLES2DecoderImpl::BoundFramebufferHasStencilAttachment() {
   FramebufferManager::FramebufferInfo* framebuffer =
-      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+      GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
   if (framebuffer) {
     return framebuffer->HasStencilAttachment();
   }
   if (offscreen_target_frame_buffer_.get()) {
     return offscreen_target_stencil_format_ != 0 ||
            offscreen_target_depth_format_ == GL_DEPTH24_STENCIL8;
   }
   return back_buffer_has_stencil_;
 }
 
@@ skipping 422 matching lines @@
         } else {
           *params = 0;
         }
       }
       return true;
     case GL_FRAMEBUFFER_BINDING:
     // case GL_DRAW_FRAMEBUFFER_BINDING_EXT: (same as GL_FRAMEBUFFER_BINDING)
       *num_written = 1;
       if (params) {
         FramebufferManager::FramebufferInfo* framebuffer =
-            GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+            GetFramebufferInfoForTarget(GL_FRAMEBUFFER);
         if (framebuffer) {
           GLuint client_id = 0;
           framebuffer_manager()->GetClientId(
               framebuffer->service_id(), &client_id);
           *params = client_id;
         } else {
           *params = 0;
         }
       }
       return true;
-    case GL_READ_FRAMEBUFFER_BINDING:
+    case GL_READ_FRAMEBUFFER_BINDING_EXT:
       *num_written = 1;
       if (params) {
         FramebufferManager::FramebufferInfo* framebuffer =
-            GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+            GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
         if (framebuffer) {
           GLuint client_id = 0;
           framebuffer_manager()->GetClientId(
               framebuffer->service_id(), &client_id);
           *params = client_id;
         } else {
           *params = 0;
         }
       }
       return true;
@@ skipping 5396 matching lines @@
 }
 
 
 // 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