--- tests/all.py | 1 + tests/spec/arb_direct_state_access/gettextureimage-formats.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/all.py b/tests/all.py index b79ae8b..6d20035 100644 --- a/tests/all.py +++ b/tests/all.py @@ -4318,6 +4318,7 @@ spec['ARB_direct_state_access']['copytexturesubimage'] = PiglitGLTest('arb_direc spec['ARB_direct_state_access']['texture-errors'] = PiglitGLTest('arb_direct_state_access-texture-errors', run_concurrent=True) spec['ARB_direct_state_access']['get-textures'] = PiglitGLTest('arb_direct_state_access-get-textures', run_concurrent=True) spec['ARB_direct_state_access']['gettextureimage-formats'] = PiglitGLTest('arb_direct_state_access-gettextureimage-formats', run_concurrent=True) +spec['ARB_direct_state_access']['gettextureimage-formats'] = PiglitGLTest('arb_direct_state_access-gettextureimage-formats init-by-rendering', run_concurrent=True) spec['ARB_direct_state_access']['gettextureimage-luminance'] = PiglitGLTest('arb_direct_state_access-gettextureimage-luminance', run_concurrent=True) spec['ARB_direct_state_access']['gettextureimage-simple'] = PiglitGLTest('arb_direct_state_access-gettextureimage-simple', run_concurrent=True) spec['ARB_direct_state_access']['gettextureimage-targets'] = PiglitGLTest('arb_direct_state_access-gettextureimage-targets', run_concurrent=True) diff --git a/tests/spec/arb_direct_state_access/gettextureimage-formats.c b/tests/spec/arb_direct_state_access/gettextureimage-formats.c index a22d235..e2d637c 100644 --- a/tests/spec/arb_direct_state_access/gettextureimage-formats.c +++ b/tests/spec/arb_direct_state_access/gettextureimage-formats.c @@ -110,7 +110,7 @@ make_texture_image(GLenum intFormat, GLubyte upperRightTexel[4]) glWindowPos2iARB(0, 0); glDrawPixels(TEX_SIZE, TEX_SIZE, GL_RGBA, GL_UNSIGNED_BYTE, tex); - glGenerateMipmap(GL_TEXTURE_2D); + glGenerateTextureMipmap(texture_id); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo); glDeleteFramebuffers(1, &fb); @@ -139,7 +139,6 @@ ubyte_to_float(GLubyte b, GLint bits) } - static GLfloat bits_to_tolerance(GLint bits, GLboolean compressed) { -- 2.1.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit