diff options
author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2021-01-07 15:48:22 +0100 |
---|---|---|
committer | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2021-01-12 10:34:44 +0100 |
commit | 7e168a62b336dd106f685cd5a4a457ad7c28d501 (patch) | |
tree | 059f6a066aeb4cab2206a752754bc4f7dc717789 | |
parent | b679c172cff022482a5df580449ce1ea42de6949 (diff) |
test: add fbo blit + texture view testcase
Exhibits the following bugs:
- glBlitFramebuffer when src fbo uses a texture view.
See https://gitlab.freedesktop.org/mesa/mesa/-/issues/4034
- glBlitFramebuffer when dst fbo uses a texture view
- glReadPixels from a fbo using a texture view
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/447>
-rw-r--r-- | tests/opengl.py | 2 | ||||
-rw-r--r-- | tests/spec/arb_texture_view/CMakeLists.gl.txt | 1 | ||||
-rw-r--r-- | tests/spec/arb_texture_view/fbo-blit.c | 229 |
3 files changed, 232 insertions, 0 deletions
diff --git a/tests/opengl.py b/tests/opengl.py index 48f874cb3..1946048a2 100644 --- a/tests/opengl.py +++ b/tests/opengl.py @@ -2518,6 +2518,8 @@ with profile.test_list.group_manager( 'sampling-2d-array-as-cubemap-array') g(['arb_texture_view-sampling-2d-array-as-2d-layer'], 'sampling-2d-array-as-2d-layer') + g(['arb_texture_view-fbo-blit'], + 'fbo-blit') with profile.test_list.group_manager( PiglitGLTest, diff --git a/tests/spec/arb_texture_view/CMakeLists.gl.txt b/tests/spec/arb_texture_view/CMakeLists.gl.txt index c6110189b..8687ec470 100644 --- a/tests/spec/arb_texture_view/CMakeLists.gl.txt +++ b/tests/spec/arb_texture_view/CMakeLists.gl.txt @@ -34,5 +34,6 @@ piglit_add_executable(arb_texture_view-texsubimage-layers texsubimage-layers.c c piglit_add_executable(arb_texture_view-texsubimage-levels texsubimage-levels.c common.c) piglit_add_executable(arb_texture_view-texture-immutable-levels texture-immutable-levels.c) piglit_add_executable(arb_texture_view-bug-layers-image bug-layers-image.c common.c) +piglit_add_executable(arb_texture_view-fbo-blit fbo-blit.c) # vim: ft=cmake: diff --git a/tests/spec/arb_texture_view/fbo-blit.c b/tests/spec/arb_texture_view/fbo-blit.c new file mode 100644 index 000000000..8c3eee0e5 --- /dev/null +++ b/tests/spec/arb_texture_view/fbo-blit.c @@ -0,0 +1,229 @@ +/* + * Copyright 2021 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + + +/** @file fbo-blit.c + * + * This test is based on tests/fbo/fbo-blit.c but uses a texture view for + * the color attachment, with a different format than the original texture. + * + * This reproduces the bug: + * https://gitlab.freedesktop.org/mesa/mesa/-/issues/4034 + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 15; + + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; + +PIGLIT_GL_TEST_CONFIG_END + +#define PAD 10 +#define SIZE 20 + +/* size of texture/renderbuffer (power of two) */ +#define FBO_SIZE 64 + +static GLuint target = GL_TEXTURE_2D; + + +static GLuint +make_fbo(int w, int h) +{ + GLuint tex, view; + GLuint fb; + GLenum status; + + glGenFramebuffersEXT(1, &fb); + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); + + glGenTextures(1, &tex); + glBindTexture(target, tex); + glTexStorage2D(target, 1, GL_R32F, w, h); + + /* Create a texture view with GL_RGBA8 format */ + glGenTextures(1, &view); + glTextureView(view, target, tex, GL_RGBA8, 0, 1, 0, 1); + glBindTexture(target, view); + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + GL_COLOR_ATTACHMENT0_EXT, + target, + view, + 0); + if (!piglit_check_gl_error(GL_NO_ERROR)) + piglit_report_result(PIGLIT_FAIL); + + status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT); + if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { + fprintf(stderr, "fbo incomplete (status = 0x%04x)\n", status); + piglit_report_result(PIGLIT_SKIP); + } + + return fb; +} + +static void +draw_color_rect(int x, int y, int w, int h) +{ + int x1 = x; + int x2 = x + w / 2; + int y1 = y; + int y2 = y + h / 2; + + glColor4f(1.0, 0.0, 0.0, 0.0); + piglit_draw_rect(x1, y1, w / 2, h / 2); + glColor4f(0.0, 1.0, 0.0, 0.0); + piglit_draw_rect(x2, y1, w / 2, h / 2); + glColor4f(0.0, 0.0, 1.0, 0.0); + piglit_draw_rect(x1, y2, w / 2, h / 2); + glColor4f(1.0, 1.0, 1.0, 0.0); + piglit_draw_rect(x2, y2, w / 2, h / 2); +} + +static GLboolean +verify_color_rect(int start_x, int start_y, int w, int h) +{ + float red[] = {1, 0, 0, 0}; + float green[] = {0, 1, 0, 0}; + float blue[] = {0, 0, 1, 0}; + float white[] = {1, 1, 1, 0}; + + if (!piglit_probe_rect_rgb(start_x, start_y, w / 2, h / 2, red)) + return GL_FALSE; + if (!piglit_probe_rect_rgb(start_x + w/2, start_y, w/2, h/2, green)) + return GL_FALSE; + if (!piglit_probe_rect_rgb(start_x, start_y + h/2, w/2, h/2, blue)) + return GL_FALSE; + if (!piglit_probe_rect_rgb(start_x + w/2, start_y + h/2, w/2, h/2, white)) + return GL_FALSE; + + return GL_TRUE; +} + + +static void +copy(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, + GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1) +{ + glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, + dstX0, dstY0, dstX1, dstY1, + GL_COLOR_BUFFER_BIT, GL_NEAREST); +} + + +static GLboolean +run_test(void) +{ + GLboolean pass = GL_TRUE; + GLuint fbo; + int fbo_width = FBO_SIZE; + int fbo_height = FBO_SIZE; + int x0 = PAD; + int y0 = PAD; + int y1 = PAD * 2 + SIZE; + int y2 = PAD * 3 + SIZE * 2; + + glViewport(0, 0, piglit_width, piglit_height); + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE); + + glClearColor(0.5, 0.5, 0.5, 0.5); + glClear(GL_COLOR_BUFFER_BIT); + + /* Draw the color rect in the window system window */ + draw_color_rect(x0, y0, SIZE, SIZE); + + fbo = make_fbo(fbo_width, fbo_height); + + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fbo); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, piglit_winsys_fbo); + glViewport(0, 0, fbo_width, fbo_height); + piglit_ortho_projection(fbo_width, fbo_height, GL_FALSE); + glClearColor(1.0, 0.0, 1.0, 0.0); + glClear(GL_COLOR_BUFFER_BIT); + + /* Draw the color rect in the FBO */ + draw_color_rect(x0, y0, SIZE, SIZE); + /* Now that we have correct samples, blit things around. + * FBO(bottom) -> WIN(middle) + */ + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, piglit_winsys_fbo); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fbo); + copy(x0, y0, x0 + SIZE, y0 + SIZE, + x0, y1, x0 + SIZE, y1 + SIZE); + + /* WIN(bottom) -> FBO(middle) */ + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fbo); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, piglit_winsys_fbo); + copy(x0, y0, x0 + SIZE, y0 + SIZE, + x0, y1, x0 + SIZE, y1 + SIZE); + + /* FBO(middle) -> WIN(top) back to verify WIN -> FBO */ + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, piglit_winsys_fbo); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fbo); + copy(x0, y1, x0 + SIZE, y1 + SIZE, + x0, y2, x0 + SIZE, y2 + SIZE); + + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, piglit_winsys_fbo); + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo); + + pass = verify_color_rect(PAD, y0, SIZE, SIZE) && pass; + pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; + pass = verify_color_rect(PAD, y2, SIZE, SIZE) && pass; + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo); + pass = verify_color_rect(PAD, y0, SIZE, SIZE) && pass; + pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo); + + piglit_present_results(); + + return pass; +} + + +enum piglit_result +piglit_display(void) +{ + GLboolean pass = run_test(); + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} + + +void +piglit_init(int argc, char **argv) +{ + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE); + + piglit_require_extension("GL_EXT_framebuffer_object"); + piglit_require_extension("GL_EXT_framebuffer_blit"); + piglit_require_extension("GL_ARB_texture_view"); +} |