Henri Verbeet : wined3d: Disable GL_TEXTURE_2D again in check_filter().

Alexandre Julliard julliard at winehq.org
Wed Nov 23 16:08:38 CST 2016


Module: wine
Branch: master
Commit: b515f28007857184ad7084f00fcbc5168e38339b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b515f28007857184ad7084f00fcbc5168e38339b

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Nov 23 14:30:27 2016 +0100

wined3d: Disable GL_TEXTURE_2D again in check_filter().

To avoid breaking subsequent tests. In particular
wined3d_adapter_find_polyoffset_scale() when draw_test_quad() isn't
using GLSL.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 1255a9a..6a19012 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -3021,6 +3021,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal)
     gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo);
     gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex);
     gl_info->gl_ops.gl.p_glDeleteTextures(1, &buffer);
+    gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D);
 
     if (gl_info->gl_ops.gl.p_glGetError())
     {




More information about the wine-cvs mailing list