gpu: Add TransformFeedback & Uniform Buffer related consts

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 683 matching lines @@
         *params = bound_read_framebuffer_;
         return true;
       }
       return false;
     case GL_RENDERBUFFER_BINDING:
       if (share_group_->bind_generates_resource()) {
         *params = bound_renderbuffer_;
         return true;
       }
       return false;
+    case GL_MAX_UNIFORM_BUFFER_BINDINGS:
+      *params = capabilities_.max_uniform_buffer_bindings;
+      return true;
+    case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
+      *params = capabilities_.max_transform_feedback_separate_attribs;
+      return true;
+    case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:
+      *params = capabilities_.uniform_buffer_offset_alignment;
+      return true;
     default:
       return false;
   }
 }
 
 bool GLES2Implementation::GetBooleanvHelper(GLenum pname, GLboolean* params) {
   // TODO(gman): Make this handle pnames that return more than 1 value.
   GLint value;
   if (!GetHelper(pname, &value)) {
     return false;
@@ skipping 1929 matching lines @@
     case GL_ELEMENT_ARRAY_BUFFER:
       changed = vertex_array_object_manager_->BindElementArray(buffer_id);
       break;
     case GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM:
       bound_pixel_pack_transfer_buffer_id_ = buffer_id;
       break;
     case GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM:
       bound_pixel_unpack_transfer_buffer_id_ = buffer_id;
       break;
     default:
-      changed = true;
-      break;
+      SetGLErrorInvalidEnum("glBindBuffer", target, "target");
+      return;
   }
-  // TODO(gman): There's a bug here. If the target is invalid the ID will not be
-  // used even though it's marked it as used here.
   if (changed) {
     GetIdHandler(id_namespaces::kBuffers)->MarkAsUsedForBind(
         this, target, buffer_id, &GLES2Implementation::BindBufferStub);
   }
 }
 
 void GLES2Implementation::BindBufferStub(GLenum target, GLuint buffer) {
   helper_->BindBuffer(target, buffer);
   if (share_group_->bind_generates_resource())
     helper_->CommandBufferHelper::Flush();
 }
 
 void GLES2Implementation::BindBufferBaseHelper(
     GLenum target, GLuint index, GLuint buffer_id) {
   // TODO(zmo): See note #1 above.
-  // TODO(zmo): There's a bug here. If the target or index is invalid the ID
-  // will not be used even though it's marked it as used here.
+  switch (target) {
+    case GL_TRANSFORM_FEEDBACK_BUFFER:
+      if (index >= static_cast<GLuint>(
+                       capabilities_.max_transform_feedback_separate_attribs)) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferBase",
+                   "index larger than max limit");
+        return;
+      }
+      break;
+    case GL_UNIFORM_BUFFER:
+      if (index >=
+          static_cast<GLuint>(capabilities_.max_uniform_buffer_bindings)) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferBase",
+                   "index larger than max limit");
+        return;
+      }
+      break;
+    default:
+      SetGLErrorInvalidEnum("glBindBufferBase", target, "target");
+      return;
+  }
+
   GetIdHandler(id_namespaces::kBuffers)->MarkAsUsedForBind(
       this, target, index, buffer_id, &GLES2Implementation::BindBufferBaseStub);
 }
 
 void GLES2Implementation::BindBufferBaseStub(
     GLenum target, GLuint index, GLuint buffer) {
   helper_->BindBufferBase(target, index, buffer);
   if (share_group_->bind_generates_resource())
     helper_->CommandBufferHelper::Flush();
 }
 
 void GLES2Implementation::BindBufferRangeHelper(
     GLenum target, GLuint index, GLuint buffer_id,
     GLintptr offset, GLsizeiptr size) {
   // TODO(zmo): See note #1 above.
-  // TODO(zmo): There's a bug here. If an arguments is invalid the ID will not
-  // be used even though it's marked it as used here.
+  switch (target) {
+    case GL_TRANSFORM_FEEDBACK_BUFFER:
+      if (index >= static_cast<GLuint>(
+                       capabilities_.max_transform_feedback_separate_attribs)) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferRange",
+                   "index larget than max limit");
+        return;
+      }
+      if (offset % 4 != 0 || size % 4 != 0) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferRange",
+                   "offset and size must be multiples of 4");
+        return;
+      }
+      break;
+    case GL_UNIFORM_BUFFER:
+      if (index >=
+          static_cast<GLuint>(capabilities_.max_uniform_buffer_bindings)) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferRange",
+                   "index larger than max limit");
+        return;
+      }
+      if (capabilities_.uniform_buffer_offset_alignment != 0 &&
+          offset % capabilities_.uniform_buffer_offset_alignment != 0) {
+        SetGLError(GL_INVALID_VALUE, "glBindBufferRange",
+                   "offset must be multiples of alignment");
+        return;
+      }
+      break;
+    default:
+      SetGLErrorInvalidEnum("glBindBufferRange", target, "target");
+      return;
+  }
+  if (buffer_id != 0 && size <= 0) {
+    SetGLError(GL_INVALID_VALUE, "glBindBufferRange",
+               "size must be larger than 0");
+    return;
+  }
+
   GetIdHandler(id_namespaces::kBuffers)->MarkAsUsedForBind(
       this, target, index, buffer_id, offset, size,
       &GLES2Implementation::BindBufferRangeStub);
 }
 
 void GLES2Implementation::BindBufferRangeStub(
     GLenum target, GLuint index, GLuint buffer,
     GLintptr offset, GLsizeiptr size) {
   helper_->BindBufferRange(target, index, buffer, offset, size);
   if (share_group_->bind_generates_resource())
@@ skipping 56 matching lines @@
   // TODO(gman): See note #1 above.
   bool changed = false;
   switch (target) {
     case GL_RENDERBUFFER:
       if (bound_renderbuffer_ != renderbuffer) {
         bound_renderbuffer_ = renderbuffer;
         changed = true;
       }
       break;
     default:
-      changed = true;
-      break;
+      SetGLErrorInvalidEnum("glBindRenderbuffer", target, "target");
+      return;
   }
-  // TODO(gman): There's a bug here. If the target is invalid the ID will not be
-  // used even though it's marked it as used here.
   if (changed) {
     GetIdHandler(id_namespaces::kRenderbuffers)->MarkAsUsedForBind(
         this, target, renderbuffer,
         &GLES2Implementation::BindRenderbufferStub);
   }
 }
 
 void GLES2Implementation::BindRenderbufferStub(GLenum target,
                                                GLuint renderbuffer) {
   helper_->BindRenderbuffer(target, renderbuffer);
@@ skipping 25 matching lines @@
         changed = true;
       }
       break;
     case GL_TEXTURE_EXTERNAL_OES:
       if (unit.bound_texture_external_oes != texture) {
         unit.bound_texture_external_oes = texture;
         changed = true;
       }
       break;
     default:
-      changed = true;
-      break;
+      SetGLErrorInvalidEnum("glBindTexture", target, "target.");
+      return;
   }
-  // TODO(gman): There's a bug here. If the target is invalid the ID will not be
-  // used. even though it's marked it as used here.

[piman, 2015/02/04 00:43:19]

note: this is still true. For example, we don't know if GL_TEXTURE_EXTERNAL_OES
is supported or not (since it's an extension).

   if (changed) {
     GetIdHandler(id_namespaces::kTextures)->MarkAsUsedForBind(
         this, target, texture, &GLES2Implementation::BindTextureStub);
   }
 }
 
 void GLES2Implementation::BindTextureStub(GLenum target, GLuint texture) {
   helper_->BindTexture(target, texture);
   if (share_group_->bind_generates_resource())
     helper_->CommandBufferHelper::Flush();
 }
 
 void GLES2Implementation::BindTransformFeedbackHelper(
     GLenum target, GLuint transformfeedback) {
   helper_->BindTransformFeedback(target, transformfeedback);
 }
 
 void GLES2Implementation::BindVertexArrayOESHelper(GLuint array) {
-  // TODO(gman): See note #1 above.
   bool changed = false;
   if (vertex_array_object_manager_->BindVertexArray(array, &changed)) {
     if (changed) {
       // Unlike other BindXXXHelpers we don't call MarkAsUsedForBind
       // because unlike other resources VertexArrayObject ids must
       // be generated by GenVertexArrays. A random id to Bind will not
       // generate a new object.
       helper_->BindVertexArrayOES(array);
     }
   } else {
     SetGLError(
         GL_INVALID_OPERATION, "glBindVertexArrayOES",
         "id was not generated with glGenVertexArrayOES");
   }
 }
 
 void GLES2Implementation::BindValuebufferCHROMIUMHelper(GLenum target,
                                                         GLuint valuebuffer) {
   bool changed = false;
   switch (target) {
     case GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM:
       if (bound_valuebuffer_ != valuebuffer) {
         bound_valuebuffer_ = valuebuffer;
         changed = true;
       }
       break;
     default:
-      changed = true;
-      break;
+      SetGLErrorInvalidEnum("glBindValuebufferCHROMIUM", target, "target");
+      return;
   }
-  // TODO(gman): There's a bug here. If the target is invalid the ID will not be
-  // used even though it's marked it as used here.
   if (changed) {
     GetIdHandler(id_namespaces::kValuebuffers)->MarkAsUsedForBind(
         this, target, valuebuffer,
         &GLES2Implementation::BindValuebufferCHROMIUMStub);
   }
 }
 
 void GLES2Implementation::BindValuebufferCHROMIUMStub(GLenum target,
                                                       GLuint valuebuffer) {
   helper_->BindValuebufferCHROMIUM(target, valuebuffer);
@@ skipping 1489 matching lines @@
   return false;
 }
 
 // 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/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu