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

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

Issue 1626553002: Revert of added support for PLS path rendering (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 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/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLUniformHandler.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"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 SkTArray<const GrTextureAccess*>* textureBindings) { 82 SkTArray<const GrTextureAccess*>* textureBindings) {
83 this->setRenderTargetState(primProc, pipeline); 83 this->setRenderTargetState(primProc, pipeline);
84 84
85 // we set the textures, and uniforms for installed processors in a generic w ay, but subclasses 85 // we set the textures, and uniforms for installed processors in a generic w ay, but subclasses
86 // of GLProgram determine how to set coord transforms 86 // of GLProgram determine how to set coord transforms
87 fGeometryProcessor->setData(fProgramDataManager, primProc); 87 fGeometryProcessor->setData(fProgramDataManager, primProc);
88 append_texture_bindings(primProc, textureBindings); 88 append_texture_bindings(primProc, textureBindings);
89 89
90 this->setFragmentData(primProc, pipeline, textureBindings); 90 this->setFragmentData(primProc, pipeline, textureBindings);
91 91
92 if (primProc.getPixelLocalStorageState() != 92 const GrXferProcessor& xp = pipeline.getXferProcessor();
93 GrPixelLocalStorageState::kDraw_GrPixelLocalStorageState) { 93 fXferProcessor->setData(fProgramDataManager, xp);
94 const GrXferProcessor& xp = pipeline.getXferProcessor(); 94 append_texture_bindings(xp, textureBindings);
95 fXferProcessor->setData(fProgramDataManager, xp);
96 append_texture_bindings(xp, textureBindings);
97 }
98 } 95 }
99 96
100 void GrGLProgram::setFragmentData(const GrPrimitiveProcessor& primProc, 97 void GrGLProgram::setFragmentData(const GrPrimitiveProcessor& primProc,
101 const GrPipeline& pipeline, 98 const GrPipeline& pipeline,
102 SkTArray<const GrTextureAccess*>* textureBindi ngs) { 99 SkTArray<const GrTextureAccess*>* textureBindi ngs) {
103 int numProcessors = fFragmentProcessors.count(); 100 int numProcessors = fFragmentProcessors.count();
104 for (int i = 0; i < numProcessors; ++i) { 101 for (int i = 0; i < numProcessors; ++i) {
105 const GrFragmentProcessor& processor = pipeline.getFragmentProcessor(i); 102 const GrFragmentProcessor& processor = pipeline.getFragmentProcessor(i);
106 fFragmentProcessors[i]->setData(fProgramDataManager, processor); 103 fFragmentProcessors[i]->setData(fProgramDataManager, processor);
107 this->setTransformData(primProc, processor, i); 104 this->setTransformData(primProc, processor, i);
(...skipping 30 matching lines...) Expand all
138 fRenderTargetState.getRTAdjustmentVec(rtAdjustmentVec); 135 fRenderTargetState.getRTAdjustmentVec(rtAdjustmentVec);
139 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec); 136 fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
140 } 137 }
141 } else { 138 } else {
142 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport()); 139 SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
143 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); 140 const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
144 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(), 141 fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(),
145 size, rt->origin()); 142 size, rt->origin());
146 } 143 }
147 } 144 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLUniformHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698