From ac469fadc6942610baa5c31b9e9ea085137aa25e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Fri, 6 Feb 2015 14:46:47 -0800 Subject: [PATCH] Fix deqp build on clang. - Fix incorrect convertion from int to ptr. - Remove unused variable. Change-Id: Ib0c9cb93d625ad2ac932e825e32adc0d3e92bb24 --- framework/platform/X11/tcuX11GlxPlatform.cpp | 1 - modules/gles2/stress/es2sDrawTests.cpp | 7 ++++--- modules/gles3/stress/es3sDrawTests.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/platform/X11/tcuX11GlxPlatform.cpp b/framework/platform/X11/tcuX11GlxPlatform.cpp index 0c3101c..1f9e9bc 100644 --- a/framework/platform/X11/tcuX11GlxPlatform.cpp +++ b/framework/platform/X11/tcuX11GlxPlatform.cpp @@ -177,7 +177,6 @@ private: GlxDisplay m_glxDisplay; GlxVisual m_glxVisual; ContextType m_type; - GLXFBConfig m_fbConfig; GLXContext m_GLXContext; UniquePtr m_glxDrawable; RenderTarget m_renderTarget; diff --git a/modules/gles2/stress/es2sDrawTests.cpp b/modules/gles2/stress/es2sDrawTests.cpp index cf7fea7..8d027d5 100644 --- a/modules/gles2/stress/es2sDrawTests.cpp +++ b/modules/gles2/stress/es2sDrawTests.cpp @@ -128,9 +128,10 @@ void IndexGroup::init (void) for (int testNdx = 0; testNdx < DE_LENGTH_OF_ARRAY(tests); ++testNdx) { const IndexTest& indexTest = tests[testNdx]; - tcu::TestCaseGroup* group = (indexTest.storage == gls::DrawTestSpec::STORAGE_USER) - ? ((indexTest.aligned) ? (DE_NULL) : (DE_NULL)) - : ((indexTest.aligned) ? (DE_NULL) : (unalignedBufferGroup)); + + DE_ASSERT(indexTest.storage != gls::DrawTestSpec::STORAGE_USER); + DE_ASSERT(!indexTest.aligned); + tcu::TestCaseGroup* group = unalignedBufferGroup; const std::string name = std::string("index_") + gls::DrawTestSpec::indexTypeToString(indexTest.type); const std::string desc = std::string("index ") + gls::DrawTestSpec::indexTypeToString(indexTest.type) + " in " + gls::DrawTestSpec::storageToString(indexTest.storage); diff --git a/modules/gles3/stress/es3sDrawTests.cpp b/modules/gles3/stress/es3sDrawTests.cpp index 21e0398..f041ed0 100644 --- a/modules/gles3/stress/es3sDrawTests.cpp +++ b/modules/gles3/stress/es3sDrawTests.cpp @@ -311,9 +311,10 @@ void IndexGroup::init (void) for (int testNdx = 0; testNdx < DE_LENGTH_OF_ARRAY(tests); ++testNdx) { const IndexTest& indexTest = tests[testNdx]; - tcu::TestCaseGroup* group = (indexTest.storage == gls::DrawTestSpec::STORAGE_USER) - ? ((indexTest.aligned) ? (DE_NULL) : (DE_NULL)) - : ((indexTest.aligned) ? (DE_NULL) : (unalignedBufferGroup)); + + DE_ASSERT(indexTest.storage != gls::DrawTestSpec::STORAGE_USER); + DE_ASSERT(!indexTest.aligned); + tcu::TestCaseGroup* group = unalignedBufferGroup; const std::string name = std::string("index_") + gls::DrawTestSpec::indexTypeToString(indexTest.type); const std::string desc = std::string("index ") + gls::DrawTestSpec::indexTypeToString(indexTest.type) + " in " + gls::DrawTestSpec::storageToString(indexTest.storage); -- 2.7.4