[Piglit] [PATCH] etc1/etc2: move glViewport call to piglit_display(), use default window size

Brian Paul brianp at vmware.com
Mon May 5 08:11:39 PDT 2014


The initial version of this was suggested by Johney Guo.
---
 tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c |    5 ++---
 1 file changed, 2 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..c38143f 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
@@ -242,7 +242,6 @@ piglit_init(int argc, char **argv)
 	load_texture(decompressed_filename, &decompressed_tex);
 
 	glClearColor(0.3, 0.5, 1.0, 1.0);
-	glViewport(0, 0, window_width, window_height);
 
 	prog = piglit_build_simple_program(vs_source, fs_source);
 	glUseProgram(prog);
@@ -288,6 +287,8 @@ piglit_display(void)
 
 	bool pass = true;
 
+	glViewport(0, 0, window_width, window_height);
+
 	glClear(GL_COLOR_BUFFER_BIT);
 	for (level = 0; level < num_levels; ++level) {
 		glUniform2f(level_pixel_size_loc,
@@ -339,7 +340,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_es_version = 30;
 
-	config.window_width = 150;
-	config.window_height = 150;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
 PIGLIT_GL_TEST_CONFIG_END
-- 
1.7.10.4



More information about the Piglit mailing list