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

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

Issue 450283002: Simplify GrGLPathRendering interface (Closed) Base URL: https://skia.googlesource.com/skia.git@02-path-state-to-pathrendering-class
Patch Set: rebase Created 6 years, 4 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
« no previous file with comments | « src/gpu/gl/GrGpuGL.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 142
143 fProgramCache = SkNEW_ARGS(ProgramCache, (this)); 143 fProgramCache = SkNEW_ARGS(ProgramCache, (this));
144 144
145 SkASSERT(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttr ibCnt); 145 SkASSERT(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttr ibCnt);
146 146
147 fLastSuccessfulStencilFmtIdx = 0; 147 fLastSuccessfulStencilFmtIdx = 0;
148 fHWProgramID = 0; 148 fHWProgramID = 0;
149 149
150 if (this->glCaps().pathRenderingSupport()) { 150 if (this->glCaps().pathRenderingSupport()) {
151 fPathRendering.reset(GrGLPathRendering::Create(this)); 151 fPathRendering.reset(new GrGLPathRendering(this));
152 } 152 }
153 } 153 }
154 154
155 GrGpuGL::~GrGpuGL() { 155 GrGpuGL::~GrGpuGL() {
156 if (0 != fHWProgramID) { 156 if (0 != fHWProgramID) {
157 // detach the current program so there is no confusion on OpenGL's part 157 // detach the current program so there is no confusion on OpenGL's part
158 // that we want it to be deleted 158 // that we want it to be deleted
159 SkASSERT(fHWProgramID == fCurrentProgram->programID()); 159 SkASSERT(fHWProgramID == fCurrentProgram->programID());
160 GL_CALL(UseProgram(0)); 160 GL_CALL(UseProgram(0));
161 } 161 }
(...skipping 2443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2605 this->setVertexArrayID(gpu, 0); 2605 this->setVertexArrayID(gpu, 0);
2606 } 2606 }
2607 int attrCount = gpu->glCaps().maxVertexAttributes(); 2607 int attrCount = gpu->glCaps().maxVertexAttributes();
2608 if (fDefaultVertexArrayAttribState.count() != attrCount) { 2608 if (fDefaultVertexArrayAttribState.count() != attrCount) {
2609 fDefaultVertexArrayAttribState.resize(attrCount); 2609 fDefaultVertexArrayAttribState.resize(attrCount);
2610 } 2610 }
2611 attribState = &fDefaultVertexArrayAttribState; 2611 attribState = &fDefaultVertexArrayAttribState;
2612 } 2612 }
2613 return attribState; 2613 return attribState;
2614 } 2614 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGpuGL.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698