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

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

Issue 746423007: Draft change to start pulling uniform color into GP (Closed) Base URL: https://skia.googlesource.com/skia.git@no_factories
Patch Set: rebase Created 6 years 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/builders/GrGLNvprProgramBuilder.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 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 "GrGLLegacyNvprProgramBuilder.h" 8 #include "GrGLLegacyNvprProgramBuilder.h"
9 #include "../GrGpuGL.h" 9 #include "../GrGpuGL.h"
10 10
(...skipping 27 matching lines...) Expand all
38 GrSLType type = processorStage.isPerspectiveCoordTransform(t) ? kVec3f_G rSLType : 38 GrSLType type = processorStage.isPerspectiveCoordTransform(t) ? kVec3f_G rSLType :
39 kVec2f_G rSLType; 39 kVec2f_G rSLType;
40 40
41 name.printf("%s(gl_TexCoord[%i])", GrGLSLTypeString(type), texCoordIndex ++); 41 name.printf("%s(gl_TexCoord[%i])", GrGLSLTypeString(type), texCoordIndex ++);
42 SkNEW_APPEND_TO_TARRAY(outCoords, GrGLProcessor::TransformedCoords, (nam e, type)); 42 SkNEW_APPEND_TO_TARRAY(outCoords, GrGLProcessor::TransformedCoords, (nam e, type));
43 } 43 }
44 } 44 }
45 45
46 GrGLProgram* GrGLLegacyNvprProgramBuilder::createProgram(GrGLuint programID) { 46 GrGLProgram* GrGLLegacyNvprProgramBuilder::createProgram(GrGLuint programID) {
47 return SkNEW_ARGS(GrGLLegacyNvprProgram, (fGpu, fDesc, fUniformHandles, prog ramID, fUniforms, 47 return SkNEW_ARGS(GrGLLegacyNvprProgram, (fGpu, fDesc, fUniformHandles, prog ramID, fUniforms,
48 fXferProcessor, fFragmentProcessor s.get(), 48 fGeometryProcessor, fXferProcessor, fFragmentProcessors.get(),
49 fTexCoordSetCnt)); 49 fTexCoordSetCnt));
50 } 50 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698