Index: gpu/command_buffer/service/vertex_attrib_manager.h |
diff --git a/gpu/command_buffer/service/vertex_attrib_manager.h b/gpu/command_buffer/service/vertex_attrib_manager.h |
index b5425e0dc9cb2d33ecf75cbbf727001db2331ef6..f7fd4955dcaff195f7e548d38cf8b15ed4ade789 100644 |
--- a/gpu/command_buffer/service/vertex_attrib_manager.h |
+++ b/gpu/command_buffer/service/vertex_attrib_manager.h |
@@ -116,16 +116,13 @@ class GPU_EXPORT VertexAttrib { |
GLboolean normalized, |
GLsizei gl_stride, |
GLsizei real_stride, |
- GLsizei offset); |
+ GLsizei offset, |
+ GLboolean integer); |
void SetDivisor(GLsizei divisor) { |
divisor_ = divisor; |
} |
- void SetInteger(GLboolean integer) { |
- integer_ = integer; |
- } |
- |
void Unbind(Buffer* buffer); |
// The index of this attrib. |
@@ -207,7 +204,8 @@ class GPU_EXPORT VertexAttribManager : |
GLboolean normalized, |
GLsizei gl_stride, |
GLsizei real_stride, |
- GLsizei offset) { |
+ GLsizei offset, |
+ GLboolean integer) { |
VertexAttrib* attrib = GetVertexAttrib(index); |
if (attrib) { |
if (attrib->type() == GL_FIXED) { |
@@ -216,8 +214,8 @@ class GPU_EXPORT VertexAttribManager : |
if (type == GL_FIXED) { |
++num_fixed_attribs_; |
} |
- attrib->SetInfo( |
- buffer, size, type, normalized, gl_stride, real_stride, offset); |
+ attrib->SetInfo(buffer, size, type, normalized, gl_stride, real_stride, |
+ offset, integer); |
} |
} |
@@ -228,13 +226,6 @@ class GPU_EXPORT VertexAttribManager : |
} |
} |
- void SetInteger(GLuint index, GLboolean integer) { |
- VertexAttrib* attrib = GetVertexAttrib(index); |
- if (attrib) { |
- attrib->SetInteger(integer); |
- } |
- } |
- |
void SetElementArrayBuffer(Buffer* buffer); |
Buffer* element_array_buffer() const { return element_array_buffer_.get(); } |