Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Unified Diff: src/gpu/gl/GrGpuGL.cpp

Issue 23542013: Improve handling of FF vertex array state (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Rob's comments and add secondary color array disable Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGpuGL.h ('k') | src/gpu/gl/GrGpuGL_program.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
- // 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));
« no previous file with comments | « src/gpu/gl/GrGpuGL.h ('k') | src/gpu/gl/GrGpuGL_program.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698