Merge "Update owners file" into oreo-mr1-cts-dev

diff --git a/modules/gles31/functional/es31fDrawTests.cpp b/modules/gles31/functional/es31fDrawTests.cpp
index 2b8b11c..daa5307 100644 (file)
--- a/modules/gles31/functional/es31fDrawTests.cpp
+++ b/modules/gles31/functional/es31fDrawTests.cpp
@@ -1276,17 +1276,18 @@ std::string ComputeShaderGeneratedCase::genComputeSource (bool computeCmd, bool
                        buf     << "    if (gl_GlobalInvocationID.x < gridSize && gl_GlobalInvocationID.y < gridSize && gl_GlobalInvocationID.z == 0u) {\n"
                                << "        uint        y           = gl_GlobalInvocationID.x;\n"
                                << "        uint        x           = gl_GlobalInvocationID.y;\n"
-                               << "        float       posX        = (float(x) / float(gridSize)) * 2.0 - 1.0;\n"
-                               << "        float       posY        = (float(y) / float(gridSize)) * 2.0 - 1.0;\n"
-                               << "        const float cellSize    = 2.0 / float(gridSize);\n"
+                               << "        float       posX        = (float(x)    / float(gridSize)) * 2.0 - 1.0;\n"
+                               << "        float       posXp1      = (float(x+1u) / float(gridSize)) * 2.0 - 1.0;\n"
+                               << "        float       posY        = (float(y)    / float(gridSize)) * 2.0 - 1.0;\n"
+                               << "        float       posYp1      = (float(y+1u) / float(gridSize)) * 2.0 - 1.0;\n"
                                << "        vec4        color       = ((x + y)%2u != 0u) ? (yellow) : (green);\n"
                                << "\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 0u) * 2u + 0u] = vec4(posX,            posY,            0.0, 1.0);\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 1u) * 2u + 0u] = vec4(posX + cellSize, posY,            0.0, 1.0);\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 2u) * 2u + 0u] = vec4(posX + cellSize, posY + cellSize, 0.0, 1.0);\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 3u) * 2u + 0u] = vec4(posX,            posY,            0.0, 1.0);\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 4u) * 2u + 0u] = vec4(posX + cellSize, posY + cellSize, 0.0, 1.0);\n"
-                               << "        attribs[((y * gridSize + x) * 6u + 5u) * 2u + 0u] = vec4(posX,            posY + cellSize, 0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 0u) * 2u + 0u] = vec4(posX,   posY,   0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 1u) * 2u + 0u] = vec4(posXp1, posY,   0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 2u) * 2u + 0u] = vec4(posXp1, posYp1, 0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 3u) * 2u + 0u] = vec4(posX,   posY,   0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 4u) * 2u + 0u] = vec4(posXp1, posYp1, 0.0, 1.0);\n"
+                               << "        attribs[((y * gridSize + x) * 6u + 5u) * 2u + 0u] = vec4(posX,   posYp1, 0.0, 1.0);\n"
                                << "\n"
                                << "        attribs[((y * gridSize + x) * 6u + 0u) * 2u + 1u] = color;\n"
                                << "        attribs[((y * gridSize + x) * 6u + 1u) * 2u + 1u] = color;\n"