Index: third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.h |
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.h b/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.h |
index e9192af45b402a3f22e6ea59cca2579bccb29689..bfa169ca500e9ba66b016b71cd1870f24af30afc 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.h |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.h |
@@ -25,31 +25,11 @@ public: |
// Cached values for vertex attrib range checks |
class VertexAttribState final : public GarbageCollected<VertexAttribState> { |
Zhenyao Mo
2016/01/05 21:13:21
Do we still need this class? Can't we just put bu
Ken Russell (switch to Gerrit)
2016/01/06 03:55:27
It looks to me like m_vertexAttribState could be c
yunchao
2016/01/06 17:31:42
Thanks for your review, Zhenyao and Ken. I have tr
|
public: |
- VertexAttribState() |
- : enabled(false) |
- , bytesPerElement(0) |
- , size(4) |
- , type(GL_FLOAT) |
- , normalized(false) |
- , stride(16) |
- , originalStride(0) |
- , offset(0) |
- , divisor(0) |
- { |
- } |
+ VertexAttribState() {} |
DECLARE_TRACE(); |
- bool enabled; |
Member<WebGLBuffer> bufferBinding; |
- GLsizei bytesPerElement; |
- GLint size; |
- GLenum type; |
- bool normalized; |
- GLsizei stride; |
- GLsizei originalStride; |
- GLintptr offset; |
- GLuint divisor; |
}; |
bool isDefaultObject() const { return m_type == VaoTypeDefault; } |
@@ -61,9 +41,8 @@ public: |
void setElementArrayBuffer(WebGLBuffer*); |
VertexAttribState* getVertexAttribState(size_t); |
- void setVertexAttribState(GLuint, GLsizei, GLint, GLenum, GLboolean, GLsizei, GLintptr, WebGLBuffer*); |
+ void setVertexAttribState(GLuint, WebGLBuffer*); |
void unbindBuffer(WebGLBuffer*); |
- void setVertexAttribDivisor(GLuint index, GLuint divisor); |
DECLARE_VIRTUAL_TRACE(); |