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

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

Issue 560443004: Revert of Attach GrOptDrawState into shader building pipeline (Closed) Base URL: https://skia.googlesource.com/skia.git@opt2
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGpuGL_program.cpp » ('j') | 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"
11 #include "GrOptDrawState.h"
12 #include "GrTemplates.h" 11 #include "GrTemplates.h"
13 #include "GrTypes.h" 12 #include "GrTypes.h"
14 #include "SkStrokeRec.h" 13 #include "SkStrokeRec.h"
15 #include "SkTemplates.h" 14 #include "SkTemplates.h"
16 15
17 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) 16 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
18 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) 17 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
19 18
20 #define SKIP_CACHE_CHECK true 19 #define SKIP_CACHE_CHECK true
21 20
(...skipping 2576 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 this->setVertexArrayID(gpu, 0); 2597 this->setVertexArrayID(gpu, 0);
2599 } 2598 }
2600 int attrCount = gpu->glCaps().maxVertexAttributes(); 2599 int attrCount = gpu->glCaps().maxVertexAttributes();
2601 if (fDefaultVertexArrayAttribState.count() != attrCount) { 2600 if (fDefaultVertexArrayAttribState.count() != attrCount) {
2602 fDefaultVertexArrayAttribState.resize(attrCount); 2601 fDefaultVertexArrayAttribState.resize(attrCount);
2603 } 2602 }
2604 attribState = &fDefaultVertexArrayAttribState; 2603 attribState = &fDefaultVertexArrayAttribState;
2605 } 2604 }
2606 return attribState; 2605 return attribState;
2607 } 2606 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGpuGL_program.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698