[Piglit] [PATCH] glean: remove test_uniform_multiple_samplers()

Samuel Pitoiset samuel.pitoiset at gmail.com
Fri May 19 09:03:59 UTC 2017



On 05/19/2017 02:41 AM, Timothy Arceri wrote:
> There are enought shader_runner and likely CTS tests to make this
> redundant.

Typo: enough

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

> ---
>   tests/glean/tshaderapi.cpp | 18 ------------------
>   1 file changed, 18 deletions(-)
> 
> diff --git a/tests/glean/tshaderapi.cpp b/tests/glean/tshaderapi.cpp
> index 623562a..cad46af 100644
> --- a/tests/glean/tshaderapi.cpp
> +++ b/tests/glean/tshaderapi.cpp
> @@ -369,47 +369,29 @@ ShaderAPITest::test_uniform_bool_conversion(void)
>   	assert_no_error();
>   	glUniform1i(location, 5);
>   	assert_no_error();
>   	glGetUniformiv(program, location, &value[0]);
>   	assert_no_error();
>   	assert(value[0] == 1);
>   }
>   
>   
>   void
> -ShaderAPITest::test_uniform_multiple_samplers(void)
> -{
> -   GLuint program;
> -   GLint location;
> -   GLint values[2] = {0, 1};
> -
> -   assert_no_error();
> -   program = make_program(NULL, "uniform sampler2D s[2];\nvoid main() { gl_FragColor = texture2D(s[1], vec2(0.0, 0.0)); }\n");
> -   location = glGetUniformLocation(program, "s[0]");
> -   assert(location != -1);
> -   assert_no_error();
> -   glUniform1iv(location, 2, values);
> -   assert_no_error();
> -}
> -
> -
> -void
>   ShaderAPITest::run_tests(void)
>   {
>   	test_uniform_size_type();
>   	test_attrib_size_type();
>   	test_uniform_array_overflow();
>   	test_uniform_scalar_count();
>   	test_uniform_query_matrix();
>   	test_uniform_neg_location();
>   	test_uniform_bool_conversion();
> -	test_uniform_multiple_samplers();
>   }
>   
>   
>   void
>   ShaderAPITest::runOne(ShaderAPIResult &r, Window &w)
>   {
>   	(void) w;  // silence warning
>   
>   	// error will be set to true if any of the assert functions below fail.
>   	error = false;
> 


More information about the Piglit mailing list