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

Side by Side Diff: src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp

Issue 739673002: Create GrOptDrawState before recording draw in GrInOrderDrawBuffer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove unused function in pendingprogramelement Created 6 years, 1 month 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/builders/GrGLNvprProgramBuilder.h ('k') | src/gpu/gl/builders/GrGLProgramBuilder.h » ('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 2014 Google Inc. 2 * Copyright 2014 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 #include "GrGLNvprProgramBuilder.h" 8 #include "GrGLNvprProgramBuilder.h"
9 #include "../GrGpuGL.h" 9 #include "../GrGpuGL.h"
10 10
11 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) 11 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
12 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) 12 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X)
13 13
14 GrGLNvprProgramBuilder::GrGLNvprProgramBuilder(GrGpuGL* gpu, 14 GrGLNvprProgramBuilder::GrGLNvprProgramBuilder(GrGpuGL* gpu,
15 const GrOptDrawState& optState) 15 const GrOptDrawState& optState)
16 : INHERITED(gpu, optState) 16 : INHERITED(gpu, optState)
17 , fSeparableVaryingInfos(kVarsPerBlock) { 17 , fSeparableVaryingInfos(kVarsPerBlock) {
18 } 18 }
19 19
20 void GrGLNvprProgramBuilder::emitTransforms(const GrFragmentStage& processorStag e, 20 void GrGLNvprProgramBuilder::emitTransforms(const GrPendingFragmentStage& proces sorStage,
21 GrGLProcessor::TransformedCoordsArra y* outCoords, 21 GrGLProcessor::TransformedCoordsArra y* outCoords,
22 GrGLInstalledFragProc* ifp) { 22 GrGLInstalledFragProc* ifp) {
23 const GrFragmentProcessor* effect = processorStage.getProcessor(); 23 const GrFragmentProcessor* effect = processorStage.getProcessor();
24 int numTransforms = effect->numTransforms(); 24 int numTransforms = effect->numTransforms();
25 25
26 ifp->fTransforms.push_back_n(numTransforms); 26 ifp->fTransforms.push_back_n(numTransforms);
27 27
28 for (int t = 0; t < numTransforms; t++) { 28 for (int t = 0; t < numTransforms; t++) {
29 GrSLType varyingType = 29 GrSLType varyingType =
30 processorStage.isPerspectiveCoordTransform(t, false) ? 30 processorStage.isPerspectiveCoordTransform(t) ?
31 kVec3f_GrSLType : 31 kVec3f_GrSLType :
32 kVec2f_GrSLType; 32 kVec2f_GrSLType;
33 33
34 const char* varyingName = "MatrixCoord"; 34 const char* varyingName = "MatrixCoord";
35 SkString suffixedVaryingName; 35 SkString suffixedVaryingName;
36 if (0 != t) { 36 if (0 != t) {
37 suffixedVaryingName.append(varyingName); 37 suffixedVaryingName.append(varyingName);
38 suffixedVaryingName.appendf("_%i", t); 38 suffixedVaryingName.appendf("_%i", t);
39 varyingName = suffixedVaryingName.c_str(); 39 varyingName = suffixedVaryingName.c_str();
40 } 40 }
(...skipping 26 matching lines...) Expand all
67 } 67 }
68 } 68 }
69 69
70 GrGLProgram* GrGLNvprProgramBuilder::createProgram(GrGLuint programID) { 70 GrGLProgram* GrGLNvprProgramBuilder::createProgram(GrGLuint programID) {
71 // this is just for nvpr es, which has separable varyings that are plugged i n after 71 // this is just for nvpr es, which has separable varyings that are plugged i n after
72 // building 72 // building
73 this->resolveSeparableVaryings(programID); 73 this->resolveSeparableVaryings(programID);
74 return SkNEW_ARGS(GrGLNvprProgram, (fGpu, fDesc, fUniformHandles, programID, fUniforms, 74 return SkNEW_ARGS(GrGLNvprProgram, (fGpu, fDesc, fUniformHandles, programID, fUniforms,
75 fFragmentProcessors.get(), fSeparableVar yingInfos)); 75 fFragmentProcessors.get(), fSeparableVar yingInfos));
76 } 76 }
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLNvprProgramBuilder.h ('k') | src/gpu/gl/builders/GrGLProgramBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698