Fine tune vertex attrib commands handling.

gpu/command_buffer/service/vertex_attrib_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/service/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ skipping 87 matching lines @@
 }
 
 TEST_F(VertexAttribManagerTest, SetAttribInfo) {
   BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
   VertexAttrib* attrib = manager_->GetVertexAttrib(1);
 
-  manager_->SetAttribInfo(1, buffer, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
+  manager_->SetAttribInfo(1, buffer, 3, GL_SHORT, GL_TRUE, 32, 32, 4, GL_TRUE);
 
   EXPECT_EQ(buffer, attrib->buffer());
   EXPECT_EQ(4, attrib->offset());
   EXPECT_EQ(3, attrib->size());
   EXPECT_EQ(static_cast<GLenum>(GL_SHORT), attrib->type());
   EXPECT_EQ(GL_TRUE, attrib->normalized());
   EXPECT_EQ(32, attrib->gl_stride());
+  EXPECT_EQ(GL_TRUE, attrib->integer());
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 TEST_F(VertexAttribManagerTest, HaveFixedAttribs) {
   EXPECT_FALSE(manager_->HaveFixedAttribs());
-  manager_->SetAttribInfo(1, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(1, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
-  manager_->SetAttribInfo(3, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(3, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
-  manager_->SetAttribInfo(1, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(1, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
-  manager_->SetAttribInfo(3, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(3, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_FALSE(manager_->HaveFixedAttribs());
 }
 
 TEST_F(VertexAttribManagerTest, CanAccess) {
   MockErrorState error_state;
   BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
   VertexAttrib* attrib = manager_->GetVertexAttrib(1);
 
   EXPECT_TRUE(attrib->CanAccess(0));
   manager_->Enable(1, true);
   EXPECT_FALSE(attrib->CanAccess(0));
 
-  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_FALSE(attrib->CanAccess(0));
 
   EXPECT_TRUE(buffer_manager.SetTarget(buffer, GL_ARRAY_BUFFER));
   TestHelper::DoBufferData(
       gl_.get(), &error_state, &buffer_manager, buffer, 15, GL_STATIC_DRAW,
       NULL, GL_NO_ERROR);
 
   EXPECT_FALSE(attrib->CanAccess(0));
   TestHelper::DoBufferData(
       gl_.get(), &error_state, &buffer_manager, buffer, 16, GL_STATIC_DRAW,
       NULL, GL_NO_ERROR);
   EXPECT_TRUE(attrib->CanAccess(0));
   EXPECT_FALSE(attrib->CanAccess(1));
 
-  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 1);
+  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 1, GL_FALSE);
   EXPECT_FALSE(attrib->CanAccess(0));
 
   TestHelper::DoBufferData(
       gl_.get(), &error_state, &buffer_manager, buffer, 32, GL_STATIC_DRAW,
       NULL, GL_NO_ERROR);
   EXPECT_TRUE(attrib->CanAccess(0));
   EXPECT_FALSE(attrib->CanAccess(1));
-  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
+  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0, GL_FALSE);
   EXPECT_TRUE(attrib->CanAccess(1));
-  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 20, 0);
+  manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 20, 0, GL_FALSE);
   EXPECT_TRUE(attrib->CanAccess(0));
   EXPECT_FALSE(attrib->CanAccess(1));
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 TEST_F(VertexAttribManagerTest, Unbind) {
   BufferManager buffer_manager(NULL, NULL);
   buffer_manager.CreateBuffer(1, 2);
   buffer_manager.CreateBuffer(3, 4);
   Buffer* buffer1 = buffer_manager.GetBuffer(1);
   Buffer* buffer2 = buffer_manager.GetBuffer(3);
   ASSERT_TRUE(buffer1 != NULL);
   ASSERT_TRUE(buffer2 != NULL);
 
   VertexAttrib* attrib1 = manager_->GetVertexAttrib(1);
   VertexAttrib* attrib3 = manager_->GetVertexAttrib(3);
 
   // Attach to 2 buffers.
-  manager_->SetAttribInfo(1, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
-  manager_->SetAttribInfo(3, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
+  manager_->SetAttribInfo(
+      1, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4, GL_FALSE);
+  manager_->SetAttribInfo(
+      3, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4, GL_FALSE);
   // Check they were attached.
   EXPECT_EQ(buffer1, attrib1->buffer());
   EXPECT_EQ(buffer1, attrib3->buffer());
   // Unbind unattached buffer.
   manager_->Unbind(buffer2);
   // Should be no-op.
   EXPECT_EQ(buffer1, attrib1->buffer());
   EXPECT_EQ(buffer1, attrib3->buffer());
   // Unbind buffer.
   manager_->Unbind(buffer1);
   // Check they were detached
   EXPECT_TRUE(NULL == attrib1->buffer());
   EXPECT_TRUE(NULL == attrib3->buffer());
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 // TODO(gman): Test ValidateBindings
 // TODO(gman): Test ValidateBindings with client side arrays.
 
 }  // namespace gles2
 }  // namespace gpu