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

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

Issue 1333423003: move GrGLPathProcessor back into GrPathProcessor (Closed) Base URL: https://skia.googlesource.com/skia.git@pathgp2
Patch Set: Created 5 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/GrGLPathProcessor.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.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 7
8 #include "GrGLProgram.h" 8 #include "GrGLProgram.h"
9 9
10 #include "GrAllocator.h" 10 #include "GrAllocator.h"
11 #include "GrProcessor.h" 11 #include "GrProcessor.h"
12 #include "GrCoordTransform.h" 12 #include "GrCoordTransform.h"
13 #include "GrGLGeometryProcessor.h" 13 #include "GrGLGeometryProcessor.h"
14 #include "GrGLGpu.h" 14 #include "GrGLGpu.h"
15 #include "GrGLPathProcessor.h"
16 #include "GrGLPathRendering.h" 15 #include "GrGLPathRendering.h"
17 #include "GrGLShaderVar.h" 16 #include "GrGLShaderVar.h"
18 #include "GrGLXferProcessor.h" 17 #include "GrGLXferProcessor.h"
19 #include "GrPathProcessor.h" 18 #include "GrPathProcessor.h"
20 #include "GrPipeline.h" 19 #include "GrPipeline.h"
21 #include "GrXferProcessor.h" 20 #include "GrXferProcessor.h"
22 #include "SkXfermode.h" 21 #include "SkXfermode.h"
23 22
24 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) 23 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X)
25 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) 24 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec); 149 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
151 } 150 }
152 } else { 151 } else {
153 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport()); 152 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
154 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); 153 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
155 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(), 154 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(),
156 size, rt->origin()); 155 size, rt->origin());
157 } 156 }
158 } 157 }
159 158
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPathProcessor.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698