Module: wine Branch: master Commit: 5d887de728e146fc63d2a16d52c2fc4d5d24ce43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d887de728e146fc63d2a16d52...
Author: Paul Gofman gofmanp@gmail.com Date: Fri May 19 14:56:33 2017 +0300
d3dx9: Add 'asin' preshader opcode.
Signed-off-by: Paul Gofman gofmanp@gmail.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/preshader.c | 18 ++++++++++++++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 20 insertions(+)
diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8d1d1b4..428215e 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -37,6 +37,7 @@ enum pres_ops PRESHADER_OP_RSQ, PRESHADER_OP_SIN, PRESHADER_OP_COS, + PRESHADER_OP_ASIN, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -51,6 +52,21 @@ enum pres_ops
typedef double (*pres_op_func)(double *args, int n);
+static double to_signed_nan(double v) +{ + static const union + { + ULONG64 ulong64_value; + double double_value; + } + signed_nan = + { + 0xfff8000000000000 + }; + + return isnan(v) ? signed_nan.double_value : v; +} + static double pres_mov(double *args, int n) {return args[0];} static double pres_add(double *args, int n) {return args[0] + args[1];} static double pres_mul(double *args, int n) {return args[0] * args[1];} @@ -110,6 +126,7 @@ static double pres_log(double *args, int n) return log(v) / log(2); #endif } +static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));}
#define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -143,6 +160,7 @@ static const struct op_info pres_op_info[] = {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ + {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f4a4777..dc22bd7 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4556,6 +4556,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"log", 0x10600001, 1, {0, 0x40000000, 0x3f9199b7, 0x43000000}, {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"asin", 0x10a00001, 1, {0xbe9c00ad, 0xffc00000, 0xffc00000, 0xffc00000}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };