Attachment 121597 Details for Bug 92579 – Patch for dEQP to stop the tests from skipping

[patch] Patch for dEQP to stop the tests from skipping

0001-fbo-Fix-the-number-of-samples-stored-in-the-render-t.patch (text/plain), 1.89 KB, created by Neil Roberts on 2016-02-08 17:12:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Roberts

Created: 2016-02-08 17:12:44 UTC

Size: 1.89 KB

patch

obsolete

>From 3b74300e0bc7f32b0986072c2ba0adb1a2c59d71 Mon Sep 17 00:00:00 2001
>From: Neil Roberts <neil@linux.intel.com>
>Date: Mon, 8 Feb 2016 17:02:35 +0000
>Subject: [PATCH] fbo: Fix the number of samples stored in the render target
> config
>Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ
>
>When using the FBO render context it was previously storing the number
>of samples from the render config. However this is usually DONT_CARE
>which has the value -1 and obviously isn't a valid value for the
>number of samples. This was confusing es2fVertexTextureTests which
>tries to detect MSAA render targets and skips the test.
>
>This patch fixes it to actually query the number of samples using
>glGetIntegerv(GL_SAMPLES) instead.
>---
> framework/opengl/gluFboRenderContext.cpp | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/framework/opengl/gluFboRenderContext.cpp b/framework/opengl/gluFboRenderContext.cpp
>index b357cac..622d1d7 100644
>--- a/framework/opengl/gluFboRenderContext.cpp
>+++ b/framework/opengl/gluFboRenderContext.cpp
>@@ -185,6 +185,7 @@ void FboRenderContext::createFramebuffer (const RenderConfig& config)
> 	tcu::PixelFormat		pixelFormat;
> 	int						depthBits			= 0;
> 	int						stencilBits			= 0;
>+	int						numSamples			= 0;
> 
> 	if (config.numSamples > 0 && !gl.renderbufferStorageMultisample)
> 		throw tcu::NotSupportedError("Multisample FBO is not supported");
>@@ -255,7 +256,9 @@ void FboRenderContext::createFramebuffer (const RenderConfig& config)
> 	// Set up correct viewport for first test case.
> 	gl.viewport(0, 0, width, height);
> 
>-	m_renderTarget = tcu::RenderTarget(width, height, pixelFormat, depthBits, stencilBits, config.numSamples);
>+	gl.getIntegerv(GL_SAMPLES, &numSamples);
>+
>+	m_renderTarget = tcu::RenderTarget(width, height, pixelFormat, depthBits, stencilBits, numSamples);
> }
> 
> void FboRenderContext::destroyFramebuffer (void)
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 92579: 119052 | 119053 | 121597 | 121598

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.