diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-01 19:25:00 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-01 19:25:00 +0000 |
| commit | 60da4176425c74cf112d7e116f54a530a82d0d68 (patch) | |
| tree | 5b5bd322375a36fc603871db39e54f9ab2392c5c /src/gpu/gl/GrGpuGL.cpp | |
| parent | 890e3b58e78c0825820f75f1f0c5a5d71e855aa6 (diff) | |
Move max vertex attributes value to GL Caps
Review URL: http://codereview.appspot.com/6271043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4123 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index ec535b8a14..7b44035f24 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -280,11 +280,6 @@ void GrGpuGL::initCaps() { fCaps.fShaderDerivativeSupport = this->hasExtension("GL_OES_standard_derivatives"); } - - GR_GL_GetIntegerv(this->glInterface(), - GR_GL_MAX_VERTEX_ATTRIBS, - &fMaxVertexAttribs); - } void GrGpuGL::fillInConfigRenderableTable() { @@ -549,7 +544,7 @@ void GrGpuGL::onResetContext() { int posAttrIdx = GrGLProgram::PositionAttributeIdx(); GL_CALL(EnableVertexAttribArray(posAttrIdx)); // Disable all other vertex attributes. - for (int va = 0; va < fMaxVertexAttribs; ++va) { + for (int va = 0; va < this->glCaps().maxVertexAttributes(); ++va) { if (va != posAttrIdx) { GL_CALL(DisableVertexAttribArray(va)); } |