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

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

Issue 1431433003: Move shader compiling to ProgramBuilder and various ShaderBuilder cleanups. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: nits Created 5 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/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLProgramDesc.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 #include "GrGLProgram.h" 8 #include "GrGLProgram.h"
9 9
10 #include "GrAllocator.h" 10 #include "GrAllocator.h"
11 #include "GrProcessor.h" 11 #include "GrProcessor.h"
12 #include "GrCoordTransform.h" 12 #include "GrCoordTransform.h"
13 #include "GrGLGeometryProcessor.h" 13 #include "GrGLGeometryProcessor.h"
14 #include "GrGLGpu.h" 14 #include "GrGLGpu.h"
15 #include "GrGLPathRendering.h" 15 #include "GrGLPathRendering.h"
16 #include "GrGLXferProcessor.h" 16 #include "GrGLXferProcessor.h"
17 #include "GrPathProcessor.h" 17 #include "GrPathProcessor.h"
18 #include "GrPipeline.h" 18 #include "GrPipeline.h"
19 #include "GrXferProcessor.h" 19 #include "GrXferProcessor.h"
20 #include "gl/GrGLFragmentProcessor.h"
20 #include "SkXfermode.h" 21 #include "SkXfermode.h"
21 22
22 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) 23 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X)
23 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) 24 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
24 25
25 //////////////////////////////////////////////////////////////////////////////// /////////////////// 26 //////////////////////////////////////////////////////////////////////////////// ///////////////////
26 27
27 GrGLProgram::GrGLProgram(GrGLGpu* gpu, 28 GrGLProgram::GrGLProgram(GrGLGpu* gpu,
28 const GrProgramDesc& desc, 29 const GrProgramDesc& desc,
29 const BuiltinUniformHandles& builtinUniforms, 30 const BuiltinUniformHandles& builtinUniforms,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 fRenderTargetState.getRTAdjustmentVec(rtAdjustmentVec); 140 fRenderTargetState.getRTAdjustmentVec(rtAdjustmentVec);
140 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec); 141 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
141 } 142 }
142 } else { 143 } else {
143 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport()); 144 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
144 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); 145 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
145 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(), 146 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(),
146 size, rt->origin()); 147 size, rt->origin());
147 } 148 }
148 } 149 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLProgramDesc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698