Test how blits behave when the source is cleared. This case is of
interest to Intel GPUs, which will fast-clear the source.
---
tests/all.py | 12 +++++++-----
tests/spec/arb_framebuffer_srgb/blit.c | 35 +++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/tests/all.py b/tests/all.py
index 7c8580ef0..39ad46926 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2026,11 +2026,13 @@ with profile.test_list.group_manager(
'msaa', 'scaled'):
for framebuffer_srgb_setting in ('enabled',
'disabled'):
- g(['arb_framebuffer_srgb-blit', backing_type, srgb_types,
- blit_type, framebuffer_srgb_setting],
- 'blit {} {} {} {}'.format(
- backing_type, srgb_types, blit_type,
- framebuffer_srgb_setting))
+ for src_fill_mode in ('clear', 'render'):
+ g(['arb_framebuffer_srgb-blit', backing_type,
+ srgb_types, blit_type, framebuffer_srgb_setting,
+ src_fill_mode],
+ 'blit {} {} {} {} {}'.format(
+ backing_type, srgb_types, blit_type,
+ framebuffer_srgb_setting, src_fill_mode))
g(['framebuffer-srgb'], run_concurrent=False)
g(['arb_framebuffer_srgb-clear'])
g(['arb_framebuffer_srgb-pushpop'])
diff --git a/tests/spec/arb_framebuffer_srgb/blit.c
b/tests/spec/arb_framebuffer_srgb/blit.c
index b5bd72b97..de218dbd0 100644
--- a/tests/spec/arb_framebuffer_srgb/blit.c
+++ b/tests/spec/arb_framebuffer_srgb/blit.c
@@ -177,6 +177,7 @@
const int PATTERN_WIDTH = 256;
const int PATTERN_HEIGHT = 64;
+const float src_clear_col = 128.0 / 255.0;
PIGLIT_GL_TEST_CONFIG_BEGIN
@@ -195,6 +196,7 @@ static GLsizei src_samples;
static GLsizei dst_samples;
static bool scaled_blit;
static bool enable_srgb_framebuffer;
+static bool src_fill_mode_clear;
/* GL objects */
static GLuint src_fbo;
@@ -258,6 +260,7 @@ print_usage_and_exit(char *prog_name)
{
printf("Usage: %s <backing_type> <sRGB_types> <blit_type>\n"
" <framebuffer_srgb_setting>\n"
+ " <src_fill_mode>\n"
" where <backing_type> is one of:\n"
" texture (ignored for multisampled framebuffers)\n"
" renderbuffer\n"
@@ -274,7 +277,10 @@ print_usage_and_exit(char *prog_name)
" scaled\n"
" where framebuffer_srgb_setting is one of:\n"
" enabled\n"
- " disabled\n",
+ " disabled\n"
+ " where src_fill_mode is one of:\n"
+ " clear\n"
+ " render\n",
prog_name);
piglit_report_result(PIGLIT_FAIL);
}
@@ -284,7 +290,7 @@ piglit_init(int argc, char **argv)
{
GLint max_samples;
- if (argc != 5) {
+ if (argc != 6) {
print_usage_and_exit(argv[0]);
}
@@ -344,6 +350,14 @@ piglit_init(int argc, char **argv)
print_usage_and_exit(argv[0]);
}
+ if (strcmp(argv[5], "clear") == 0) {
+ src_fill_mode_clear = true;
+ } else if (strcmp(argv[5], "render") == 0) {
+ src_fill_mode_clear = false;
+ } else {
+ print_usage_and_exit(argv[0]);
+ }
+
piglit_require_gl_version(21);
piglit_require_extension("GL_ARB_framebuffer_object");
piglit_require_extension("GL_ARB_framebuffer_sRGB");
@@ -401,7 +415,8 @@ analyze_image(GLuint fbo)
for (y = 0; y < PATTERN_HEIGHT; ++y) {
for (x = 0; x < PATTERN_WIDTH; ++x) {
for (component = 0; component < 4; ++component) {
- float val = x / 255.0;
+ float val = src_fill_mode_clear ?
+ src_clear_col : x / 255.0;
if (component < 3 && enable_srgb_framebuffer) {
if (src_format == GL_SRGB8_ALPHA8)
val = srgb_to_linear(val);
@@ -437,12 +452,18 @@ piglit_display()
}
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst_fbo);
glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, src_fbo);
- glClear(GL_COLOR_BUFFER_BIT);
/* Draw the source image */
- glViewport(0, 0, PATTERN_WIDTH, PATTERN_HEIGHT);
- piglit_draw_rect(-1, -1, 2, 2);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, src_fbo);
+ if (src_fill_mode_clear) {
+ /* This case is of particular interest to Intel GPUs. */
+ glClearColor(src_clear_col, src_clear_col,
+ src_clear_col, src_clear_col);
+ glClear(GL_COLOR_BUFFER_BIT);
+ } else {
+ glViewport(0, 0, PATTERN_WIDTH, PATTERN_HEIGHT);
+ piglit_draw_rect(-1, -1, 2, 2);
+ }
/* Do the blit */
glBindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo);
--
2.16.2
_______________________________________________
Piglit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/piglit
