[Piglit] [PATCH 06/16] Unify piglit_probe_image_* functions between GL and GLES

Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 210 + tests/util/piglit-util-gl.c| 166 - tests/util/piglit-util-gles.c | 44 3 files changed, 210 insertions(+), 210 deletions(-) diff

[Piglit] [PATCH 15/16] Unify piglit_rgbw_texture between GL and GLES; drop piglit-util-gles.c

With the image generation factored out to piglit_rgbw_image and piglit_rgbw_image_ubyte, the remainder of the implementation becomes common between GL and GLES. This eliminates the last helper function from piglit-util-gles.c, so drop it. Signed-off-by: Josh Triplett --- tests/util

[Piglit] [PATCH 08/16] Move piglit_probe_texel_* functions to GL common code

These don't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 183 + tests/util/piglit-util-gl.c| 183 - 2 files changed, 183 insertions(+)

[Piglit] [PATCH 11/16] Move piglit_draw_triangle* helper functions to GL common code

These don't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 40 ++ tests/util/piglit-util-gl.c| 40 -- 2 files changed, 40 insertions(+

[Piglit] [PATCH 01/16] Fix piglit_is_gles to return true for "OpenGL ES-CM 1.1 ..."

Piglit looked for a GL_VERSION starting with "OpenGL ES ", which did not match "OpenGL ES-CM 1.1 Mesa 10.2.1". Stop requiring the trailing space. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) dif

[Piglit] [PATCH 10/16] Move piglit program helper functions to GL common code

These don't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 81 + tests/util/piglit-util-gl.c| 82 -- 2 files changed, 81 insertions(+

[Piglit] [PATCH 09/16] Move remaining piglit_probe_* functions to GL common code

These don't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 116 + tests/util/piglit-util-gl.c| 115 2 files changed, 116 insertions(+)

[Piglit] [PATCH 05/16] Unify piglit_probe_pixel_* and piglit_probe_rect_* between GL and GLES

Introduce a new internal helper, piglit_read_pixels_float, that always returns floats. On GL it just calls glReadPixels with GL_FLOAT; on GLES it uses GL_UNSIGNED_BYTE and converts. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 280

[Piglit] [PATCH 13/16] Move piglit_miptree_texture to GL common code

This doesn't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 39 + tests/util/piglit-util-gl.c| 40 -- 2 files changed, 39 insertions(+

[Piglit] [PATCH 04/16] Unify projection utility functions across GL and GLES

piglit_gen_ortho_projection and piglit_ortho_projection already had a similar implementation for GL and GLES1; common it up and remove the ifdefs. Move piglit_frustum_projection out of GL-only code as well, and add support for GLES1 using glFrustumf. Signed-off-by: Josh Triplett --- tests/util

[Piglit] [PATCH 16/16] Move the remaining piglit-util-gl functions into piglit-util-gl-common

Drop the now-empty piglit-util-gl.c. Signed-off-by: Josh Triplett --- tests/util/CMakeLists.gl.txt | 2 - tests/util/piglit-util-gl-common.c | 241 tests/util/piglit-util-gl.c| 277 - 3 files changed, 241

[Piglit] [PATCH 12/16] Unify piglit_checkerboard_texture between GL and GLES

GL_CLAMP_TO_BORDER as it does on GL. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 110 + tests/util/piglit-util-gl.c| 83 tests/util/piglit-util-gles.c | 87 - 3 files

[Piglit] [PATCH 02/16] Unify piglit_num_components between GL and GLES

The unified implementation handles all the GLenum values expected by either. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 26 ++ tests/util/piglit-util-gl.c| 26 -- tests/util/piglit-util-gles.c | 21

[Piglit] [PATCH 07/16] Unify piglit_escape_exit_key between GL and GLES

Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 14 ++ tests/util/piglit-util-gl.c| 13 - tests/util/piglit-util-gles.c | 12 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/tests/util/piglit-util-gl

[Piglit] [PATCH 14/16] Factor out image generation from GLES piglit_rgbw_texture into a helper

This moves the GLES implementation of piglit_rgbw_texture much closer to the GL version. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gles.c | 82 --- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/tests/util/piglit-util-gles.c

[Piglit] [PATCH 00/16] Unify piglit-util-{gl, gles}.c into piglit-util-gl-common.c

ies I sent yesterday. Josh Triplett (16): Fix piglit_is_gles to return true for "OpenGL ES-CM 1.1 ..." Unify piglit_num_components between GL and GLES Move piglit_get_luminance_intensity_bits to GL common code Unify projection utility functions across GL and GLES Unify piglit_pr

[Piglit] [PATCH 03/16] Move piglit_get_luminance_intensity_bits to GL common code

This doesn't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 102 + tests/util/piglit-util-gl.c| 102 - 2 files changed, 102 inser

[Piglit] [PATCH 3/4] Move piglit_get_luminance_intensity_bits to GL common code

This doesn't need to remain in the GL-specific utility library. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 102 + tests/util/piglit-util-gl.c| 102 - 2 files changed, 102 inser

[Piglit] [PATCH 4/4] Unify projection utility functions across GL and GLES

piglit_gen_ortho_projection and piglit_ortho_projection already had a similar implementation for GL and GLES1; common it up and remove the ifdefs. Move piglit_frustum_projection out of GL-only code as well, and add support for GLES1 using glFrustumf. Signed-off-by: Josh Triplett --- tests/util

[Piglit] [PATCH 1/4] Fix piglit_is_gles to return true for "OpenGL ES-CM 1.1 ..."

Piglit looked for a GL_VERSION starting with "OpenGL ES ", which did not match "OpenGL ES-CM 1.1 Mesa 10.2.1". Stop requiring the trailing space. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) dif

[Piglit] [PATCH 2/4] Unify piglit_num_components between GL and GLES

The unified implementation handles all the GLenum values expected by either. Signed-off-by: Josh Triplett --- tests/util/piglit-util-gl-common.c | 26 ++ tests/util/piglit-util-gl.c| 26 -- tests/util/piglit-util-gles.c | 21