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

Side by Side Diff: src/gpu/gl/GrGpuGL.cpp

Issue 140823003: Move GrGLExtensions from GrGLContextInfo to GrGLInterface (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: upload again, rietveld diff failed. Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #include "GrGpuGL.h" 9 #include "GrGpuGL.h"
10 #include "GrGLStencilBuffer.h" 10 #include "GrGLStencilBuffer.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 const GrGLubyte* version; 131 const GrGLubyte* version;
132 GL_CALL_RET(vendor, GetString(GR_GL_VENDOR)); 132 GL_CALL_RET(vendor, GetString(GR_GL_VENDOR));
133 GL_CALL_RET(renderer, GetString(GR_GL_RENDERER)); 133 GL_CALL_RET(renderer, GetString(GR_GL_RENDERER));
134 GL_CALL_RET(version, GetString(GR_GL_VERSION)); 134 GL_CALL_RET(version, GetString(GR_GL_VERSION));
135 GrPrintf("------------------------- create GrGpuGL %p --------------\n", 135 GrPrintf("------------------------- create GrGpuGL %p --------------\n",
136 this); 136 this);
137 GrPrintf("------ VENDOR %s\n", vendor); 137 GrPrintf("------ VENDOR %s\n", vendor);
138 GrPrintf("------ RENDERER %s\n", renderer); 138 GrPrintf("------ RENDERER %s\n", renderer);
139 GrPrintf("------ VERSION %s\n", version); 139 GrPrintf("------ VERSION %s\n", version);
140 GrPrintf("------ EXTENSIONS\n"); 140 GrPrintf("------ EXTENSIONS\n");
141 ctx.extensions().print(); 141 #if 0 // TODO: Reenable this after GrGLInterface's extensions can be accessed s afely.
142 ctx.extensions().print();
143 #endif
142 GrPrintf("\n"); 144 GrPrintf("\n");
143 GrPrintf(this->glCaps().dump().c_str()); 145 GrPrintf(this->glCaps().dump().c_str());
144 } 146 }
145 147
146 fProgramCache = SkNEW_ARGS(ProgramCache, (this)); 148 fProgramCache = SkNEW_ARGS(ProgramCache, (this));
147 149
148 SkASSERT(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttr ibCnt); 150 SkASSERT(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttr ibCnt);
149 151
150 fLastSuccessfulStencilFmtIdx = 0; 152 fLastSuccessfulStencilFmtIdx = 0;
151 fHWProgramID = 0; 153 fHWProgramID = 0;
(...skipping 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 this->setVertexArrayID(gpu, 0); 2698 this->setVertexArrayID(gpu, 0);
2697 } 2699 }
2698 int attrCount = gpu->glCaps().maxVertexAttributes(); 2700 int attrCount = gpu->glCaps().maxVertexAttributes();
2699 if (fDefaultVertexArrayAttribState.count() != attrCount) { 2701 if (fDefaultVertexArrayAttribState.count() != attrCount) {
2700 fDefaultVertexArrayAttribState.resize(attrCount); 2702 fDefaultVertexArrayAttribState.resize(attrCount);
2701 } 2703 }
2702 attribState = &fDefaultVertexArrayAttribState; 2704 attribState = &fDefaultVertexArrayAttribState;
2703 } 2705 }
2704 return attribState; 2706 return attribState;
2705 } 2707 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698