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

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

Issue 571163002: removing GrDrawEffect (Closed) Base URL: https://skia.googlesource.com/skia.git@gp3
Patch Set: rebase after revert Created 6 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/gl/GrGLProgramEffects.cpp ('k') | tests/GLProgramsTest.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 "gl/GrGLProgram.h" 8 #include "gl/GrGLProgram.h"
9 #include "gl/GrGLSLPrettyPrint.h" 9 #include "gl/GrGLSLPrettyPrint.h"
10 #include "gl/GrGLUniformHandle.h" 10 #include "gl/GrGLUniformHandle.h"
11 #include "GrCoordTransform.h" 11 #include "GrCoordTransform.h"
12 #include "GrDrawEffect.h"
13 #include "../GrGpuGL.h" 12 #include "../GrGpuGL.h"
14 #include "GrGLFragmentShaderBuilder.h" 13 #include "GrGLFragmentShaderBuilder.h"
15 #include "GrGLProgramBuilder.h" 14 #include "GrGLProgramBuilder.h"
16 #include "GrTexture.h" 15 #include "GrTexture.h"
17 #include "GrGLVertexShaderBuilder.h" 16 #include "GrGLVertexShaderBuilder.h"
18 #include "SkRTConf.h" 17 #include "SkRTConf.h"
19 #include "SkTraceEvent.h" 18 #include "SkTraceEvent.h"
20 19
21 namespace { 20 namespace {
22 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) 21 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 493
495 GrGLPathTexGenProgramEffectsBuilder pathTexGenEffectsBuilder(this, 494 GrGLPathTexGenProgramEffectsBuilder pathTexGenEffectsBuilder(this,
496 effectCnt); 495 effectCnt);
497 this->INHERITED::createAndEmitEffects(&pathTexGenEffectsBuilder, 496 this->INHERITED::createAndEmitEffects(&pathTexGenEffectsBuilder,
498 effectStages, 497 effectStages,
499 effectCnt, 498 effectCnt,
500 keyProvider, 499 keyProvider,
501 inOutFSColor); 500 inOutFSColor);
502 return pathTexGenEffectsBuilder.finish(); 501 return pathTexGenEffectsBuilder.finish();
503 } 502 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramEffects.cpp ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698