Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_mov().
Alexandre Julliard
julliard at winehq.org
Tue Oct 16 15:27:46 CDT 2012
Module: wine
Branch: master
Commit: 347dda068f9a4fdb12607f6d337d0dffa5c6b01b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=347dda068f9a4fdb12607f6d337d0dffa5c6b01b
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Oct 15 22:26:18 2012 +0200
wined3d: Explicitly check the shader type in shader_glsl_mov().
---
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 ff3c7e4..388f438 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2314,7 +2314,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins)
/* In vs_1_1 WINED3DSIO_MOV can write to the address register. In later
* shader versions WINED3DSIO_MOVA is used for this. */
if (ins->ctx->reg_maps->shader_version.major == 1
- && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)
+ && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX
&& ins->dst[0].reg.type == WINED3DSPR_ADDR)
{
/* This is a simple floor() */
More information about the wine-cvs
mailing list