From 42d218eb376986969507b5a0693dd444c27f6ace Mon Sep 17 00:00:00 2001 From: Adam Czupryna Date: Fri, 18 Aug 2017 11:46:16 +0200 Subject: [PATCH] Fix to PolygonOffsetClamp windows build This is windows build fix to undefined identifier 'uint32_t' error. Affects: KHR-GL45.polygon_offset_clamp.* KHR-GLES31.core.polygon_offset_clamp.* Components: OpenGL Change-Id: I59c9e615bcef2a1273ed12f68454f10e16af0df5 --- external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp | 6 +++--- external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp b/external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp index 68caa2a..65c8e19 100644 --- a/external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp +++ b/external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp @@ -353,7 +353,7 @@ void PolygonOffsetClampValueTestCaseBase::test(const glw::Functions& gl) GLU_EXPECT_NO_ERROR(gl.getError(), "glBindFramebuffer"); bool result = true; - for (uint32_t i = 0; i < m_testValues.size(); ++i) + for (GLuint i = 0; i < m_testValues.size(); ++i) { // Prepare verification variables GLfloat depthValue = 0.0f; @@ -522,7 +522,7 @@ void PolygonOffsetClampMinMaxTestCase::init() * @param offsetDepth Case iteration number * @param offsetClampDepth Case iteration number */ -bool PolygonOffsetClampMinMaxTestCase::verify(uint32_t caseNo, GLfloat depth, GLfloat offsetDepth, +bool PolygonOffsetClampMinMaxTestCase::verify(GLuint caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth) { // Min offset case @@ -584,7 +584,7 @@ void PolygonOffsetClampZeroInfinityTestCase::init() m_testValues.push_back(PolygonOffsetClampValues(0.0f, 1000.0f, INFINITY)); // Max Offset, infinity clamp case } -bool PolygonOffsetClampZeroInfinityTestCase::verify(uint32_t caseNo, GLfloat depth, GLfloat offsetDepth, +bool PolygonOffsetClampZeroInfinityTestCase::verify(GLuint caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth) { DE_UNREF(caseNo); diff --git a/external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp b/external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp index 999957d..7eaefe2 100644 --- a/external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp +++ b/external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp @@ -102,7 +102,7 @@ protected: float readDepthValue(const glw::Functions& gl, const GLuint readDepthProgramId); - virtual bool verify(uint32_t caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth) = DE_NULL; + virtual bool verify(GLuint caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth) = DE_NULL; }; /** Test verifies if polygon offset clamp works as expected for zero and infinite clamp values @@ -117,10 +117,10 @@ public: protected: /* Protected methods */ - bool verify(uint32_t caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth); + bool verify(GLuint caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth); }; -/** Test verifies ... +/** Test verifies if polygon offset clamp works as expected for zero and infinite clamp values **/ class PolygonOffsetClampZeroInfinityTestCase : public PolygonOffsetClampValueTestCaseBase { @@ -132,7 +132,7 @@ public: protected: /* Protected methods */ - bool verify(uint32_t caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth); + bool verify(GLuint caseNo, GLfloat depth, GLfloat offsetDepth, GLfloat offsetClampDepth); }; /** Test group which encapsulates all ARB_shader_group_vote conformance tests */ -- 2.7.4