Revert of Add subscribeUniform extension pipeline

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 38 matching lines @@
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/texture_manager.h"
-#include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "third_party/smhasher/src/City.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
 #if defined(OS_MACOSX)
 #include <IOSurface/IOSurfaceAPI.h>
@@ skipping 651 matching lines @@
 
   // Helpers for the glGen and glDelete functions.
   bool GenTexturesHelper(GLsizei n, const GLuint* client_ids);
   void DeleteTexturesHelper(GLsizei n, const GLuint* client_ids);
   bool GenBuffersHelper(GLsizei n, const GLuint* client_ids);
   void DeleteBuffersHelper(GLsizei n, const GLuint* client_ids);
   bool GenFramebuffersHelper(GLsizei n, const GLuint* client_ids);
   void DeleteFramebuffersHelper(GLsizei n, const GLuint* client_ids);
   bool GenRenderbuffersHelper(GLsizei n, const GLuint* client_ids);
   void DeleteRenderbuffersHelper(GLsizei n, const GLuint* client_ids);
-  bool GenValuebuffersCHROMIUMHelper(GLsizei n, const GLuint* client_ids);
-  void DeleteValuebuffersCHROMIUMHelper(GLsizei n, const GLuint* client_ids);
   bool GenQueriesEXTHelper(GLsizei n, const GLuint* client_ids);
   void DeleteQueriesEXTHelper(GLsizei n, const GLuint* client_ids);
   bool GenVertexArraysOESHelper(GLsizei n, const GLuint* client_ids);
   void DeleteVertexArraysOESHelper(GLsizei n, const GLuint* client_ids);
 
   // Helper for async upload token completion notification callback.
   base::Closure AsyncUploadTokenCompletionClosure(uint32 async_upload_token,
                                                   uint32 sync_data_shm_id,
                                                   uint32 sync_data_shm_offset);
 
 
 
   // Workarounds
   void OnFboChanged() const;
   void OnUseFramebuffer() const;
 
   // TODO(gman): Cache these pointers?
   BufferManager* buffer_manager() {
     return group_->buffer_manager();
   }
 
   RenderbufferManager* renderbuffer_manager() {
     return group_->renderbuffer_manager();
   }
 
   FramebufferManager* framebuffer_manager() {
     return group_->framebuffer_manager();
   }
 
-  ValuebufferManager* valuebuffer_manager() {
-    return group_->valuebuffer_manager();
-  }
-
   ProgramManager* program_manager() {
     return group_->program_manager();
   }
 
   ShaderManager* shader_manager() {
     return group_->shader_manager();
   }
 
   ShaderTranslatorCache* shader_translator_cache() {
     return group_->shader_translator_cache();
@@ skipping 168 matching lines @@
   void DoProduceTextureCHROMIUM(GLenum target, const GLbyte* key);
   void DoProduceTextureDirectCHROMIUM(GLuint texture, GLenum target,
       const GLbyte* key);
   void ProduceTextureRef(std::string func_name, TextureRef* texture_ref,
       GLenum target, const GLbyte* data);
 
   void DoConsumeTextureCHROMIUM(GLenum target, const GLbyte* key);
   void DoCreateAndConsumeTextureCHROMIUM(GLenum target, const GLbyte* key,
     GLuint client_id);
 
-  bool DoIsValuebufferCHROMIUM(GLuint client_id);
-  void DoBindValueBufferCHROMIUM(GLenum target, GLuint valuebuffer);
-  void DoSubscribeValueCHROMIUM(GLenum target, GLenum subscription);
-  void DoPopulateSubscribedValuesCHROMIUM(GLenum target);
-  void DoUniformValueBufferCHROMIUM(GLint location,
-                                    GLenum target,
-                                    GLenum subscription);
-
   void DoBindTexImage2DCHROMIUM(
       GLenum target,
       GLint image_id);
   void DoReleaseTexImage2DCHROMIUM(
       GLenum target,
       GLint image_id);
 
   void DoTraceEndCHROMIUM(void);
 
   void DoDrawBuffersEXT(GLsizei count, const GLenum* bufs);
@@ skipping 132 matching lines @@
   // Gets the renderbuffer info for the given renderbuffer.
   Renderbuffer* GetRenderbuffer(GLuint client_id) {
     return renderbuffer_manager()->GetRenderbuffer(client_id);
   }
 
   // Removes the renderbuffer info for the given renderbuffer.
   void RemoveRenderbuffer(GLuint client_id) {
     renderbuffer_manager()->RemoveRenderbuffer(client_id);
   }
 
-  // Creates a valuebuffer info for the given valuebuffer.
-  void CreateValuebuffer(GLuint client_id) {
-    return valuebuffer_manager()->CreateValuebuffer(client_id);
-  }
-
-  // Gets the valuebuffer info for a given valuebuffer.
-  Valuebuffer* GetValuebuffer(GLuint client_id) {
-    return valuebuffer_manager()->GetValuebuffer(client_id);
-  }
-
-  // Removes the valuebuffer info for the given valuebuffer.
-  void RemoveValuebuffer(GLuint client_id) {
-    valuebuffer_manager()->RemoveValuebuffer(client_id);
-  }
-
   // Gets the vertex attrib manager for the given vertex array.
   VertexAttribManager* GetVertexAttribManager(GLuint client_id) {
     VertexAttribManager* info =
         vertex_array_manager()->GetVertexAttribManager(client_id);
     return info;
   }
 
   // Removes the vertex attrib manager for the given vertex array.
   void RemoveVertexAttribManager(GLuint client_id) {
     vertex_array_manager()->RemoveVertexAttribManager(client_id);
@@ skipping 61 matching lines @@
   // Check that the currently bound read framebuffer's color image
   // isn't the target texture of the glCopyTex{Sub}Image2D.
   bool FormsTextureCopyingFeedbackLoop(TextureRef* texture, GLint level);
 
   // Check if a framebuffer meets our requirements.
   bool CheckFramebufferValid(
       Framebuffer* framebuffer,
       GLenum target,
       const char* func_name);
 
-  // Check if the current valuebuffer exists and is valid. If not generates
-  // the appropriate GL error. Returns true if the current valuebuffer is in
-  // a usable state.
-  bool CheckCurrentValuebuffer(const char* function_name);
-
-  // Check if the current valuebuffer exists and is valiud and that the
-  // value buffer is actually subscribed to the given subscription
-  bool CheckCurrentValuebufferForSubscription(GLenum subscription,
-                                              const char* function_name);
-
-  // Check if the location can be used for the given subscription target. If not
-  // generates the appropriate GL error. Returns true if the location is usable
-  bool CheckSubscriptionTarget(GLint location,
-                               GLenum subscription,
-                               const char* function_name);
-
   // Checks if the current program exists and is valid. If not generates the
   // appropriate GL error.  Returns true if the current program is in a usable
   // state.
   bool CheckCurrentProgram(const char* function_name);
 
   // Checks if the current program exists and is valid and that location is not
   // -1. If the current program is not valid generates the appropriate GL
   // error. Returns true if the current program is in a usable state and
   // location is not -1.
   bool CheckCurrentProgramForUniform(GLint location, const char* function_name);
 
   // Checks if the current program samples a texture that is also the color
   // image of the current bound framebuffer, i.e., the source and destination
   // of the draw operation are the same.
   bool CheckDrawingFeedbackLoops();
 
-  // Checks if |api_type| is valid for the given uniform
-  // If the api type is not valid generates the appropriate GL
-  // error. Returns true if |api_type| is valid for the uniform
-  bool CheckUniformForApiType(const Program::UniformInfo* info,
-                              const char* function_name,
-                              Program::UniformApiType api_type);
-
   // Gets the type of a uniform for a location in the current program. Sets GL
   // errors if the current program is not valid. Returns true if the current
   // program is valid and the location exists. Adjusts count so it
   // does not overflow the uniform.
   bool PrepForSetUniformByLocation(GLint fake_location,
                                    const char* function_name,
                                    Program::UniformApiType api_type,
                                    GLint* real_location,
                                    GLenum* type,
                                    GLsizei* count);
@@ skipping 1457 matching lines @@
 
   // Set all the default state because some GL drivers get it wrong.
   state_.InitCapabilities(NULL);
   state_.InitState(NULL);
   glActiveTexture(GL_TEXTURE0 + state_.active_texture_unit);
 
   DoBindBuffer(GL_ARRAY_BUFFER, 0);
   DoBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
   DoBindFramebuffer(GL_FRAMEBUFFER, 0);
   DoBindRenderbuffer(GL_RENDERBUFFER, 0);
-  DoBindValueBufferCHROMIUM(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, 0);
 
   bool call_gl_clear = !surfaceless_;
 #if defined(OS_ANDROID)
   // Temporary workaround for Android WebView because this clear ignores the
   // clip and corrupts that external UI of the App. Not calling glClear is ok
   // because the system already clears the buffer before each draw. Proper
   // fix might be setting the scissor clip properly before initialize. See
   // crbug.com/259023 for details.
   call_gl_clear = surface_->GetHandle();
 #endif
@@ skipping 216 matching lines @@
       return false;
     }
   }
   scoped_ptr<GLuint[]> service_ids(new GLuint[n]);
   glGenRenderbuffersEXT(n, service_ids.get());
   for (GLsizei ii = 0; ii < n; ++ii) {
     CreateRenderbuffer(client_ids[ii], service_ids[ii]);
   }
   return true;
 }
-
-bool GLES2DecoderImpl::GenValuebuffersCHROMIUMHelper(GLsizei n,
-                                                     const GLuint* client_ids) {
-  for (GLsizei ii = 0; ii < n; ++ii) {
-    if (GetValuebuffer(client_ids[ii])) {
-      return false;
-    }
-  }
-  for (GLsizei ii = 0; ii < n; ++ii) {
-    CreateValuebuffer(client_ids[ii]);
-  }
-  return true;
-}
 
 bool GLES2DecoderImpl::GenTexturesHelper(GLsizei n, const GLuint* client_ids) {
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (GetTexture(client_ids[ii])) {
       return false;
     }
   }
   scoped_ptr<GLuint[]> service_ids(new GLuint[n]);
   glGenTextures(n, service_ids.get());
   for (GLsizei ii = 0; ii < n; ++ii) {
@@ skipping 69 matching lines @@
         if (framebuffer_state_.bound_draw_framebuffer.get()) {
           framebuffer_state_.bound_draw_framebuffer
               ->UnbindRenderbuffer(GL_FRAMEBUFFER, renderbuffer);
         }
       }
       framebuffer_state_.clear_state_dirty = true;
       RemoveRenderbuffer(client_ids[ii]);
     }
   }
 }
-
-void GLES2DecoderImpl::DeleteValuebuffersCHROMIUMHelper(
-    GLsizei n,
-    const GLuint* client_ids) {
-  for (GLsizei ii = 0; ii < n; ++ii) {
-    Valuebuffer* valuebuffer = GetValuebuffer(client_ids[ii]);
-    if (valuebuffer) {
-      if (state_.bound_valuebuffer.get() == valuebuffer) {
-        state_.bound_valuebuffer = NULL;
-      }
-      RemoveValuebuffer(client_ids[ii]);
-    }
-  }
-}
 
 void GLES2DecoderImpl::DeleteTexturesHelper(
     GLsizei n, const GLuint* client_ids) {
   bool supports_separate_framebuffer_binds =
      features().chromium_framebuffer_multisample;
   for (GLsizei ii = 0; ii < n; ++ii) {
     TextureRef* texture_ref = GetTexture(client_ids[ii]);
     if (texture_ref) {
       Texture* texture = texture_ref->texture();
       if (texture->IsAttachedToFramebuffer()) {
@@ skipping 410 matching lines @@
 
   // Unbind everything.
   state_.vertex_attrib_manager = NULL;
   state_.default_vertex_attrib_manager = NULL;
   state_.texture_units.clear();
   state_.bound_array_buffer = NULL;
   state_.current_queries.clear();
   framebuffer_state_.bound_read_framebuffer = NULL;
   framebuffer_state_.bound_draw_framebuffer = NULL;
   state_.bound_renderbuffer = NULL;
-  state_.bound_valuebuffer = NULL;
 
   if (offscreen_saved_color_texture_info_.get()) {
     DCHECK(offscreen_target_color_texture_);
     DCHECK_EQ(offscreen_saved_color_texture_info_->service_id(),
               offscreen_saved_color_texture_->id());
     offscreen_saved_color_texture_->Invalidate();
     offscreen_saved_color_texture_info_ = NULL;
   }
   if (have_context) {
     if (copy_texture_CHROMIUM_.get()) {
@@ skipping 2277 matching lines @@
   if (!texture) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glTexParameteriv", "unknown texture");
     return;
   }
 
   texture_manager()->SetParameteri(
       "glTexParameteriv", GetErrorState(), texture, pname, *params);
 }
 
-bool GLES2DecoderImpl::CheckCurrentValuebuffer(const char* function_name) {
-  if (!state_.bound_valuebuffer.get()) {
-    // There is no valuebuffer bound
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                       "no valuebuffer in use");
-    return false;
-  }
-  return true;
-}
-
-bool GLES2DecoderImpl::CheckCurrentValuebufferForSubscription(
-    GLenum subscription,
-    const char* function_name) {
-  if (!CheckCurrentValuebuffer(function_name)) {
-    return false;
-  }
-  if (!state_.bound_valuebuffer.get()->IsSubscribed(subscription)) {
-    // The valuebuffer is not subscribed to the target
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                       "valuebuffer is not subscribed");
-    return false;
-  }
-  return true;
-}
-
-bool GLES2DecoderImpl::CheckSubscriptionTarget(GLint location,
-                                               GLenum subscription,
-                                               const char* function_name) {
-  if (!CheckCurrentProgramForUniform(location, function_name)) {
-    return false;
-  }
-  GLint real_location = -1;
-  GLint array_index = -1;
-  const Program::UniformInfo* info =
-      state_.current_program->GetUniformInfoByFakeLocation(
-          location, &real_location, &array_index);
-  if (!info) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name, "unknown location");
-    return false;
-  }
-  if ((ValuebufferManager::ApiTypeForSubscriptionTarget(subscription) &
-       info->accepts_api_type) == 0) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                       "wrong type for subscription");
-    return false;
-  }
-  return true;
-}
-
 bool GLES2DecoderImpl::CheckCurrentProgram(const char* function_name) {
   if (!state_.current_program.get()) {
     // The program does not exist.
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, function_name, "no program in use");
     return false;
   }
   if (!state_.current_program->InUse()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, function_name, "program not linked");
@@ skipping 35 matching lines @@
       TextureUnit& texture_unit = state_.texture_units[texture_unit_index];
       TextureRef* texture_ref =
           texture_unit.GetInfoForSamplerType(GL_SAMPLER_2D).get();
       if (attachment->IsTexture(texture_ref))
         return true;
     }
   }
   return false;
 }
 
-bool GLES2DecoderImpl::CheckUniformForApiType(
-    const Program::UniformInfo* info,
-    const char* function_name,
-    Program::UniformApiType api_type) {
-  DCHECK(info);
-  if ((api_type & info->accepts_api_type) == 0) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                       "wrong uniform function for type");
-    return false;
-  }
-  return true;
-}
-
 bool GLES2DecoderImpl::PrepForSetUniformByLocation(
     GLint fake_location,
     const char* function_name,
     Program::UniformApiType api_type,
     GLint* real_location,
     GLenum* type,
     GLsizei* count) {
   DCHECK(type);
   DCHECK(count);
   DCHECK(real_location);
 
   if (!CheckCurrentProgramForUniform(fake_location, function_name)) {
     return false;
   }
   GLint array_index = -1;
   const Program::UniformInfo* info =
       state_.current_program->GetUniformInfoByFakeLocation(
           fake_location, real_location, &array_index);
   if (!info) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, function_name, "unknown location");
     return false;
   }
-  if (!CheckUniformForApiType(info, function_name, api_type)) {
+
+  if ((api_type & info->accepts_api_type) == 0) {
+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_OPERATION, function_name,
+        "wrong uniform function for type");
     return false;
   }
   if (*count > 1 && !info->is_array) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, function_name, "count > 1 for non-array");
     return false;
   }
   *count = std::min(info->size - array_index, *count);
   if (*count <= 0) {
     return false;
@@ skipping 4871 matching lines @@
   if (texture->target() != target) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCreateAndConsumeTextureCHROMIUM", "invalid target");
     return;
   }
 
   texture_ref = texture_manager()->Consume(client_id, texture);
 }
 
-bool GLES2DecoderImpl::DoIsValuebufferCHROMIUM(GLuint client_id) {
-  const Valuebuffer* valuebuffer = GetValuebuffer(client_id);
-  return valuebuffer && valuebuffer->IsValid();
-}
-
-void GLES2DecoderImpl::DoBindValueBufferCHROMIUM(GLenum target,
-                                                 GLuint client_id) {
-  Valuebuffer* valuebuffer = NULL;
-  if (client_id != 0) {
-    valuebuffer = GetValuebuffer(client_id);
-    if (!valuebuffer) {
-      if (!group_->bind_generates_resource()) {
-        LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glBindValuebufferCHROMIUM",
-                           "id not generated by glBindValuebufferCHROMIUM");
-        return;
-      }
-
-      // It's a new id so make a valuebuffer for it.
-      CreateValuebuffer(client_id);
-      valuebuffer = GetValuebuffer(client_id);
-    }
-    valuebuffer->MarkAsValid();
-  }
-  state_.bound_valuebuffer = valuebuffer;
-}
-
-void GLES2DecoderImpl::DoSubscribeValueCHROMIUM(GLenum target,
-                                                GLenum subscription) {
-  if (!CheckCurrentValuebuffer("glSubscribeValueCHROMIUM")) {
-    return;
-  }
-  state_.bound_valuebuffer.get()->AddSubscription(subscription);
-}
-
-void GLES2DecoderImpl::DoPopulateSubscribedValuesCHROMIUM(GLenum target) {
-  if (!CheckCurrentValuebuffer("glPopulateSubscribedValuesCHROMIUM")) {
-    return;
-  }
-  valuebuffer_manager()->UpdateValuebufferState(state_.bound_valuebuffer.get());
-}
-
-void GLES2DecoderImpl::DoUniformValueBufferCHROMIUM(GLint location,
-                                                    GLenum target,
-                                                    GLenum subscription) {
-  if (!CheckCurrentValuebufferForSubscription(
-          subscription, "glPopulateSubscribedValuesCHROMIUM")) {
-    return;
-  }
-  if (!CheckSubscriptionTarget(location, subscription,
-                               "glPopulateSubscribedValuesCHROMIUM")) {
-    return;
-  }
-  const ValueState* state =
-      state_.bound_valuebuffer.get()->GetState(subscription);
-  if (state) {
-    switch (subscription) {
-      case GL_MOUSE_POSITION_CHROMIUM:
-        DoUniform2iv(location, 1, state->int_value);
-        break;
-      default:
-        NOTREACHED() << "Unhandled uniform subscription target "
-                     << subscription;
-        break;
-    }
-  }
-}
-
 void GLES2DecoderImpl::DoInsertEventMarkerEXT(
     GLsizei length, const GLchar* marker) {
   if (!marker) {
     marker = "";
   }
   debug_marker_manager_.SetMarker(
       length ? std::string(marker, length) : std::string(marker));
 }
 
 void GLES2DecoderImpl::DoPushGroupMarkerEXT(
@@ skipping 545 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