summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanylo Piliaiev <danylo.piliaiev@globallogic.com>2019-04-04 14:24:17 +0300
committerKenneth Graunke <kenneth@whitecape.org>2019-04-04 16:31:39 -0700
commit4dc403100b2d1d91c16ff93b5e45885c4339f86a (patch)
tree0b6b3cb65c024a116d937c2b6d6cdb3d31b5817f
parentcee48e0ddc67ea634b139ed58e9d2ac87db57294 (diff)
bitmap-heart-dance: Disable shader program before fixed functions
Usage of shader program disables most of fixed functions functionality, at least projection and glColor. This fixes the test for Gallium drivers. It also makes it pass on NVIDIA 418.56 (GP107M). Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--tests/spec/gl-1.0/bitmap-heart-dance.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/spec/gl-1.0/bitmap-heart-dance.c b/tests/spec/gl-1.0/bitmap-heart-dance.c
index 768fee6e4..d133e213b 100644
--- a/tests/spec/gl-1.0/bitmap-heart-dance.c
+++ b/tests/spec/gl-1.0/bitmap-heart-dance.c
@@ -170,6 +170,8 @@ piglit_display(void)
int y = 30;
int spacing = 10;
+ glUseProgram(0);
+
glPixelStorei(GL_UNPACK_LSB_FIRST, GL_TRUE);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -184,6 +186,7 @@ piglit_display(void)
draw_row(ltorange, length, x, y + 1*spacing, spacing);
draw_row( yellow, length, x, y + 0*spacing, spacing);
+ glUseProgram(program);
/*
* Upload heart pattern. glBitmap is a bit mysterious in its bit
@@ -234,5 +237,4 @@ piglit_init(int argc, char **argv)
fragShader = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
fragShaderText);
program = piglit_link_simple_program(0, fragShader);
- glUseProgram(program);
}