projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb92cea)
Call BufferTestBase's subclasses' executeDrawCall
authorJames Helferty <jhelferty@nvidia.com>
Mon, 29 May 2017 20:42:47 +0000 (16:42 -0400)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 6 Jun 2017 08:41:30 +0000 (04:41 -0400)
A number of enhanced layout tests that inherited from BufferTestBase
were not calling the correct executeDrawCall function due to having a
different function prototype from the base class.

VK-GL-CTS issue: 451

Components: OpenGL

Affects:

KHR-GL44.enhanced_layouts.xfb_capture_inactive_output_block_member
KHR-GL44.enhanced_layouts.xfb_capture_inactive_output_component
KHR-GL44.enhanced_layouts.xfb_capture_inactive_output_variable
KHR-GL44.enhanced_layouts.xfb_capture_struct
KHR-GL44.enhanced_layouts.xfb_stride
KHR-GL44.enhanced_layouts.xfb_stride_of_empty_list
KHR-GL44.enhanced_layouts.xfb_stride_of_empty_list_and_api
KHR-GL45.enhanced_layouts.xfb_capture_inactive_output_block_member
KHR-GL45.enhanced_layouts.xfb_capture_inactive_output_component
KHR-GL45.enhanced_layouts.xfb_capture_inactive_output_variable
KHR-GL45.enhanced_layouts.xfb_capture_struct
KHR-GL45.enhanced_layouts.xfb_stride
KHR-GL45.enhanced_layouts.xfb_stride_of_empty_list
KHR-GL45.enhanced_layouts.xfb_stride_of_empty_list_and_api

Change-Id: I731297f26e2784915003b4e13958b285736d7c9d

external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp patch | blob | history
external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp patch | blob | history

diff --git a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp
index 2abae5b..ae6ef4a 100644 (file)
--- a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp
+++ b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp
@@ -19916,7 +19916,7 @@ XFBStrideOfEmptyListTest::XFBStrideOfEmptyListTest(deqp::Context& context)
  *
  * @return true if proper error is reported
  **/
-bool XFBStrideOfEmptyListTest::executeDrawCall(GLuint test_case_index)
+bool XFBStrideOfEmptyListTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl             = m_context.getRenderContext().getFunctions();
        bool                     result = true;
@@ -20209,7 +20209,7 @@ XFBStrideOfEmptyListAndAPITest::XFBStrideOfEmptyListAndAPITest(deqp::Context& co
  *
  * @return true if proper error is reported
  **/
-bool XFBStrideOfEmptyListAndAPITest::executeDrawCall(GLuint test_case_index)
+bool XFBStrideOfEmptyListAndAPITest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl             = m_context.getRenderContext().getFunctions();
        bool                     result = true;
@@ -24404,7 +24404,7 @@ XFBStrideTest::XFBStrideTest(deqp::Context& context)
  *
  * @return true
  **/
-bool XFBStrideTest::executeDrawCall(GLuint test_case_index)
+bool XFBStrideTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl                             = m_context.getRenderContext().getFunctions();
        GLenum                   primitive_type = GL_PATCHES;
@@ -25783,7 +25783,7 @@ XFBCaptureInactiveOutputVariableTest::XFBCaptureInactiveOutputVariableTest(deqp:
  *
  * @return true
  **/
-bool XFBCaptureInactiveOutputVariableTest::executeDrawCall(GLuint test_case_index)
+bool XFBCaptureInactiveOutputVariableTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl                             = m_context.getRenderContext().getFunctions();
        GLenum                   primitive_type = GL_PATCHES;
@@ -26152,7 +26152,7 @@ XFBCaptureInactiveOutputComponentTest::XFBCaptureInactiveOutputComponentTest(deq
  *
  * @return true
  **/
-bool XFBCaptureInactiveOutputComponentTest::executeDrawCall(GLuint test_case_index)
+bool XFBCaptureInactiveOutputComponentTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl                             = m_context.getRenderContext().getFunctions();
        GLenum                   primitive_type = GL_PATCHES;
@@ -26590,7 +26590,7 @@ XFBCaptureInactiveOutputBlockMemberTest::XFBCaptureInactiveOutputBlockMemberTest
  *
  * @return true
  **/
-bool XFBCaptureInactiveOutputBlockMemberTest::executeDrawCall(GLuint test_case_index)
+bool XFBCaptureInactiveOutputBlockMemberTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl                             = m_context.getRenderContext().getFunctions();
        GLenum                   primitive_type = GL_PATCHES;
@@ -26936,7 +26936,7 @@ XFBCaptureStructTest::XFBCaptureStructTest(deqp::Context& context)
  *
  * @return true
  **/
-bool XFBCaptureStructTest::executeDrawCall(GLuint test_case_index)
+bool XFBCaptureStructTest::executeDrawCall(bool /* tesEnabled */, GLuint test_case_index)
 {
        const Functions& gl                             = m_context.getRenderContext().getFunctions();
        GLenum                   primitive_type = GL_PATCHES;
diff --git a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp
index 60d4109..72c6902 100644 (file)
--- a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp
+++ b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp
@@ -3412,7 +3412,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
 
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
@@ -3474,7 +3474,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
        virtual void getCapturedVaryings(glw::GLuint test_case_index, Utils::Program::NameVector& captured_varyings);
@@ -4235,7 +4235,7 @@ protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
 
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
        virtual void getShaderBody(glw::GLuint test_case_index, Utils::Shader::STAGES stage, std::string& out_assignments,
@@ -4438,7 +4438,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
        virtual void getShaderBody(glw::GLuint test_case_index, Utils::Shader::STAGES stage, std::string& out_assignments,
@@ -4513,7 +4513,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
 
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
@@ -4574,7 +4574,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
        virtual void getShaderBody(glw::GLuint test_case_index, Utils::Shader::STAGES stage, std::string& out_assignments,
@@ -4636,7 +4636,7 @@ public:
 protected:
        /* Protected methods */
        using BufferTestBase::executeDrawCall;
-       virtual bool executeDrawCall(glw::GLuint test_case_index);
+       virtual bool executeDrawCall(bool tesEnabled, glw::GLuint test_case_index);
 
        virtual void getBufferDescriptors(glw::GLuint test_case_index, bufferDescriptor::Vector& out_descriptors);
 
Domain: Graphics System / GL;