Revert of Initialize buffers before allowing access to them.

gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc

 // Copyright 2016 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <GLES3/gl3.h>
 #include <stdint.h>
 
@@ skipping 121 matching lines @@
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
                                         kBlackColor));
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
                                         kBlackColor));
 
-  // The following test is necessary to make sure draw calls do not just check
-  // bound buffers, but actual buffers that are attached to the enabled vertex
-  // attribs.
-  glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
-                                        kBlackColor));
-
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
-  EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
-                                        kBlackColor));
-
-  glBindBuffer(GL_ARRAY_BUFFER, buffer);
   glUnmapBuffer(GL_ARRAY_BUFFER);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDrawArrays(GL_TRIANGLES, 0, 6);
   GLTestHelper::CheckGLError("no errors", __LINE__);
   EXPECT_TRUE(
       GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ skipping 45 matching lines @@
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
                                         kBlackColor));
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
                                kPrimCount);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
                                         kBlackColor));
 
-  // The following test is necessary to make sure draw calls do not just check
-  // bound buffers, but actual buffers that are attached to the enabled vertex
-  // attribs.
-  glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
-                                        kBlackColor));
-
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
-                               kPrimCount);
-  EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
-                                        kBlackColor));
-
-  glBindBuffer(GL_ARRAY_BUFFER, buffers[0]);
-
   glUnmapBuffer(GL_ARRAY_BUFFER);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
   GLTestHelper::CheckGLError("no errors", __LINE__);
   EXPECT_TRUE(
       GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ skipping 151 matching lines @@
                   kTextureSize, GL_RGBA, GL_UNSIGNED_BYTE, 0);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 // TODO(zmo): Add tests for CompressedTex* functions.
 
 TEST_F(ES3MapBufferRangeTest, TransformFeedback) {
   if (ShouldSkipTest())
     return;
 
-  GLuint transform_feedback = 0;
-  glGenTransformFeedbacks(1, &transform_feedback);
-  glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transform_feedback);
-  GLTestHelper::CheckGLError("no errors", __LINE__);
-
   GLuint transform_feedback_buffer[2];
   glGenBuffers(2, transform_feedback_buffer);
   EXPECT_LT(0u, transform_feedback_buffer[0]);
   EXPECT_LT(0u, transform_feedback_buffer[1]);
   glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0,
                    transform_feedback_buffer[0]);
   glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 3 * 6 * sizeof(float), 0,
                GL_STATIC_READ);
   glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 1,
                    transform_feedback_buffer[1]);
   glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 2 * 6 * sizeof(float), 0,
                GL_STATIC_READ);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   GLint position_loc = 0;
   SetupTransformFeedbackProgram(&position_loc);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   GLuint buffer = GLTestHelper::SetupUnitQuad(position_loc);
   GLTestHelper::CheckGLError("no errors", __LINE__);
   EXPECT_LT(0u, buffer);
 
+  GLuint transform_feedback = 0;
+  glGenTransformFeedbacks(1, &transform_feedback);
+  GLTestHelper::CheckGLError("no errors", __LINE__);
+
   glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 6, GL_MAP_WRITE_BIT);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glBeginTransformFeedback(GL_TRIANGLES);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 
   glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glBeginTransformFeedback(GL_TRIANGLES);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 6, GL_MAP_WRITE_BIT);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 
-  // Bind the used buffer to another binding target and try to map it using
-  // that target - should still fail.
-  glBindBuffer(GL_PIXEL_PACK_BUFFER, transform_feedback_buffer[0]);
-  GLTestHelper::CheckGLError("no errors", __LINE__);
-
-  glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, 6, GL_MAP_READ_BIT);
-  EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
-
   glDrawArrays(GL_TRIANGLES, 0, 6);
   glEndTransformFeedback();
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 6, GL_MAP_WRITE_BIT);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 // TODO(zmo): add tests for uniform buffer mapping.
 
 // TODO(zmo): add tests for CopyBufferSubData case.
 
 }  // namespace gpu