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

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

Issue 1233853004: Revert of Another trivial cleanup (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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/GrConfigConversionEffect.h ('k') | no next file » | 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 #ifndef GrGLProgramBuilder_DEFINED 8 #ifndef GrGLProgramBuilder_DEFINED
9 #define GrGLProgramBuilder_DEFINED 9 #define GrGLProgramBuilder_DEFINED
10 10
11 #include "GrGLFragmentShaderBuilder.h" 11 #include "GrGLFragmentShaderBuilder.h"
12 #include "GrGLGeometryShaderBuilder.h" 12 #include "GrGLGeometryShaderBuilder.h"
13 #include "GrGLVertexShaderBuilder.h" 13 #include "GrGLVertexShaderBuilder.h"
14 #include "../GrGLProgramDataManager.h" 14 #include "../GrGLProgramDataManager.h"
15 #include "../GrGLPathProgramDataManager.h" 15 #include "../GrGLPathProgramDataManager.h"
16 #include "../GrGLUniformHandle.h" 16 #include "../GrGLUniformHandle.h"
17 #include "../GrGLPrimitiveProcessor.h" 17 #include "../GrGLPrimitiveProcessor.h"
18 #include "../GrGLXferProcessor.h" 18 #include "../GrGLXferProcessor.h"
19 #include "../../GrPendingFragmentStage.h"
19 #include "../../GrPipeline.h" 20 #include "../../GrPipeline.h"
20 21
21 /* 22 /*
22 * This is the base class for a series of interfaces. This base class *MUST* re main abstract with 23 * This is the base class for a series of interfaces. This base class *MUST* re main abstract with
23 * NO data members because it is used in multiple interface inheritance. 24 * NO data members because it is used in multiple interface inheritance.
24 * Heirarchy: 25 * Heirarchy:
25 * GrGLUniformBuilder 26 * GrGLUniformBuilder
26 * / \ 27 * / \
27 * GrGLFPBuilder GrGLGPBuilder 28 * GrGLFPBuilder GrGLGPBuilder
28 * \ / 29 * \ /
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 GrGLPrimitiveProcessor::TransformsIn fCoordTransforms; 397 GrGLPrimitiveProcessor::TransformsIn fCoordTransforms;
397 GrGLPrimitiveProcessor::TransformsOut fOutCoords; 398 GrGLPrimitiveProcessor::TransformsOut fOutCoords;
398 SkTArray<UniformHandle> fSamplerUniforms; 399 SkTArray<UniformHandle> fSamplerUniforms;
399 400
400 friend class GrGLShaderBuilder; 401 friend class GrGLShaderBuilder;
401 friend class GrGLVertexBuilder; 402 friend class GrGLVertexBuilder;
402 friend class GrGLFragmentShaderBuilder; 403 friend class GrGLFragmentShaderBuilder;
403 friend class GrGLGeometryBuilder; 404 friend class GrGLGeometryBuilder;
404 }; 405 };
405 #endif 406 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrConfigConversionEffect.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698