=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Allow both SM4 parameter modifiers simultaneously.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 19 10:50:27 CST 2016
Module: wine
Branch: master
Commit: 9adf1c21b6dfd0ae6163da1cb62f80e4fb02a806
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adf1c21b6dfd0ae6163da1cb62f80e4fb02a806
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Jan 18 21:16:44 2016 +0100
wined3d: Allow both SM4 parameter modifiers simultaneously.
It seems that negate and abs are the only source parameter modifiers
allowed in SM 4 and 5.
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/shader_sm4.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index ae148da..f102ed1 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -621,9 +621,6 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p
{
DWORD m = *(*ptr)++;
- /* FIXME: This will probably break down at some point. The SM4
- * modifiers look like flags, while wined3d currently has an enum
- * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */
switch (m)
{
case 0x41:
@@ -634,6 +631,10 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p
*modifier = WINED3DSPSM_ABS;
break;
+ case 0xc1:
+ *modifier = WINED3DSPSM_ABSNEG;
+ break;
+
default:
FIXME("Skipping modifier 0x%08x.\n", m);
*modifier = WINED3DSPSM_NONE;
More information about the wine-cvs
mailing list