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

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

Issue 649783003: Force input coverage to be only a byte in gpu shaders. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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/GrGLProgram.h ('k') | src/gpu/gl/GrGLVertexArray.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"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 //////////////////////////////////////////////////////////////////////////////// /////////////////// 56 //////////////////////////////////////////////////////////////////////////////// ///////////////////
57 57
58 GrGLProgram::GrGLProgram(GrGpuGL* gpu, 58 GrGLProgram::GrGLProgram(GrGpuGL* gpu,
59 const GrProgramDesc& desc, 59 const GrProgramDesc& desc,
60 const BuiltinUniformHandles& builtinUniforms, 60 const BuiltinUniformHandles& builtinUniforms,
61 GrGLuint programID, 61 GrGLuint programID,
62 const UniformInfoArray& uniforms, 62 const UniformInfoArray& uniforms,
63 GrGLInstalledGeoProc* geometryProcessor, 63 GrGLInstalledGeoProc* geometryProcessor,
64 GrGLInstalledFragProcs* fragmentProcessors) 64 GrGLInstalledFragProcs* fragmentProcessors)
65 : fColor(GrColor_ILLEGAL) 65 : fColor(GrColor_ILLEGAL)
66 , fCoverage(GrColor_ILLEGAL) 66 , fCoverage(0)
67 , fDstCopyTexUnit(-1) 67 , fDstCopyTexUnit(-1)
68 , fBuiltinUniformHandles(builtinUniforms) 68 , fBuiltinUniformHandles(builtinUniforms)
69 , fProgramID(programID) 69 , fProgramID(programID)
70 , fGeometryProcessor(geometryProcessor) 70 , fGeometryProcessor(geometryProcessor)
71 , fFragmentProcessors(SkRef(fragmentProcessors)) 71 , fFragmentProcessors(SkRef(fragmentProcessors))
72 , fDesc(desc) 72 , fDesc(desc)
73 , fGpu(gpu) 73 , fGpu(gpu)
74 , fProgramDataManager(gpu, uniforms) { 74 , fProgramDataManager(gpu, uniforms) {
75 this->initSamplerUniforms(); 75 this->initSamplerUniforms();
76 } 76 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 } 125 }
126 126
127 127
128 /////////////////////////////////////////////////////////////////////////////// 128 ///////////////////////////////////////////////////////////////////////////////
129 129
130 void GrGLProgram::setData(const GrOptDrawState& optState, 130 void GrGLProgram::setData(const GrOptDrawState& optState,
131 GrGpu::DrawType drawType, 131 GrGpu::DrawType drawType,
132 const GrDeviceCoordTexture* dstCopy) { 132 const GrDeviceCoordTexture* dstCopy) {
133 GrColor color = optState.getColor(); 133 GrColor color = optState.getColor();
134 GrColor coverage = optState.getCoverageColor(); 134 uint8_t coverage = optState.getCoverage();
135 135
136 this->setColor(optState, color); 136 this->setColor(optState, color);
137 this->setCoverage(optState, coverage); 137 this->setCoverage(optState, coverage);
138 this->setMatrixAndRenderTargetHeight(drawType, optState); 138 this->setMatrixAndRenderTargetHeight(drawType, optState);
139 139
140 if (dstCopy) { 140 if (dstCopy) {
141 if (fBuiltinUniformHandles.fDstCopyTopLeftUni.isValid()) { 141 if (fBuiltinUniformHandles.fDstCopyTopLeftUni.isValid()) {
142 fProgramDataManager.set2f(fBuiltinUniformHandles.fDstCopyTopLeftUni, 142 fProgramDataManager.set2f(fBuiltinUniformHandles.fDstCopyTopLeftUni,
143 static_cast<GrGLfloat>(dstCopy->offset(). fX), 143 static_cast<GrGLfloat>(dstCopy->offset(). fX),
144 static_cast<GrGLfloat>(dstCopy->offset(). fY)); 144 static_cast<GrGLfloat>(dstCopy->offset(). fY));
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 } 216 }
217 break; 217 break;
218 case GrProgramDesc::kAllOnes_ColorInput: 218 case GrProgramDesc::kAllOnes_ColorInput:
219 // Handled by shader creation 219 // Handled by shader creation
220 break; 220 break;
221 default: 221 default:
222 SkFAIL("Unexpected color type."); 222 SkFAIL("Unexpected color type.");
223 } 223 }
224 } 224 }
225 225
226 void GrGLProgram::setCoverage(const GrOptDrawState& optState, GrColor coverage) { 226 void GrGLProgram::setCoverage(const GrOptDrawState& optState, uint8_t coverage) {
227 const GrProgramDesc::KeyHeader& header = fDesc.header(); 227 const GrProgramDesc::KeyHeader& header = fDesc.header();
228 switch (header.fCoverageInput) { 228 switch (header.fCoverageInput) {
229 case GrProgramDesc::kAttribute_ColorInput: 229 case GrProgramDesc::kAttribute_ColorInput:
230 // Attribute case is handled in GrGpuGL::setupGeometry 230 // Attribute case is handled in GrGpuGL::setupGeometry
231 break; 231 break;
232 case GrProgramDesc::kUniform_ColorInput: 232 case GrProgramDesc::kUniform_ColorInput:
233 if (fCoverage != coverage) { 233 if (fCoverage != coverage) {
234 // OpenGL ES doesn't support unsigned byte varieties of glUnifor m 234 // OpenGL ES doesn't support unsigned byte varieties of glUnifor m
235 GrGLfloat c[4]; 235 static const float ONE_OVER_255 = 1.f / 255.f;
236 GrColorToRGBAFloat(coverage, c); 236 GrGLfloat c = coverage * ONE_OVER_255;
237 fProgramDataManager.set4fv(fBuiltinUniformHandles.fCoverageUni, 1, c); 237 fProgramDataManager.set1f(fBuiltinUniformHandles.fCoverageUni, c );
238 fCoverage = coverage; 238 fCoverage = coverage;
239 } 239 }
240 break; 240 break;
241 case GrProgramDesc::kAllOnes_ColorInput: 241 case GrProgramDesc::kAllOnes_ColorInput:
242 // Handled by shader creation 242 // Handled by shader creation
243 break; 243 break;
244 default: 244 default:
245 SkFAIL("Unexpected coverage type."); 245 SkFAIL("Unexpected coverage type.");
246 } 246 }
247 } 247 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 for (int t = 0; t < numTransforms; ++t) { 378 for (int t = 0; t < numTransforms; ++t) {
379 const SkMatrix& transform = get_transform_matrix(proc, false, t); 379 const SkMatrix& transform = get_transform_matrix(proc, false, t);
380 GrGLPathRendering::PathTexGenComponents components = 380 GrGLPathRendering::PathTexGenComponents components =
381 GrGLPathRendering::kST_PathTexGenComponents; 381 GrGLPathRendering::kST_PathTexGenComponents;
382 if (proc.isPerspectiveCoordTransform(t, false)) { 382 if (proc.isPerspectiveCoordTransform(t, false)) {
383 components = GrGLPathRendering::kSTR_PathTexGenComponents; 383 components = GrGLPathRendering::kSTR_PathTexGenComponents;
384 } 384 }
385 fGpu->glPathRendering()->enablePathTexGen(texCoordIndex++, components, t ransform); 385 fGpu->glPathRendering()->enablePathTexGen(texCoordIndex++, components, t ransform);
386 } 386 }
387 } 387 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgram.h ('k') | src/gpu/gl/GrGLVertexArray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698