src/gpu/GrAARectRenderer.cpp - Issue 23754003: Isolate VertexBuilder from GrGLShaderBuilder

Unified Diff: src/gpu/GrAARectRenderer.cpp

Issue 23754003: Isolate VertexBuilder from GrGLShaderBuilder (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: comment fix Created 7 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp

index 2e86fb70486793cfb047d6bb49b8d16a0f525ecc..9e5fdf017199ad4fa73616e139c5b5556382328c 100644

--- a/src/gpu/GrAARectRenderer.cpp

+++ b/src/gpu/GrAARectRenderer.cpp

@@ -50,14 +50,17 @@ public:

const char* outputColor,

const char* inputColor,

const TextureSamplerArray& samplers) SK_OVERRIDE {

+ GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder();

+ SkASSERT(vertexBuilder);

// setup the varying for the Axis aligned rect effect

// xy -> interpolated offset

// zw -> w/2+0.5, h/2+0.5

const char *vsRectName, *fsRectName;

- builder->addVarying(kVec4f_GrSLType, "Rect", &vsRectName, &fsRectName);

+ vertexBuilder->addVarying(kVec4f_GrSLType, "Rect", &vsRectName, &fsRectName);

const SkString* attr0Name =

- builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

- builder->vsCodeAppendf("\t%s = %s;\n", vsRectName, attr0Name->c_str());

+ vertexBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

+ vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsRectName, attr0Name->c_str());

// TODO: compute all these offsets, spans, and scales in the VS

builder->fsCodeAppendf("\tfloat insetW = min(1.0, %s.z) - 0.5;\n", fsRectName);

@@ -167,22 +170,25 @@ public:

const char* outputColor,

const char* inputColor,

const TextureSamplerArray& samplers) SK_OVERRIDE {

+ GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder();

+ SkASSERT(vertexBuilder);

// setup the varying for the center point and the unit vector

// that points down the height of the rect

const char *vsRectEdgeName, *fsRectEdgeName;

- builder->addVarying(kVec4f_GrSLType, "RectEdge",

- &vsRectEdgeName, &fsRectEdgeName);

+ vertexBuilder->addVarying(kVec4f_GrSLType, "RectEdge",

+ &vsRectEdgeName, &fsRectEdgeName);

const SkString* attr0Name =

- builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

- builder->vsCodeAppendf("\t%s = %s;\n", vsRectEdgeName, attr0Name->c_str());

+ vertexBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

+ vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsRectEdgeName, attr0Name->c_str());

// setup the varying for width/2+.5 and height/2+.5

const char *vsWidthHeightName, *fsWidthHeightName;

- builder->addVarying(kVec2f_GrSLType, "WidthHeight",

- &vsWidthHeightName, &fsWidthHeightName);

+ vertexBuilder->addVarying(kVec2f_GrSLType, "WidthHeight",

+ &vsWidthHeightName, &fsWidthHeightName);

const SkString* attr1Name =

- builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[1]);

- builder->vsCodeAppendf("\t%s = %s;\n", vsWidthHeightName, attr1Name->c_str());

+ vertexBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[1]);

+ vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsWidthHeightName, attr1Name->c_str());

// TODO: compute all these offsets, spans, and scales in the VS

builder->fsCodeAppendf("\tfloat insetW = min(1.0, %s.x) - 0.5;\n", fsWidthHeightName);

« src/effects/gradients/SkTwoPointConicalGradient.cpp ('K') | « src/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | src/gpu/gl/GrGLShaderBuilder.h » ('J')