summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2017-02-27 10:42:23 -0800
committerKenneth Graunke <kenneth@whitecape.org>2017-03-27 15:56:17 -0700
commitc4056630c9aa87e87c2b86e81efc93382afc215f (patch)
treedd5862877517e6d36aae25e5eaa015534a58423e
parent4ad26d88facbb90590fa087970cb4e8588a6912d (diff)
Set non-mipmap filter for CopyImage textures in namespace pollution test
glCopyImageSubData() requires mipmap completeness if the texture object's min filter indicates that mipmapping is involved. This test doesn't care about mipmapping, so set the min filter to GL_NEAREST to bypass this. Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=16224 Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
-rw-r--r--tests/general/object-namespace-pollution.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/general/object-namespace-pollution.c b/tests/general/object-namespace-pollution.c
index 1c7501443..6ac6aee7b 100644
--- a/tests/general/object-namespace-pollution.c
+++ b/tests/general/object-namespace-pollution.c
@@ -1132,10 +1132,12 @@ do_CopyImageSubData(void)
glBindTexture(GL_TEXTURE_2D, tex[0]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 16, 0,
GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, tex[1]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 16, 0,
GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);