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

Side by Side Diff: src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp

Issue 924973002: Revert of Multi-string shaders (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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
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 "GrGLGeometryShaderBuilder.h" 8 #include "GrGLGeometryShaderBuilder.h"
9 #include "GrGLShaderStringBuilder.h"
9 #include "GrGLProgramBuilder.h" 10 #include "GrGLProgramBuilder.h"
10 #include "../GrGLGpu.h" 11 #include "../GrGLGpu.h"
11 12
12 GrGLGeometryBuilder::GrGLGeometryBuilder(GrGLProgramBuilder* program) 13 GrGLGeometryBuilder::GrGLGeometryBuilder(GrGLProgramBuilder* program)
13 : INHERITED(program) { 14 : INHERITED(program) {
14 15
15 } 16 }
16 17
17 void GrGLGeometryBuilder::addVarying(const char* name, GrGLVarying* v) { 18 void GrGLGeometryBuilder::addVarying(const char* name, GrGLVarying* v) {
18 // if we have a GS take each varying in as an array 19 // if we have a GS take each varying in as an array
(...skipping 10 matching lines...) Expand all
29 if (v->fsVarying()) { 30 if (v->fsVarying()) {
30 fOutputs.push_back(); 31 fOutputs.push_back();
31 fOutputs.back().setType(v->fType); 32 fOutputs.back().setType(v->fType);
32 fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier) ; 33 fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier) ;
33 fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'g', name); 34 fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'g', name);
34 v->fGsOut = fOutputs.back().getName().c_str(); 35 v->fGsOut = fOutputs.back().getName().c_str();
35 } 36 }
36 } 37 }
37 38
38 bool GrGLGeometryBuilder::compileAndAttachShaders(GrGLuint programId, 39 bool GrGLGeometryBuilder::compileAndAttachShaders(GrGLuint programId,
39 SkTDArray<GrGLuint>* shaderIds) { 40 SkTDArray<GrGLuint>* shaderIds) const {
40 SkFAIL("Geometry shaders are not currently supported"); 41 const GrGLContext& glCtx = fProgramBuilder->gpu()->glContext();
41 return false; 42 SkASSERT(fProgramBuilder->ctxInfo().glslGeneration() >= k150_GrGLSLGeneratio n);
43 SkString geomShaderSrc(GrGetGLSLVersionDecl(fProgramBuilder->ctxInfo()));
44 geomShaderSrc.append("layout(triangles) in;\n"
45 "layout(triangle_strip, max_vertices = 6) out;\n");
46 this->appendDecls(fInputs, &geomShaderSrc);
47 this->appendDecls(fOutputs, &geomShaderSrc);
48 geomShaderSrc.append("void main() {\n");
49 geomShaderSrc.append("\tfor (int i = 0; i < 3; ++i) {\n"
50 "\t\tgl_Position = gl_in[i].gl_Position;\n");
51 geomShaderSrc.append("\t\tgl_PointSize = 1.0;\n");
52 SkASSERT(fInputs.count() == fOutputs.count());
53 for (int i = 0; i < fInputs.count(); ++i) {
54 geomShaderSrc.appendf("\t\t%s = %s[i];\n",
55 fOutputs[i].getName().c_str(),
56 fInputs[i].getName().c_str());
57 }
58 geomShaderSrc.append("\t\tEmitVertex();\n"
59 "\t}\n"
60 "\tEndPrimitive();\n");
61 geomShaderSrc.append("}\n");
62 GrGLuint geomShaderId =
63 GrGLCompileAndAttachShader(glCtx, programId,
64 GR_GL_GEOMETRY_SHADER, geomShaderSrc,
65 fProgramBuilder->gpu()->stats());
66 if (!geomShaderId) {
67 return false;
68 }
69 *shaderIds->append() = geomShaderId;
70 return true;
42 } 71 }
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLGeometryShaderBuilder.h ('k') | src/gpu/gl/builders/GrGLProgramBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698