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

Side by Side Diff: src/gpu/gl/GrGLProgram.cpp

Issue 577593003: Revert of removing GrDrawEffect (Closed) Base URL: https://skia.googlesource.com/skia.git@gp3
Patch Set: 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/GrGLGeometryProcessor.h ('k') | src/gpu/gl/GrGLProgramDesc.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 2011 Google Inc. 2 * Copyright 2011 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 #include "GrGLProgram.h" 7 #include "GrGLProgram.h"
8 8
9 #include "GrAllocator.h" 9 #include "GrAllocator.h"
10 #include "GrEffect.h" 10 #include "GrEffect.h"
11 #include "GrCoordTransform.h" 11 #include "GrCoordTransform.h"
12 #include "GrDrawEffect.h"
12 #include "GrGLEffect.h" 13 #include "GrGLEffect.h"
13 #include "GrGpuGL.h" 14 #include "GrGpuGL.h"
14 #include "GrGLPathRendering.h" 15 #include "GrGLPathRendering.h"
15 #include "GrGLShaderVar.h" 16 #include "GrGLShaderVar.h"
16 #include "GrGLSL.h" 17 #include "GrGLSL.h"
17 #include "GrOptDrawState.h" 18 #include "GrOptDrawState.h"
18 #include "SkXfermode.h" 19 #include "SkXfermode.h"
19 20
20 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) 21 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X)
21 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) 22 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 262
262 GrGLfloat viewMatrix[3 * 3]; 263 GrGLfloat viewMatrix[3 * 3];
263 fMatrixState.getGLMatrix<3>(viewMatrix); 264 fMatrixState.getGLMatrix<3>(viewMatrix);
264 fProgramDataManager.setMatrix3f(fBuiltinUniformHandles.fViewMatrixUni, v iewMatrix); 265 fProgramDataManager.setMatrix3f(fBuiltinUniformHandles.fViewMatrixUni, v iewMatrix);
265 266
266 GrGLfloat rtAdjustmentVec[4]; 267 GrGLfloat rtAdjustmentVec[4];
267 fMatrixState.getRTAdjustmentVec(rtAdjustmentVec); 268 fMatrixState.getRTAdjustmentVec(rtAdjustmentVec);
268 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, r tAdjustmentVec); 269 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, r tAdjustmentVec);
269 } 270 }
270 } 271 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGeometryProcessor.h ('k') | src/gpu/gl/GrGLProgramDesc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698