ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Add 'acos' 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>
This commit is contained in:
Paul Gofman 2017-05-19 14:56:34 +03:00 committed by Alexandre Julliard
parent 5d887de728
commit 537390ed8d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3dx9_36/preshader.c
View File

@ -38,6 +38,7 @@ enum pres_ops
PRESHADER_OP_SIN, PRESHADER_OP_SIN,
PRESHADER_OP_COS, PRESHADER_OP_COS,
PRESHADER_OP_ASIN, PRESHADER_OP_ASIN,
PRESHADER_OP_ACOS,
PRESHADER_OP_MIN, PRESHADER_OP_MIN,
PRESHADER_OP_MAX, PRESHADER_OP_MAX,
PRESHADER_OP_LT, PRESHADER_OP_LT,
@ -127,6 +128,7 @@ static double pres_log(double *args, int n)
#endif #endif
} }
static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));}
static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));}
#define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_MASK 0x7ff00000
#define PRES_OPCODE_SHIFT 20 #define PRES_OPCODE_SHIFT 20
@ -161,6 +163,7 @@ static const struct op_info pres_op_info[] =
{0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */
{0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */
{0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */
{0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */
{0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */
{0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */
{0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */

2
dlls/d3dx9_36/tests/effect.c
View File

@ -4558,6 +4558,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device)
{0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}},
{"asin", 0x10a00001, 1, {0xbe9c00ad, 0xffc00000, 0xffc00000, 0xffc00000}, {"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.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}},
{"acos", 0x10b00001, 1, {0x3ff01006, 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 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000},
{0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}},
}; };