Reland of "Store the applied element array buffer as a binding pointer."
To be consistent with how we start vertex attributes. A null pointer
indicates we're using the streaming buffer.
Will also aid the dirty state bits refactor.
The re-land fixes a crash with WebGL related to element array buffers.
BUG=angleproject:1040
TEST=WebGL CTS, end2end_tests, unittests
Change-Id: I9b82e06825bf95f0fc2b7c7427e1eb6dd257c1ee
Reviewed-on: https://chromium-review.googlesource.com/290044
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/tests/gl_tests/DrawElementsTest.cpp b/src/tests/gl_tests/DrawElementsTest.cpp
new file mode 100644
index 0000000..a0e3c14
--- /dev/null
+++ b/src/tests/gl_tests/DrawElementsTest.cpp
@@ -0,0 +1,226 @@
+//
+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// DrawElementsTest:
+// Tests for indexed draws.
+//
+
+#include "test_utils/ANGLETest.h"
+
+using namespace angle;
+
+namespace
+{
+
+class DrawElementsTest : public ANGLETest
+{
+ protected:
+ DrawElementsTest() : mProgram(0u)
+ {
+ setWindowWidth(64);
+ setWindowHeight(64);
+ setConfigRedBits(8);
+ setConfigGreenBits(8);
+ }
+
+ ~DrawElementsTest()
+ {
+ for (GLuint indexBuffer : mIndexBuffers)
+ {
+ if (indexBuffer != 0)
+ {
+ glDeleteBuffers(1, &indexBuffer);
+ }
+ }
+
+ for (GLuint vertexArray : mVertexArrays)
+ {
+ if (vertexArray != 0)
+ {
+ glDeleteVertexArrays(1, &vertexArray);
+ }
+ }
+
+ for (GLuint vertexBuffer : mVertexBuffers)
+ {
+ if (vertexBuffer != 0)
+ {
+ glDeleteBuffers(1, &vertexBuffer);
+ }
+ }
+
+ if (mProgram != 0u)
+ {
+ glDeleteProgram(mProgram);
+ }
+ }
+
+ std::vector<GLuint> mIndexBuffers;
+ std::vector<GLuint> mVertexArrays;
+ std::vector<GLuint> mVertexBuffers;
+ GLuint mProgram;
+};
+
+// Test a state desync that can occur when using a streaming index buffer in GL in concert with
+// deleting the applied index buffer.
+TEST_P(DrawElementsTest, DeletingAfterStreamingIndexes)
+{
+ // Init program
+ const std::string &vertexShader =
+ "attribute vec2 position;\n"
+ "attribute vec2 testFlag;\n"
+ "varying vec2 v_data;\n"
+ "void main() {\n"
+ " gl_Position = vec4(position, 0, 1);\n"
+ " v_data = testFlag;\n"
+ "}";
+
+ const std::string &fragmentShader =
+ "varying highp vec2 v_data;\n"
+ "void main() {\n"
+ " gl_FragColor = vec4(v_data, 0, 1);\n"
+ "}";
+
+ mProgram = CompileProgram(vertexShader, fragmentShader);
+ ASSERT_NE(0u, mProgram);
+ glUseProgram(mProgram);
+
+ GLint positionLocation = glGetAttribLocation(mProgram, "position");
+ ASSERT_NE(-1, positionLocation);
+
+ GLint testFlagLocation = glGetAttribLocation(mProgram, "testFlag");
+ ASSERT_NE(-1, testFlagLocation);
+
+ mIndexBuffers.resize(3u);
+ glGenBuffers(3, &mIndexBuffers[0]);
+
+ mVertexArrays.resize(2);
+ glGenVertexArrays(2, &mVertexArrays[0]);
+
+ mVertexBuffers.resize(2);
+ glGenBuffers(2, &mVertexBuffers[0]);
+
+ std::vector<GLuint> indexData[2];
+ indexData[0].push_back(0);
+ indexData[0].push_back(1);
+ indexData[0].push_back(2);
+ indexData[0].push_back(2);
+ indexData[0].push_back(3);
+ indexData[0].push_back(0);
+
+ indexData[1] = indexData[0];
+ for (GLuint &item : indexData[1])
+ {
+ item += 4u;
+ }
+
+ std::vector<GLfloat> positionData;
+ // quad verts
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(1.0f);
+
+ // Repeat position data
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(-1.0f);
+ positionData.push_back(1.0f);
+ positionData.push_back(1.0f);
+
+ std::vector<GLfloat> testFlagData;
+ // red
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+
+ // green
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+ testFlagData.push_back(0.0f);
+ testFlagData.push_back(1.0f);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffers[0]);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indexData[0].size(), &indexData[0][0],
+ GL_STATIC_DRAW);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffers[2]);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indexData[0].size(), &indexData[0][0],
+ GL_STATIC_DRAW);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffers[1]);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indexData[1].size(), &indexData[1][0],
+ GL_STATIC_DRAW);
+
+ // Initialize first vertex array with second index buffer
+ glBindVertexArray(mVertexArrays[0]);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffers[1]);
+ glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffers[0]);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * positionData.size(), &positionData[0],
+ GL_STATIC_DRAW);
+ glVertexAttribPointer(positionLocation, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
+ glEnableVertexAttribArray(positionLocation);
+
+ glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffers[1]);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * testFlagData.size(), &testFlagData[0],
+ GL_STATIC_DRAW);
+ glVertexAttribPointer(testFlagLocation, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
+ glEnableVertexAttribArray(testFlagLocation);
+
+ // Initialize second vertex array with first index buffer
+ glBindVertexArray(mVertexArrays[1]);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffers[0]);
+
+ glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffers[0]);
+ glVertexAttribPointer(positionLocation, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
+ glEnableVertexAttribArray(positionLocation);
+
+ glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffers[1]);
+ glVertexAttribPointer(testFlagLocation, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
+ glEnableVertexAttribArray(testFlagLocation);
+
+ ASSERT_GL_NO_ERROR();
+
+ glBindVertexArray(mVertexArrays[0]);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
+ EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
+
+ glBindVertexArray(mVertexArrays[1]);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
+ EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
+
+ glBindVertexArray(mVertexArrays[0]);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
+ EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
+
+ // Trigger the bug here.
+ glDeleteBuffers(1, &mIndexBuffers[2]);
+
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
+ EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
+
+ ASSERT_GL_NO_ERROR();
+}
+
+ANGLE_INSTANTIATE_TEST(DrawElementsTest, ES3_OPENGL());
+}