Henri Verbeet : wined3d: Just fail if the texture type is not supported in create_glsl_blt_shader() (LLVM/Clang).

Alexandre Julliard julliard at winehq.org
Tue Feb 1 12:24:56 CST 2011


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Jan 31 19:19:24 2011 +0100

wined3d: Just fail if the texture type is not supported in create_glsl_blt_shader() (LLVM/Clang).

Changing the texture type has no effect at this point, and it wouldn't work
properly anyway.

---

 dlls/wined3d/glsl_shader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e8bb553..e349e26 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4563,7 +4563,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info,
     if (!blt_pshader)
     {
         FIXME("tex_type %#x not supported\n", tex_type);
-        tex_type = tex_2d;
+        return 0;
     }
 
     vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB));




More information about the wine-cvs mailing list