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

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

Issue 920863002: A simple change to move a bunch of stuff out of Gr*Geometry.h (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: clang fix Created 5 years, 10 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/GrGLPrimitiveProcessor.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.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 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 "GrGLProcessor.h"
15 #include "GrGLXferProcessor.h"
16 #include "GrGLGpu.h" 14 #include "GrGLGpu.h"
15 #include "GrGLPathProcessor.h"
17 #include "GrGLPathRendering.h" 16 #include "GrGLPathRendering.h"
18 #include "GrGLShaderVar.h" 17 #include "GrGLShaderVar.h"
19 #include "GrGLSL.h" 18 #include "GrGLSL.h"
19 #include "GrGLXferProcessor.h"
20 #include "GrPipeline.h" 20 #include "GrPipeline.h"
21 #include "GrXferProcessor.h" 21 #include "GrXferProcessor.h"
22 #include "SkXfermode.h" 22 #include "SkXfermode.h"
23 23
24 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) 24 #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) 25 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
26 26
27 //////////////////////////////////////////////////////////////////////////////// /////////////////// 27 //////////////////////////////////////////////////////////////////////////////// ///////////////////
28 28
29 GrGLProgram::GrGLProgram(GrGLGpu* gpu, 29 GrGLProgram::GrGLProgram(GrGLGpu* gpu,
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 void GrGLNvprProgram::onSetRenderTargetState(const GrPrimitiveProcessor& primPro c, 203 void GrGLNvprProgram::onSetRenderTargetState(const GrPrimitiveProcessor& primPro c,
204 const GrPipeline& pipeline) { 204 const GrPipeline& pipeline) {
205 SkASSERT(!primProc.willUseGeoShader() && primProc.numAttribs() == 0); 205 SkASSERT(!primProc.willUseGeoShader() && primProc.numAttribs() == 0);
206 const GrRenderTarget* rt = pipeline.getRenderTarget(); 206 const GrRenderTarget* rt = pipeline.getRenderTarget();
207 SkISize size; 207 SkISize size;
208 size.set(rt->width(), rt->height()); 208 size.set(rt->width(), rt->height());
209 fGpu->glPathRendering()->setProjectionMatrix(primProc.viewMatrix(), 209 fGpu->glPathRendering()->setProjectionMatrix(primProc.viewMatrix(),
210 size, rt->origin()); 210 size, rt->origin());
211 } 211 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPrimitiveProcessor.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698