Fine tune vertex attrib commands handling.

gpu/command_buffer/client/vertex_array_object_manager_unittest.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/client/vertex_array_object_manager.h"
 
 #include <GLES2/gl2ext.h>
+#include <GLES3/gl3.h>
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 namespace gles2 {
 
 class VertexArrayObjectManagerTest : public testing::Test {
  protected:
   static const GLuint kMaxAttribs = 4;
   static const GLuint kClientSideArrayBuffer = 0x1234;
   static const GLuint kClientSideElementArrayBuffer = 0x1235;
@@ skipping 54 matching lines @@
   const GLuint kBufferToUnbind = 123;
   const GLuint kBufferToRemain = 456;
   const GLuint kElementArray = 789;
   bool changed = false;
   GLuint ids[2] = { 1, 3, };
   manager_->GenVertexArrays(arraysize(ids), ids);
   // Bind buffers to attribs on 2 vaos.
   for (size_t ii = 0; ii < arraysize(ids); ++ii) {
     EXPECT_TRUE(manager_->BindVertexArray(ids[ii], &changed));
     EXPECT_TRUE(manager_->SetAttribPointer(
-        kBufferToUnbind, 0, 4, GL_FLOAT, false, 0, 0));
+        kBufferToUnbind, 0, 4, GL_FLOAT, false, 0, 0, GL_FALSE));
     EXPECT_TRUE(manager_->SetAttribPointer(
-        kBufferToRemain, 1, 4, GL_FLOAT, false, 0, 0));
+        kBufferToRemain, 1, 4, GL_FLOAT, false, 0, 0, GL_FALSE));
     EXPECT_TRUE(manager_->SetAttribPointer(
-        kBufferToUnbind, 2, 4, GL_FLOAT, false, 0, 0));
+        kBufferToUnbind, 2, 4, GL_FLOAT, false, 0, 0, GL_FALSE));
     EXPECT_TRUE(manager_->SetAttribPointer(
-        kBufferToRemain, 3, 4, GL_FLOAT, false, 0, 0));
+        kBufferToRemain, 3, 4, GL_FLOAT, false, 0, 0, GL_FALSE));
     for (size_t jj = 0; jj < 4u; ++jj) {
       manager_->SetAttribEnable(jj, true);
     }
     manager_->BindElementArray(kElementArray);
   }
   EXPECT_FALSE(manager_->HaveEnabledClientSideBuffers());
   EXPECT_TRUE(manager_->BindVertexArray(ids[0], &changed));
   // Unbind the buffer.
   manager_->UnbindBuffer(kBufferToUnbind);
   manager_->UnbindBuffer(kElementArray);
@@ skipping 29 matching lines @@
   manager_->SetAttribEnable(2, true);
   manager_->UnbindBuffer(0);
   manager_->SetAttribEnable(2, false);
   EXPECT_FALSE(manager_->HaveEnabledClientSideBuffers());
 }
 
 TEST_F(VertexArrayObjectManagerTest, GetSet) {
   const char* dummy = "dummy";
   const void* p = reinterpret_cast<const void*>(dummy);
   manager_->SetAttribEnable(1, true);
-  manager_->SetAttribPointer(123, 1, 3, GL_BYTE, true, 3, p);
+  manager_->SetAttribPointer(123, 1, 3, GL_BYTE, true, 3, p, GL_TRUE);
   uint32 param;
   void* ptr;
   EXPECT_TRUE(manager_->GetVertexAttrib(
       1, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &param));
   EXPECT_EQ(123u, param);
   EXPECT_TRUE(manager_->GetVertexAttrib(
       1, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &param));
   EXPECT_NE(0u, param);
   EXPECT_TRUE(manager_->GetVertexAttrib(
       1, GL_VERTEX_ATTRIB_ARRAY_SIZE, &param));
   EXPECT_EQ(3u, param);
   EXPECT_TRUE(manager_->GetVertexAttrib(
       1, GL_VERTEX_ATTRIB_ARRAY_TYPE, &param));
   EXPECT_EQ(static_cast<uint32>(GL_BYTE), param);
   EXPECT_TRUE(manager_->GetVertexAttrib(
       1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &param));
   EXPECT_NE(0u, param);
+  EXPECT_TRUE(manager_->GetVertexAttrib(
+      1, GL_VERTEX_ATTRIB_ARRAY_INTEGER, &param));
+  EXPECT_EQ(1u, param);
   EXPECT_TRUE(manager_->GetAttribPointer(
       1, GL_VERTEX_ATTRIB_ARRAY_POINTER, &ptr));
   EXPECT_EQ(p, ptr);
 
   // Check that getting the divisor is passed to the service.
   // This is because the divisor is an optional feature which
   // only the service can validate.
   EXPECT_FALSE(manager_->GetVertexAttrib(
       0, GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE, &param));
 }
 
 TEST_F(VertexArrayObjectManagerTest, HaveEnabledClientSideArrays) {
   // Check turning on an array.
   manager_->SetAttribEnable(1, true);
   EXPECT_TRUE(manager_->HaveEnabledClientSideBuffers());
   // Check turning off an array.
   manager_->SetAttribEnable(1, false);
   EXPECT_FALSE(manager_->HaveEnabledClientSideBuffers());
   // Check turning on an array and assigning a buffer.
   manager_->SetAttribEnable(1, true);
-  manager_->SetAttribPointer(123, 1, 3, GL_BYTE, true, 3, NULL);
+  manager_->SetAttribPointer(123, 1, 3, GL_BYTE, true, 3, NULL, GL_FALSE);
   EXPECT_FALSE(manager_->HaveEnabledClientSideBuffers());
   // Check unassigning a buffer.
-  manager_->SetAttribPointer(0, 1, 3, GL_BYTE, true, 3, NULL);
+  manager_->SetAttribPointer(0, 1, 3, GL_BYTE, true, 3, NULL, GL_FALSE);
   EXPECT_TRUE(manager_->HaveEnabledClientSideBuffers());
   // Check disabling the array.
   manager_->SetAttribEnable(1, false);
   EXPECT_FALSE(manager_->HaveEnabledClientSideBuffers());
 }
 
 TEST_F(VertexArrayObjectManagerTest, BindElementArray) {
   bool changed = false;
   GLuint ids[2] = { 1, 3, };
   manager_->GenVertexArrays(arraysize(ids), ids);
@@ skipping 64 matching lines @@
   EXPECT_TRUE(manager_->IsReservedId(kClientSideArrayBuffer));
   EXPECT_TRUE(manager_->IsReservedId(kClientSideElementArrayBuffer));
   EXPECT_FALSE(manager_->IsReservedId(0));
   EXPECT_FALSE(manager_->IsReservedId(1));
   EXPECT_FALSE(manager_->IsReservedId(2));
 }
 
 }  // namespace gles2
 }  // namespace gpu