[Piglit] FW: [PATCH] fixed oes compressed etc2 texture miptree failure

[Ian Romanick]

This should be two patches:  one that changes the test and one that
changes piglit_ktx.c.

On 04/22/2014 07:41 PM, Guo, Johney wrote:
>    - glut config.window_width should be > 160 so as to avoid warning
>      message.
>    - fopen ktx texture file should be binary mode
>    - viewport need be reset in each display, since it has changed in
>      glut reshape() function
> 
> Signed-off-by: weijun <weijun.guo at amd.com>
> ---
>  tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c | 3 ++-
>  tests/util/piglit_ktx.c                                   | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c b/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c
> index 59d8748..eeda3cb 100644
> --- a/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c
> +++ b/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c
> @@ -289,6 +289,7 @@ piglit_display(void)
>  	bool pass = true;
>  
>  	glClear(GL_COLOR_BUFFER_BIT);
> +	glViewport(0, 0, window_width, window_height);
>  	for (level = 0; level < num_levels; ++level) {
>  		glUniform2f(level_pixel_size_loc,
>  		            (float) level_width,
> @@ -339,7 +340,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>  
>  	config.supports_gl_es_version = 30;
>  
> -	config.window_width = 150;
> +	config.window_width = 160;
>  	config.window_height = 150;
>  	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;  PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/util/piglit_ktx.c b/tests/util/piglit_ktx.c index b60f737..d844540 100644
> --- a/tests/util/piglit_ktx.c
> +++ b/tests/util/piglit_ktx.c
> @@ -436,7 +436,7 @@ piglit_ktx_read_file(const char *filename)
>  	if (self == NULL)
>  		goto out_of_memory;
>  
> -	file = fopen(filename, "r");
> +	file = fopen(filename, "rb");
>  	if (file == NULL)
>  		goto bad_open;
>  
> @@ -521,7 +521,7 @@ piglit_ktx_write_file(struct piglit_ktx *self, const char *filename)
>  	size_t size_written = 0;
>  	bool ok = true;
>  
> -	file = fopen(filename, "w");
> +	file = fopen(filename, "wb");
>  	if (file == NULL)
>  		goto bad_open;
>  
> --
> 1.8.4.msysgit.0
>