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

Side by Side Diff: src/gpu/glsl/GrGLSLPrimitiveProcessor.h

Issue 2324663004: Remove unneeded GrGLSLTransformedCoordsArray type (Closed)
Patch Set: update comments Created 4 years, 3 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/glsl/GrGLSLGeometryProcessor.cpp ('k') | src/gpu/glsl/GrGLSLProcessorTypes.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 2013 Google Inc. 2 * Copyright 2013 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 #ifndef GrGLSLPrimitiveProcessor_DEFINED 8 #ifndef GrGLSLPrimitiveProcessor_DEFINED
9 #define GrGLSLPrimitiveProcessor_DEFINED 9 #define GrGLSLPrimitiveProcessor_DEFINED
10 10
11 #include "GrPrimitiveProcessor.h" 11 #include "GrPrimitiveProcessor.h"
12 #include "glsl/GrGLSLProcessorTypes.h"
13 #include "glsl/GrGLSLProgramDataManager.h" 12 #include "glsl/GrGLSLProgramDataManager.h"
14 #include "glsl/GrGLSLSampler.h" 13 #include "glsl/GrGLSLSampler.h"
15 14
16 class GrBatchTracker; 15 class GrBatchTracker;
17 class GrPrimitiveProcessor; 16 class GrPrimitiveProcessor;
18 class GrGLSLCaps; 17 class GrGLSLCaps;
19 class GrGLSLPPFragmentBuilder; 18 class GrGLSLPPFragmentBuilder;
20 class GrGLSLGPBuilder; 19 class GrGLSLGPBuilder;
21 class GrGLSLUniformHandler; 20 class GrGLSLUniformHandler;
22 class GrGLSLVaryingHandler; 21 class GrGLSLVaryingHandler;
23 class GrGLSLVertexBuilder; 22 class GrGLSLVertexBuilder;
24 23
25 class GrGLSLPrimitiveProcessor { 24 class GrGLSLPrimitiveProcessor {
26 public: 25 public:
27 virtual ~GrGLSLPrimitiveProcessor() {} 26 virtual ~GrGLSLPrimitiveProcessor() {}
28 27
29 typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; 28 typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
30 typedef GrGLSLProgramDataManager::UniformHandle SamplerHandle; 29 typedef GrGLSLProgramDataManager::UniformHandle SamplerHandle;
31 30
32 typedef SkSTArray<2, const GrCoordTransform*, true> ProcCoords; 31 typedef SkSTArray<2, const GrCoordTransform*, true> ProcCoords;
33 typedef SkSTArray<8, ProcCoords> TransformsIn; 32 typedef SkSTArray<8, ProcCoords> TransformsIn;
34 typedef SkSTArray<8, GrGLSLTransformedCoordsArray> TransformsOut; 33 typedef SkSTArray<8, SkTArray<GrShaderVar>> TransformsOut;
35 34
36 struct EmitArgs { 35 struct EmitArgs {
37 EmitArgs(GrGLSLVertexBuilder* vertBuilder, 36 EmitArgs(GrGLSLVertexBuilder* vertBuilder,
38 GrGLSLPPFragmentBuilder* fragBuilder, 37 GrGLSLPPFragmentBuilder* fragBuilder,
39 GrGLSLVaryingHandler* varyingHandler, 38 GrGLSLVaryingHandler* varyingHandler,
40 GrGLSLUniformHandler* uniformHandler, 39 GrGLSLUniformHandler* uniformHandler,
41 const GrGLSLCaps* caps, 40 const GrGLSLCaps* caps,
42 const GrPrimitiveProcessor& gp, 41 const GrPrimitiveProcessor& gp,
43 const char* outputColor, 42 const char* outputColor,
44 const char* outputCoverage, 43 const char* outputCoverage,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 UniformHandle* colorUniform); 102 UniformHandle* colorUniform);
104 103
105 struct Transform { 104 struct Transform {
106 Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidM atrix(); } 105 Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidM atrix(); }
107 SkMatrix fCurrentValue; 106 SkMatrix fCurrentValue;
108 GrSLType fType; 107 GrSLType fType;
109 }; 108 };
110 }; 109 };
111 110
112 #endif 111 #endif
OLDNEW
« no previous file with comments | « src/gpu/glsl/GrGLSLGeometryProcessor.cpp ('k') | src/gpu/glsl/GrGLSLProcessorTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698