diff options
| author | Neil Roberts <neil@linux.intel.com> | 2013-02-06 12:59:58 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-02-08 12:16:43 +0000 |
| commit | 745cbcbdee0f5b4df4c6a735b03709248a551884 (patch) | |
| tree | 204a7c017fa7dd0ba82d5ee8e25daf4b5840566f | |
| parent | a094ac9688a5e6b53be1cd379dc045973aab2fae (diff) | |
| download | cogl-745cbcbdee0f5b4df4c6a735b03709248a551884.tar.gz | |
test-gles2-context: Read pixels using GL_RGBA not GL_RGB
The GLES2 spec only guarantees calling glReadPixels with GL_RGBA and
an implementation specific format. Mesa seems to now reject reading
with GL_RGB so the test had started failing. This fixes it to just
read using GL_RGBA.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | tests/conform/test-gles2-context.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/conform/test-gles2-context.c b/tests/conform/test-gles2-context.c index e9f6e3a9..7b5f0fc3 100644 --- a/tests/conform/test-gles2-context.c +++ b/tests/conform/test-gles2-context.c @@ -277,7 +277,7 @@ test_gles2_read_pixels (void) CoglGLES2Context *gles2_ctx; const CoglGLES2Vtable *gles2; CoglError *error = NULL; - GLubyte pixel[3]; + GLubyte pixel[4]; GLuint fbo_handle; create_gles2_context (&offscreen_texture, @@ -299,7 +299,7 @@ test_gles2_read_pixels (void) gles2->glClearColor (1, 0, 0, 1); gles2->glClear (GL_COLOR_BUFFER_BIT); - gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel); + gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); test_utils_compare_pixel (pixel, 0xff0000ff); @@ -309,7 +309,7 @@ test_gles2_read_pixels (void) gles2->glClearColor (0, 1, 0, 1); gles2->glClear (GL_COLOR_BUFFER_BIT); - gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel); + gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); test_utils_compare_pixel (pixel, 0x00ff00ff); @@ -317,7 +317,7 @@ test_gles2_read_pixels (void) gles2->glClearColor (0, 1, 1, 1); gles2->glClear (GL_COLOR_BUFFER_BIT); - gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel); + gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); test_utils_compare_pixel (pixel, 0x00ffffff); @@ -335,7 +335,7 @@ test_gles2_read_pixels (void) g_error ("Failed to push gles2 context: %s\n", error->message); } - gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel); + gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); test_utils_compare_pixel (pixel, 0x00ffffff); @@ -355,7 +355,7 @@ test_gles2_read_pixels (void) g_error ("Failed to push gles2 context: %s\n", error->message); } - gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel); + gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); test_utils_compare_pixel (pixel, 0xffffffff); |