commit b5086961f335d6757a88ce7507c445485aaba2e6
author Brian Salomon <bsalomon@google.com> Wed Dec 13 10:59:33 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 20 14:00:44 2017 +0000
tree a635252858428f4f0f04144d532cc4ab96388d95
parent e1367b4a064737cbcf78f2297fa89e0a032b2060

Add matrix stack to SkAtlasTextTarget.

Makes SkAtlasTextRenderer::SDFVertex now has a 3 component position vector.

Change-Id: I7ec1a8068fb84388a82e1748d6e9d02820d55abd
Reviewed-on: https://skia-review.googlesource.com/84202
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>

tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp

diff --git a/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp b/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
index ef416b2..677ce5a 100644
--- a/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
+++ b/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
@@ -125,7 +125,7 @@
         uniform vec4 uDstScaleAndTranslate;
         uniform vec2 uAtlasInvSize;
 
-        layout (location = 0) in vec2 inPosition;
+        layout (location = 0) in vec3 inPosition;
         layout (location = 1) in vec4 inColor;
         layout (location = 2) in uvec2 inTextureCoords;
 
@@ -143,7 +143,7 @@
             vColor = inColor;
             gl_Position = vec4(inPosition.x * uDstScaleAndTranslate.x + uDstScaleAndTranslate.y,
                                inPosition.y * uDstScaleAndTranslate.z + uDstScaleAndTranslate.w,
-                               0.0, 1.0);
+                               0.0, inPosition.z);
         }
     )";
     strings[1] = kVS;
@@ -360,8 +360,8 @@
     callgl(BindVertexArray, 0);
     callgl(BindBuffer, GR_GL_ARRAY_BUFFER, 0);
     callgl(BindBuffer, GR_GL_ELEMENT_ARRAY_BUFFER, 0);
-    callgl(VertexAttribPointer, 0, 2, GR_GL_FLOAT, GR_GL_FALSE, sizeof(SDFVertex), vertices);
-    size_t colorOffset = 2 * sizeof(float);
+    callgl(VertexAttribPointer, 0, 3, GR_GL_FLOAT, GR_GL_FALSE, sizeof(SDFVertex), vertices);
+    size_t colorOffset = 3 * sizeof(float);
     callgl(VertexAttribPointer, 1, 4, GR_GL_UNSIGNED_BYTE, GR_GL_TRUE, sizeof(SDFVertex),
            reinterpret_cast<const char*>(vertices) + colorOffset);
     size_t texOffset = colorOffset + sizeof(uint32_t);