Chromium Code Reviews| Index: src/gpu/gl/GrGpuGL.cpp |
| diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp |
| index bc067e0062470bd01f87a958c35260ac96365f69..6f9a8ab152f04f43e192bbf2229a92c88b168f29 100644 |
| --- a/src/gpu/gl/GrGpuGL.cpp |
| +++ b/src/gpu/gl/GrGpuGL.cpp |
| @@ -371,17 +371,7 @@ void GrGpuGL::onResetContext(uint32_t resetBits) { |
| GL_CALL(MatrixMode(GR_GL_MODELVIEW)); |
| GL_CALL(LoadIdentity()); |
|
robertphillips
2013/09/09 13:53:33
Seems like this would be a useful comment back in
bsalomon
2013/09/09 14:11:44
Done.
|
| - // When we use fixed function vertex processing we always use the vertex array |
| - // and none of the other arrays. |
| - GL_CALL(EnableClientState(GR_GL_VERTEX_ARRAY)); |
| - GL_CALL(DisableClientState(GR_GL_NORMAL_ARRAY)); |
| - GL_CALL(DisableClientState(GR_GL_COLOR_ARRAY)); |
| - GL_CALL(DisableClientState(GR_GL_INDEX_ARRAY)); |
| - GL_CALL(DisableClientState(GR_GL_EDGE_FLAG_ARRAY)); |
| for (int i = 0; i < this->glCaps().maxFixedFunctionTextureCoords(); ++i) { |
| - GL_CALL(ClientActiveTexture(GR_GL_TEXTURE0 + i)); |
| - GL_CALL(DisableClientState(GR_GL_TEXTURE_COORD_ARRAY)); |
| - |
| GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + i)); |
| GL_CALL(Disable(GR_GL_TEXTURE_GEN_S)); |
| GL_CALL(Disable(GR_GL_TEXTURE_GEN_T)); |