=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Implement SM4 imin instruction in GLSL backend.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 5 12:18:32 CST 2016
Module: wine
Branch: master
Commit: ade436ccec6168b8c1f442562d286cb39606b8cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade436ccec6168b8c1f442562d286cb39606b8cf
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Jan 4 13:03:41 2016 +0100
wined3d: Implement SM4 imin instruction in GLSL backend.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c9b4c81..9c65ae4 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -3192,6 +3192,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins)
switch (ins->handler_idx)
{
case WINED3DSIH_IMAX: instruction = "max"; break;
+ case WINED3DSIH_IMIN: instruction = "min"; break;
case WINED3DSIH_MIN: instruction = "min"; break;
case WINED3DSIH_MAX: instruction = "max"; break;
case WINED3DSIH_ABS: instruction = "abs"; break;
@@ -7876,7 +7877,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IFC */ shader_glsl_ifc,
/* WINED3DSIH_IGE */ shader_glsl_relop,
/* WINED3DSIH_IMAX */ shader_glsl_map2gl,
- /* WINED3DSIH_IMIN */ NULL,
+ /* WINED3DSIH_IMIN */ shader_glsl_map2gl,
/* WINED3DSIH_IMUL */ shader_glsl_imul,
/* WINED3DSIH_ISHL */ shader_glsl_binop,
/* WINED3DSIH_ITOF */ shader_glsl_to_float,
More information about the wine-cvs
mailing list