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

Side by Side Diff: src/gpu/gl/builders/GrGLVertexShaderBuilder.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/builders/GrGLVertexShaderBuilder.h ('k') | tests/GLProgramsTest.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 2014 Google Inc. 2 * Copyright 2014 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 "GrGLVertexShaderBuilder.h" 8 #include "GrGLVertexShaderBuilder.h"
9 #include "GrGLProgramBuilder.h" 9 #include "GrGLProgramBuilder.h"
10 #include "GrGLShaderStringBuilder.h" 10 #include "GrGLShaderStringBuilder.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 fProgramBuilder->fUniformHandles.fViewMatrixUni = 50 fProgramBuilder->fUniformHandles.fViewMatrixUni =
51 fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility, 51 fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility,
52 kMat33f_GrSLType, 52 kMat33f_GrSLType,
53 "ViewM", 53 "ViewM",
54 &viewMName); 54 &viewMName);
55 55
56 // Transform the position into Skia's device coords. 56 // Transform the position into Skia's device coords.
57 this->codeAppendf("vec3 pos3 = %s * vec3(%s, 1);", viewMName, fPositionVar-> c_str()); 57 this->codeAppendf("vec3 pos3 = %s * vec3(%s, 1);", viewMName, fPositionVar-> c_str());
58 } 58 }
59 59
60 void GrGLVertexBuilder::setupBuiltinVertexAttribute(const char* inName, GrGLSLEx pr1* out) {
61 GrGLVertToFrag v(kFloat_GrSLType);
62 fProgramBuilder->addVarying(inName, &v);
63 SkString name(inName);
64 name.prepend("in");
65 this->addAttribute(GrShaderVar(name.c_str(),
66 kFloat_GrSLType,
67 GrShaderVar::kAttribute_TypeModifier));
68 this->codeAppendf("%s = %s;", v.vsOut(), name.c_str());
69 *out = v.fsIn();
70 fEffectAttribOffset++;
71 }
72
60 void GrGLVertexBuilder::setupBuiltinVertexAttribute(const char* inName, GrGLSLEx pr4* out) { 73 void GrGLVertexBuilder::setupBuiltinVertexAttribute(const char* inName, GrGLSLEx pr4* out) {
61 GrGLVertToFrag v(kVec4f_GrSLType); 74 GrGLVertToFrag v(kVec4f_GrSLType);
62 fProgramBuilder->addVarying(inName, &v); 75 fProgramBuilder->addVarying(inName, &v);
63 SkString name(inName); 76 SkString name(inName);
64 name.prepend("in"); 77 name.prepend("in");
65 this->addAttribute(GrShaderVar(name.c_str(), 78 this->addAttribute(GrShaderVar(name.c_str(),
66 kVec4f_GrSLType, 79 kVec4f_GrSLType,
67 GrShaderVar::kAttribute_TypeModifier)); 80 GrShaderVar::kAttribute_TypeModifier));
68 this->codeAppendf("%s = %s;", v.vsOut(), name.c_str()); 81 this->codeAppendf("%s = %s;", v.vsOut(), name.c_str());
69 *out = v.fsIn(); 82 *out = v.fsIn();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 for (int i = 0; i < fInputs.count(); ++i) { 177 for (int i = 0; i < fInputs.count(); ++i) {
165 const GrGLShaderVar& attr = fInputs[i]; 178 const GrGLShaderVar& attr = fInputs[i];
166 // if attribute already added, don't add it again 179 // if attribute already added, don't add it again
167 if (attr.getName().equals(var.getName())) { 180 if (attr.getName().equals(var.getName())) {
168 return false; 181 return false;
169 } 182 }
170 } 183 }
171 fInputs.push_back(var); 184 fInputs.push_back(var);
172 return true; 185 return true;
173 } 186 }
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLVertexShaderBuilder.h ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698