[1/3] arb_enhanced_layouts: don't call glLinkProgram twice

Submitted by apinheiro on Feb. 20, 2019, 4:06 p.m.

Details

Message ID 20190220160614.22983-2-apinheiro@igalia.com
State New
Headers show
Series "arb_enhanced_layouts: minor clean-up and one bugfix" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

apinheiro Feb. 20, 2019, 4:06 p.m.
GLSL codepath uses piglit_build_simple_program_multiple_shaders, that
already calls glLinkProgram.

Minor thing, but makes debug the test more easy.
---
 .../transform-feedback-layout-qualifiers.c                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
index 709df75f8..f2a558e34 100644
--- a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
+++ b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
@@ -131,6 +131,8 @@  compile_spirv_program(GLenum shader_type,
 	glAttachShader(prog, shader);
 	glDeleteShader(shader);
 
+	glLinkProgram(prog);
+
 	return prog;
 }
 
@@ -187,7 +189,6 @@  build_and_use_program(const struct test_config *config)
 		free(gs_text);
 	}
 
-	glLinkProgram(prog);
 	if (!piglit_link_check_status(prog))
 		piglit_report_result(PIGLIT_FAIL);
 	if (!piglit_check_gl_error(GL_NO_ERROR))

Comments

On 20/02/2019 16:06, Alejandro PiƱeiro wrote:
> GLSL codepath uses piglit_build_simple_program_multiple_shaders, that
> already calls glLinkProgram.
>
> Minor thing, but makes debug the test more easy.


Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>


> ---
>   .../transform-feedback-layout-qualifiers.c                     | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
> index 709df75f8..f2a558e34 100644
> --- a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
> +++ b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
> @@ -131,6 +131,8 @@ compile_spirv_program(GLenum shader_type,
>   	glAttachShader(prog, shader);
>   	glDeleteShader(shader);
>   
> +	glLinkProgram(prog);
> +
>   	return prog;
>   }
>   
> @@ -187,7 +189,6 @@ build_and_use_program(const struct test_config *config)
>   		free(gs_text);
>   	}
>   
> -	glLinkProgram(prog);
>   	if (!piglit_link_check_status(prog))
>   		piglit_report_result(PIGLIT_FAIL);
>   	if (!piglit_check_gl_error(GL_NO_ERROR))