<div dir="ltr"><div><div>Looks good. </div>Reviewed-by: Brian Paul <<a href="mailto:brianp@vmware.com">brianp@vmware.com</a>> </div>Sorry for being slow. I'm on vacation this week. </div><div class="gmail_extra"> <div class="gmail_quote">On Sat, Apr 16, 2016 at 8:25 AM, Marek Olšák <<a href="mailto:maraeo@gmail.com" target="_blank">maraeo@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>> v2: int -> bool, unify all new functions into one --- tests/util/piglit-util-gl.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c index e8a47c5..09eb99d 100644 --- a/tests/util/piglit-util-gl.c +++ b/tests/util/piglit-util-gl.c @@ -1060,6 +1060,23 @@ piglit_read_pixels_float(GLint x, GLint y, GLsizei width, GLsizei height, return pixels; } +static bool +piglit_can_probe_ubyte() +{ + int r,g,b,a; + + glGetIntegerv(GL_RED_BITS, &r); + glGetIntegerv(GL_GREEN_BITS, &g); + glGetIntegerv(GL_BLUE_BITS, &b); + glGetIntegerv(GL_ALPHA_BITS, &a); + + /* it could be LUMINANCE32F, etc. */ + if (!r && !g && !b && !a) + return false; + + return r <= 8 && g <= 8 && b <= 8 && a <= 8; +} + int piglit_probe_pixel_rgb_silent(int x, int y, const float* expected, float *out_probe) { @@ -1158,6 +1175,74 @@ piglit_probe_pixel_rgba(int x, int y, const float* expected) return 0; } +static void +piglit_array_float_to_ubyte(int n, const float *f, GLubyte *b) +{ + int i; + + for (i = 0; i < n; i++) + b[i] = f[i] * 255; +} + +static void +piglit_array_float_to_ubyte_roundup(int n, const float *f, GLubyte *b) +{ + int i; + + for (i = 0; i < n; i++) + b[i] = ceil(f[i] * 255); +} + +static bool +piglit_probe_rect_ubyte(int x, int y, int w, int h, int num_components, + const float *fexpected, bool silent) +{ + int i, j, p; + GLubyte *probe; + GLubyte *pixels; + GLubyte tolerance[4]; + GLubyte expected[4]; + + piglit_array_float_to_ubyte_roundup(num_components, piglit_tolerance, tolerance); + piglit_array_float_to_ubyte(num_components, fexpected, expected); + + /* RGBA readbacks are likely to be faster */ + pixels = malloc(w*h*4); + glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + + for (j = 0; j < h; j++) { + for (i = 0; i < w; i++) { + probe = &pixels[(j*w+i)*4]; + + for (p = 0; p < num_components; ++p) { + if (abs((int)probe[p] - (int)expected[p]) >= tolerance[p]) { + if (!silent) { + printf("Probe color at (%i,%i)\n", x+i, y+j); + if (num_components == 4) { + printf(" Expected: %u %u %u %u\n", + expected[0], expected[1], + expected[2], expected[3]); + printf(" Observed: %u %u %u %u\n", + probe[0], probe[1], probe[2], probe[3]); + } else { + printf(" Expected: %u %u %u\n", + expected[0], expected[1], + expected[2]); + printf(" Observed: %u %u %u\n", + probe[0], probe[1], probe[2]); + } + } + free(pixels); + return false; + } + } + } + } + + free(pixels); + return true; +} + int piglit_probe_rect_rgb_silent(int x, int y, int w, int h, const float *expected) { @@ -1165,6 +1250,9 @@ piglit_probe_rect_rgb_silent(int x, int y, int w, int h, const float *expected) GLfloat *probe; GLfloat *pixels; + if (piglit_can_probe_ubyte()) + return piglit_probe_rect_ubyte(x, y, w, h, 3, expected, true); + pixels = piglit_read_pixels_float(x, y, w, h, GL_RGB, NULL); for (j = 0; j < h; j++) { @@ -1223,6 +1311,9 @@ piglit_probe_rect_rgb(int x, int y, int w, int h, const float *expected) GLfloat *probe; GLfloat *pixels; + if (piglit_can_probe_ubyte()) + return piglit_probe_rect_ubyte(x, y, w, h, 3, expected, false); + pixels = piglit_read_pixels_float(x, y, w, h, GL_RGBA, NULL); for (j = 0; j < h; j++) { @@ -1290,6 +1381,9 @@ piglit_probe_rect_rgba(int x, int y, int w, int h, const float *expected) GLfloat *probe; GLfloat *pixels; + if (piglit_can_probe_ubyte()) + return piglit_probe_rect_ubyte(x, y, w, h, 4, expected, false); + pixels = piglit_read_pixels_float(x, y, w, h, GL_RGBA, NULL); for (j = 0; j < h; j++) { -- 2.5.0 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/piglit" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div>