From b459c99555bc640418e0d5d2bbacec624903f33d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Mon, 27 Apr 2015 15:14:35 -0700 Subject: [PATCH] Update default VAO attrib divisor tests. - Expect vertexAttribDivisor on ES31 with default VAO to not generate a error, i.e. expect vertexAttribDivisor in ES31 to be compatible with ES30. Bug: 20154392 Change-Id: I2c009518f5f0686b269f3d2a33ea8a19c3d02470 --- .../gles3/functional/es3fDefaultVertexArrayObjectTests.cpp | 3 +-- .../functional/es31fDefaultVertexArrayObjectTests.cpp | 14 ++++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp b/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp index 5ee8786..5856d8f 100644 --- a/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp +++ b/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp @@ -59,8 +59,7 @@ VertexAttributeDivisorCase::IterateResult VertexAttributeDivisorCase::iterate (v gl.enableLogging(true); gl.glBindVertexArray(0); - // Using vertexAttribDivisor with default vao is an error in ES 3.1, but not - // in ES 3.0. See Khronos bug 13564 for details. + // Using vertexAttribDivisor with default vao is not an error in ES 3.0. gl.glVertexAttribDivisor(0, 3); GLU_EXPECT_NO_ERROR(gl.glGetError(), "VertexAttribDivisor"); diff --git a/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp b/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp index b9cf3b8..2bf9b1d 100644 --- a/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp +++ b/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp @@ -52,26 +52,20 @@ VertexAttributeDivisorCase::VertexAttributeDivisorCase (Context& context, const VertexAttributeDivisorCase::IterateResult VertexAttributeDivisorCase::iterate (void) { glu::CallLogWrapper gl (m_context.getRenderContext().getFunctions(), m_testCtx.getLog()); - deUint32 error; m_testCtx.getLog() << tcu::TestLog::Message << "Using VertexAttribDivisor with default VAO.\n" - << "Expecting INVALID_OPERATION." + << "Expecting no error." << tcu::TestLog::EndMessage; gl.enableLogging(true); gl.glBindVertexArray(0); - // Using vertexAttribDivisor with default vao is an error in ES 3.1, but not - // in ES 3.0. See Khronos bug 13564 for details. + // Using vertexAttribDivisor with default vao is not an error in ES 3.1. gl.glVertexAttribDivisor(0, 3); - error = gl.glGetError(); - - if (error == GL_INVALID_OPERATION) - m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass"); - else - m_testCtx.setTestResult(QP_TEST_RESULT_FAIL, "Incorrect error value"); + GLU_EXPECT_NO_ERROR(gl.glGetError(), "VertexAttribDivisor"); + m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass"); return STOP; } -- 2.7.4