commit db66290126e13d733ffa288d8fffbff8f1c45c4b
author Mika Isojarvi <misojarvi@google.com> Thu Jan 28 19:39:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 28 19:39:08 2016 +0000
tree 79f8fa2ece649fac4c307e8c0be41435a395922d
parent 21f9bad1d5fb8d24a10855459d38631f3d134991
parent 396a3b4d698ebc050a2c5a923e9027d32b21e8c7

Merge "Fix layout binding tests resolution issue."

modules/gles31/functional/es31fLayoutBindingTests.cpp

diff --git a/modules/gles31/functional/es31fLayoutBindingTests.cpp b/modules/gles31/functional/es31fLayoutBindingTests.cpp
index 9c6b557..f925deb 100644
--- a/modules/gles31/functional/es31fLayoutBindingTests.cpp
+++ b/modules/gles31/functional/es31fLayoutBindingTests.cpp
@@ -201,8 +201,8 @@
 public:
 	enum
 	{
-		TEST_RENDER_WIDTH	= 256,
-		TEST_RENDER_HEIGHT	= 256,
+		MAX_TEST_RENDER_WIDTH	= 256,
+		MAX_TEST_RENDER_HEIGHT	= 256,
 		TEST_TEXTURE_SIZE	= 1,
 	};
 
@@ -221,6 +221,8 @@
 	virtual void 						init							(void);
 	virtual void 						deinit							(void);
 
+	int									getRenderWidth					(void) const { return de::min((int)MAX_TEST_RENDER_WIDTH, m_context.getRenderTarget().getWidth()); }
+	int									getRenderHeight					(void) const { return de::min((int)MAX_TEST_RENDER_HEIGHT, m_context.getRenderTarget().getHeight()); }
 protected:
 	virtual glu::ShaderProgram*			generateShaders					(void) const = 0;
 
@@ -519,7 +521,7 @@
 	const glw::Functions& gl = m_context.getRenderContext().getFunctions();
 
 	gl.useProgram(m_program->getProgram());
-	gl.viewport(0, 0, TEST_RENDER_WIDTH, TEST_RENDER_HEIGHT);
+	gl.viewport(0, 0, getRenderWidth(), getRenderHeight());
 	gl.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
 	GLU_EXPECT_NO_ERROR(gl.getError(), "Failed to set render state");
 }
@@ -527,7 +529,7 @@
 bool LayoutBindingRenderCase::drawAndVerifyResult (const Vec4& expectedColor)
 {
 	const glw::Functions&	gl					= m_context.getRenderContext().getFunctions();
-	tcu::Surface			reference			(TEST_RENDER_WIDTH, TEST_RENDER_HEIGHT);
+	tcu::Surface			reference			(getRenderWidth(), getRenderHeight());
 
 	// the point of these test is to check layout_binding. For this purpose, we can use quite
 	// large thresholds.
@@ -544,7 +546,7 @@
 	GLU_EXPECT_NO_ERROR(gl.getError(), "Drawing failed");
 
 	// Verify
-	tcu::Surface result(TEST_RENDER_WIDTH, TEST_RENDER_HEIGHT);
+	tcu::Surface result(getRenderWidth(), getRenderHeight());
 	m_testCtx.getLog() << TestLog::Message << "Reading pixels" << TestLog::EndMessage;
 	glu::readPixels(m_context.getRenderContext(), 0, 0, result.getAccess());
 	GLU_EXPECT_NO_ERROR(gl.getError(), "Read pixels failed");