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

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

Issue 1862373003: Rename EmitArgs::fSamplers to fTexSamplers (Closed) Base URL: https://skia.googlesource.com/skia.git@upload3_infer
Patch Set: rebase Created 4 years, 8 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/effects/GrYUVEffect.cpp ('k') | src/gpu/glsl/GrGLSLFragmentProcessor.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 "GrGLProgramBuilder.h" 8 #include "GrGLProgramBuilder.h"
9 9
10 #include "GrAutoLocaleSetter.h" 10 #include "GrAutoLocaleSetter.h"
11 #include "GrCoordTransform.h" 11 #include "GrCoordTransform.h"
12 #include "GrGLProgramBuilder.h" 12 #include "GrGLProgramBuilder.h"
13 #include "GrSwizzle.h" 13 #include "GrSwizzle.h"
14 #include "GrTexture.h" 14 #include "GrTexture.h"
15 #include "SkRTConf.h" 15 #include "SkRTConf.h"
16 #include "SkTraceEvent.h" 16 #include "SkTraceEvent.h"
17 #include "gl/GrGLGpu.h" 17 #include "gl/GrGLGpu.h"
18 #include "gl/GrGLProgram.h" 18 #include "gl/GrGLProgram.h"
19 #include "gl/GrGLProgramDesc.h" 19 #include "gl/GrGLProgramDesc.h"
20 #include "gl/GrGLSLPrettyPrint.h" 20 #include "gl/GrGLSLPrettyPrint.h"
21 #include "gl/builders/GrGLShaderStringBuilder.h" 21 #include "gl/builders/GrGLShaderStringBuilder.h"
22 #include "glsl/GrGLSLCaps.h" 22 #include "glsl/GrGLSLCaps.h"
23 #include "glsl/GrGLSLFragmentProcessor.h" 23 #include "glsl/GrGLSLFragmentProcessor.h"
24 #include "glsl/GrGLSLGeometryProcessor.h" 24 #include "glsl/GrGLSLGeometryProcessor.h"
25 #include "glsl/GrGLSLProgramDataManager.h" 25 #include "glsl/GrGLSLProgramDataManager.h"
26 #include "glsl/GrGLSLTextureSampler.h" 26 #include "glsl/GrGLSLSampler.h"
27 #include "glsl/GrGLSLXferProcessor.h" 27 #include "glsl/GrGLSLXferProcessor.h"
28 28
29 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) 29 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
30 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) 30 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X)
31 31
32 GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, 32 GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline,
33 const GrPrimitiveProcessor& primP roc, 33 const GrPrimitiveProcessor& primP roc,
34 const GrGLProgramDesc& desc, 34 const GrGLProgramDesc& desc,
35 GrGLGpu* gpu) { 35 GrGLGpu* gpu) {
36 GrAutoLocaleSetter als("C"); 36 GrAutoLocaleSetter als("C");
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 this->desc(), 232 this->desc(),
233 fUniformHandles, 233 fUniformHandles,
234 programID, 234 programID,
235 fUniformHandler.fUniforms, 235 fUniformHandler.fUniforms,
236 fVaryingHandler.fPathProcVaryingInfos, 236 fVaryingHandler.fPathProcVaryingInfos,
237 fGeometryProcessor, 237 fGeometryProcessor,
238 fXferProcessor, 238 fXferProcessor,
239 fFragmentProcessors, 239 fFragmentProcessors,
240 &fSamplerUniforms); 240 &fSamplerUniforms);
241 } 241 }
OLDNEW
« no previous file with comments | « src/gpu/effects/GrYUVEffect.cpp ('k') | src/gpu/glsl/GrGLSLFragmentProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698