Revert 186416

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 1215 matching lines @@
   void DoGetFramebufferAttachmentParameteriv(
       GLenum target, GLenum attachment, GLenum pname, GLint* params);
 
   // Wrapper for glGetIntegerv.
   void DoGetIntegerv(GLenum pname, GLint* params);
 
   // Gets the max value in a range in a buffer.
   GLuint DoGetMaxValueInBufferCHROMIUM(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
-  // Wrapper for glGetBufferParameteriv.
-  void DoGetBufferParameteriv(
-      GLenum target, GLenum pname, GLint* params);
-
   // Wrapper for glGetProgramiv.
   void DoGetProgramiv(
       GLuint program_id, GLenum pname, GLint* params);
 
   // Wrapper for glRenderbufferParameteriv.
   void DoGetRenderbufferParameteriv(
       GLenum target, GLenum pname, GLint* params);
 
   // Wrapper for glGetShaderiv
   void DoGetShaderiv(GLuint shader, GLenum pname, GLint* params);
@@ skipping 3060 matching lines @@
 void GLES2DecoderImpl::DoGetProgramiv(
     GLuint program_id, GLenum pname, GLint* params) {
   Program* info = GetProgramInfoNotShader(
       program_id, "glGetProgramiv");
   if (!info) {
     return;
   }
   info->GetProgramiv(pname, params);
 }
 
-void GLES2DecoderImpl::DoGetBufferParameteriv(
-    GLenum target, GLenum pname, GLint* params) {
-  Buffer* buffer = GetBufferInfoForTarget(target);
-  if (!buffer) {
-    return;
-  }
-  switch (pname) {
-    case GL_BUFFER_SIZE:
-      *params = buffer->size();
-      break;
-    case GL_BUFFER_USAGE:
-      *params = buffer->usage();
-      break;
-    default:
-      NOTREACHED();
-  }
-}
-
 void GLES2DecoderImpl::DoBindAttribLocation(
     GLuint program, GLuint index, const char* name) {
   if (!StringIsValidForGLES(name)) {
     SetGLError(GL_INVALID_VALUE, "glBindAttribLocation", "Invalid character");
     return;
   }
   if (ProgramManager::IsInvalidPrefix(name, strlen(name))) {
     SetGLError(GL_INVALID_OPERATION, "glBindAttribLocation", "reserved prefix");
     return;
   }
@@ skipping 1404 matching lines @@
   // it could never be invalid since glUseProgram would have failed. While
   // glLinkProgram could later mark the program as invalid the previous
   // valid program will still function if it is still the current program.
   if (!state_.current_program) {
     // The program does not exist.
     // But GL says no ERROR.
     RenderWarning("Drawing with no current shader program.");
     return false;
   }
 
-  return state_.vertex_attrib_manager->ValidateBindings(
-      function_name,
-      this,
-      feature_info_.get(),
-      state_.current_program,
-      max_vertex_accessed,
-      primcount);
+  // true if any enabled, used divisor is zero
+  bool divisor0 = false;
+  // Validate all attribs currently enabled. If they are used by the current
+  // program then check that they have enough elements to handle the draw call.
+  // If they are not used by the current program check that they have a buffer
+  // assigned.
+  const VertexAttribManager::VertexAttribInfoList& infos =
+      state_.vertex_attrib_manager->GetEnabledVertexAttribInfos();
+  for (VertexAttribManager::VertexAttribInfoList::const_iterator it =
+       infos.begin(); it != infos.end(); ++it) {
+    const VertexAttrib* info = *it;
+    const Program::VertexAttrib* attrib_info =
+        state_.current_program->GetAttribInfoByLocation(info->index());
+    if (attrib_info) {
+      divisor0 |= (info->divisor() == 0);
+      GLuint count = info->MaxVertexAccessed(primcount, max_vertex_accessed);
+      // This attrib is used in the current program.
+      if (!info->CanAccess(count)) {
+        SetGLError(
+            GL_INVALID_OPERATION, function_name,
+            (std::string(
+                 "attempt to access out of range vertices in attribute ") +
+             base::IntToString(info->index())).c_str());
+        return false;
+      }
+    } else {
+      // This attrib is not used in the current program.
+      if (!info->buffer()) {
+        SetGLError(
+            GL_INVALID_OPERATION, function_name,
+            (std::string(
+                 "attempt to render with no buffer attached to "
+                 "enabled attribute ") +
+                 base::IntToString(info->index())).c_str());
+        return false;
+      }
+    }
+  }
+
+  if (primcount && !divisor0) {
+    SetGLError(
+        GL_INVALID_OPERATION, function_name,
+        "attempt instanced render with all attributes having "
+        "non-zero divisors");
+    return false;
+  }
+
+  return true;
 }
 
 bool GLES2DecoderImpl::SimulateAttrib0(
     const char* function_name, GLuint max_vertex_accessed, bool* simulated) {
   DCHECK(simulated);
   *simulated = false;
 
   if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2)
     return true;
 
@@ skipping 340 matching lines @@
 
   if (!CheckBoundFramebuffersValid(function_name)) {
     return error::kNoError;
   }
 
   if (count == 0 || (instanced && primcount == 0)) {
     return error::kNoError;
   }
 
   GLuint max_vertex_accessed;
-  Buffer* element_array_buffer =
-      state_.vertex_attrib_manager->element_array_buffer();
-
-  if (!element_array_buffer->GetMaxValueForRange(
-      offset, count, type, &max_vertex_accessed)) {
+  if (!state_.vertex_attrib_manager->element_array_buffer()->
+      GetMaxValueForRange(offset, count, type, &max_vertex_accessed)) {
     SetGLError(GL_INVALID_OPERATION,
                function_name, "range out of bounds for buffer");
     return error::kNoError;
   }
 
   if (IsDrawValid(function_name, max_vertex_accessed, primcount)) {
     if (!ClearUnclearedTextures()) {
       SetGLError(GL_INVALID_VALUE, function_name, "out of memory");
       return error::kNoError;
     }
     bool simulated_attrib_0 = false;
     if (!SimulateAttrib0(
         function_name, max_vertex_accessed, &simulated_attrib_0)) {
       return error::kNoError;
     }
     bool simulated_fixed_attribs = false;
     if (SimulateFixedAttribs(
         function_name, max_vertex_accessed, &simulated_fixed_attribs,
         primcount)) {
       bool textures_set = SetBlackTextureForNonRenderableTextures();
       ApplyDirtyState();
-      // TODO(gman): Refactor to hide these details in BufferManager or
-      // VertexAttribManager.
       const GLvoid* indices = reinterpret_cast<const GLvoid*>(offset);
-      bool used_client_side_array = false;
-      if (element_array_buffer->IsClientSideArray()) {
-        used_client_side_array = true;
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-        indices = element_array_buffer->GetRange(offset, 0);
-      }
-
       if (!instanced) {
         glDrawElements(mode, count, type, indices);
       } else {
         glDrawElementsInstancedANGLE(mode, count, type, indices, primcount);
       }
-
-      if (used_client_side_array) {
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
-                     element_array_buffer->service_id());
-      }
-
       ProcessPendingQueries();
       if (textures_set) {
         RestoreStateForNonRenderableTextures();
       }
       if (simulated_fixed_attribs) {
         RestoreStateForSimulatedFixedAttribs();
       }
     }
     if (simulated_attrib_0) {
       RestoreStateForAttrib(0);
@@ skipping 997 matching lines @@
     return;
   }
   if (!validators_->buffer_usage.IsValid(usage)) {
     SetGLErrorInvalidEnum("glBufferData", usage, "usage");
     return;
   }
   if (size < 0) {
     SetGLError(GL_INVALID_VALUE, "glBufferData", "size < 0");
     return;
   }
-  Buffer* buffer = GetBufferInfoForTarget(target);
-  if (!buffer) {
+  Buffer* info = GetBufferInfoForTarget(target);
+  if (!info) {
     SetGLError(GL_INVALID_VALUE, "glBufferData", "unknown buffer");
     return;
   }
 
   if (!EnsureGPUMemoryAvailable(size)) {
     SetGLError(GL_OUT_OF_MEMORY, "glBufferData", "out of memory");
     return;
   }
 
-  buffer_manager()->DoBufferData(this, buffer, size, usage, data);
+  // Clear the buffer to 0 if no initial data was passed in.
+  scoped_array<int8> zero;
+  if (!data) {
+    zero.reset(new int8[size]);
+    memset(zero.get(), 0, size);
+    data = zero.get();
+  }
+
+  CopyRealGLErrorsToWrapper();
+  glBufferData(target, size, data, usage);
+  GLenum error = PeekGLError();
+  if (error == GL_NO_ERROR) {
+    buffer_manager()->SetInfo(info, size, usage);
+    info->SetRange(0, size, data);
+  } else {
+    buffer_manager()->SetInfo(info, 0, usage);
+  }
 }
 
 error::Error GLES2DecoderImpl::HandleBufferData(
     uint32 immediate_data_size, const cmds::BufferData& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizeiptr size = static_cast<GLsizeiptr>(c.size);
   uint32 data_shm_id = static_cast<uint32>(c.data_shm_id);
   uint32 data_shm_offset = static_cast<uint32>(c.data_shm_offset);
   GLenum usage = static_cast<GLenum>(c.usage);
   const void* data = NULL;
@@ skipping 16 matching lines @@
   if (!data) {
     return error::kOutOfBounds;
   }
   GLenum usage = static_cast<GLenum>(c.usage);
   DoBufferData(target, size, data, usage);
   return error::kNoError;
 }
 
 void GLES2DecoderImpl::DoBufferSubData(
   GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid * data) {
-  Buffer* buffer = GetBufferInfoForTarget(target);
-  if (!buffer) {
+  Buffer* info = GetBufferInfoForTarget(target);
+  if (!info) {
     SetGLError(GL_INVALID_VALUE, "glBufferSubData", "unknown buffer");
     return;
   }
-
-  buffer_manager()->DoBufferSubData(this, buffer, offset, size, data);
+  if (!info->SetRange(offset, size, data)) {
+    SetGLError(GL_INVALID_VALUE, "glBufferSubData", "out of range");
+    return;
+  }
+  glBufferSubData(target, offset, size, data);
 }
 
 bool GLES2DecoderImpl::ClearLevel(
     unsigned service_id,
     unsigned bind_target,
     unsigned target,
     int level,
     unsigned format,
     unsigned type,
     int width,
@@ skipping 2893 matching lines @@
   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