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

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

Issue 2215433003: Revert of SkRTConf: reduce functionality to what we use, increase simplicity (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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/GrGLGpuProgramCache.cpp ('k') | src/gpu/gl/builders/GrGLShaderStringBuilder.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 "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 "SkTraceEvent.h" 16 #include "SkTraceEvent.h"
16 #include "gl/GrGLGpu.h" 17 #include "gl/GrGLGpu.h"
17 #include "gl/GrGLProgram.h" 18 #include "gl/GrGLProgram.h"
18 #include "gl/GrGLSLPrettyPrint.h" 19 #include "gl/GrGLSLPrettyPrint.h"
19 #include "gl/builders/GrGLShaderStringBuilder.h" 20 #include "gl/builders/GrGLShaderStringBuilder.h"
20 #include "glsl/GrGLSLCaps.h" 21 #include "glsl/GrGLSLCaps.h"
21 #include "glsl/GrGLSLFragmentProcessor.h" 22 #include "glsl/GrGLSLFragmentProcessor.h"
22 #include "glsl/GrGLSLGeometryProcessor.h" 23 #include "glsl/GrGLSLGeometryProcessor.h"
23 #include "glsl/GrGLSLProgramDataManager.h" 24 #include "glsl/GrGLSLProgramDataManager.h"
24 #include "glsl/GrGLSLProgramDesc.h" 25 #include "glsl/GrGLSLProgramDesc.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 this->desc(), 232 this->desc(),
232 fUniformHandles, 233 fUniformHandles,
233 programID, 234 programID,
234 fUniformHandler.fUniforms, 235 fUniformHandler.fUniforms,
235 fUniformHandler.fSamplers, 236 fUniformHandler.fSamplers,
236 fVaryingHandler.fPathProcVaryingInfos, 237 fVaryingHandler.fPathProcVaryingInfos,
237 fGeometryProcessor, 238 fGeometryProcessor,
238 fXferProcessor, 239 fXferProcessor,
239 fFragmentProcessors); 240 fFragmentProcessors);
240 } 241 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpuProgramCache.cpp ('k') | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698