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

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

Issue 1306803003: Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
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/GrGLPathProgram.h ('k') | src/gpu/gl/GrGLProgram.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 2015 Google Inc. 2 * Copyright 2015 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 "GrGLPathProgram.h" 8 #include "GrGLPathProgram.h"
9 #include "GrGLPathProcessor.h" 9 #include "GrGLPathProcessor.h"
10 #include "GrGLGpu.h" 10 #include "GrGLGpu.h"
(...skipping 13 matching lines...) Expand all
24 xferProcessor, fragmentProcessors, passSamplerUniforms) 24 xferProcessor, fragmentProcessors, passSamplerUniforms)
25 , fPathProgramDataManager(gpu, fProgramID, separableVaryings) { 25 , fPathProgramDataManager(gpu, fProgramID, separableVaryings) {
26 } 26 }
27 void GrGLPathProgram::didSetData() { 27 void GrGLPathProgram::didSetData() {
28 GrGLPathProcessor* pathProc = 28 GrGLPathProcessor* pathProc =
29 static_cast<GrGLPathProcessor*>(fGeometryProcessor.get()->fGLProc.ge t()); 29 static_cast<GrGLPathProcessor*>(fGeometryProcessor.get()->fGLProc.ge t());
30 pathProc->didSetData(fGpu->glPathRendering()); 30 pathProc->didSetData(fGpu->glPathRendering());
31 } 31 }
32 32
33 void GrGLPathProgram::setTransformData(const GrPrimitiveProcessor& primProc, 33 void GrGLPathProgram::setTransformData(const GrPrimitiveProcessor& primProc,
34 const GrFragmentProcessor& processor, 34 const GrPendingFragmentStage& proc,
35 int index, 35 int index,
36 GrGLInstalledFragProc* ip) { 36 GrGLInstalledFragProc* ip) {
37 GrGLPathProcessor* pathProc = 37 GrGLPathProcessor* pathProc =
38 static_cast<GrGLPathProcessor*>(fGeometryProcessor.get()->fGLProc.ge t()); 38 static_cast<GrGLPathProcessor*>(fGeometryProcessor.get()->fGLProc.ge t());
39 pathProc->setTransformData(primProc, fPathProgramDataManager, index, 39 pathProc->setTransformData(primProc, fPathProgramDataManager, index,
40 processor.coordTransforms()); 40 proc.processor()->coordTransforms());
41 } 41 }
42 42
43 void GrGLPathProgram::onSetRenderTargetState(const GrPrimitiveProcessor& primPro c, 43 void GrGLPathProgram::onSetRenderTargetState(const GrPrimitiveProcessor& primPro c,
44 const GrPipeline& pipeline) { 44 const GrPipeline& pipeline) {
45 SkASSERT(!primProc.willUseGeoShader() && primProc.numAttribs() == 0); 45 SkASSERT(!primProc.willUseGeoShader() && primProc.numAttribs() == 0);
46 const GrRenderTarget* rt = pipeline.getRenderTarget(); 46 const GrRenderTarget* rt = pipeline.getRenderTarget();
47 SkISize size; 47 SkISize size;
48 size.set(rt->width(), rt->height()); 48 size.set(rt->width(), rt->height());
49 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); 49 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
50 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(), 50 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(),
51 size, rt->origin()); 51 size, rt->origin());
52 } 52 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPathProgram.h ('k') | src/gpu/gl/GrGLProgram.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698