[Piglit] [PATCH 2/2] gl-1.0-beginend-coverage: fix FBO-related failures when using GLUT

[Jose Fonseca]

All your four patches look good AFAICT

Jose

----- Original Message -----
> When Piglit's configured to use GLUT instead of Waffle we don't have
> full support for the -fbo option.  So in beginend-coverage we now
> check if we really have a FBO bound in order to compute the right
> fbo_attachment value.
> ---
>  tests/spec/gl-1.0/beginend-coverage.c |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/spec/gl-1.0/beginend-coverage.c
> b/tests/spec/gl-1.0/beginend-coverage.c
> index 1e8dd7d..29044ef 100644
> --- a/tests/spec/gl-1.0/beginend-coverage.c
> +++ b/tests/spec/gl-1.0/beginend-coverage.c
> @@ -59,7 +59,6 @@ struct test {
>  	void (*func)(void);
>  };
>  
> -extern bool piglit_use_fbo;
>  static uint32_t junk_storage[1024];
>  static void *junk = junk_storage;
>  static const int onei = 1;
> @@ -68,6 +67,7 @@ static GLuint some_dlist;
>  static GLuint newlist_dlist;
>  static GLuint deletelists_dlist;
>  static GLuint fbo_attachment;
> +static GLint fbo_binding;
>  
>  #define TEST_FUNC(name, args)			\
>  	static void test_##name(void)		\
> @@ -909,7 +909,12 @@ piglit_init(int argc, char **argv)
>  	glNewList(some_dlist, GL_COMPILE);
>  	glEndList();
>  
> -	if (piglit_use_fbo)
> +	if (piglit_is_extension_supported("GL_ARB_framebuffer_object"))
> +		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo_binding);
> +	else
> +		fbo_binding = 0;
> +
> +	if (fbo_binding)
>  		fbo_attachment = GL_COLOR_ATTACHMENT0;
>  	else
>  		fbo_attachment = GL_FRONT;
> --
> 1.7.3.4
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>