diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-13 15:00:14 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-13 15:00:14 -0600 |
| commit | 948c60badc52cf938766964dc90ce574f885b23d (patch) | |
| tree | a98ae2237a5da7f39112802d38b012f3e03961d9 /src/mesa | |
| parent | d8070889d73479d9dbef27ccf1ed5d26fc8760e5 (diff) | |
get rid of float_multiply, float_add, float_divide
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/shader/slang/library/slang_core.gc | 2 | ||||
| -rw-r--r-- | src/mesa/shader/slang/library/slang_core_gc.h | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/shader/slang/library/slang_core.gc b/src/mesa/shader/slang/library/slang_core.gc index a0abef0eda..927ca048d7 100644 --- a/src/mesa/shader/slang/library/slang_core.gc +++ b/src/mesa/shader/slang/library/slang_core.gc @@ -691,7 +691,7 @@ float __operator - (const float a, const float b) float __operator * (const float a, const float b) { - __asm float_multiply __retVal, a, b; + __asm vec4_multiply __retVal.x, a, b; } float __operator / (const float a, const float b) diff --git a/src/mesa/shader/slang/library/slang_core_gc.h b/src/mesa/shader/slang/library/slang_core_gc.h index 6cb13300b0..042566696b 100644 --- a/src/mesa/shader/slang/library/slang_core_gc.h +++ b/src/mesa/shader/slang/library/slang_core_gc.h @@ -188,8 +188,8 @@ 0,0,1,4,118,101,99,52,95,97,100,100,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,97,0,0,18,98, 0,0,0,0,1,0,9,2,27,1,1,0,9,97,0,0,1,1,0,9,98,0,0,0,1,4,118,101,99,52,95,115,117,98,116,114,97,99, 116,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,97,0,0,18,98,0,0,0,0,1,0,9,2,21,1,1,0,9,97,0, -0,1,1,0,9,98,0,0,0,1,4,102,108,111,97,116,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101, -116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,0,9,2,22,1,1,0,9,97,0,0,1,1,0,9,98,0,0,0,1,3,2,0,9,1, +0,1,1,0,9,98,0,0,0,1,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86, +97,108,0,59,120,0,0,18,97,0,0,18,98,0,0,0,0,1,0,9,2,22,1,1,0,9,97,0,0,1,1,0,9,98,0,0,0,1,3,2,0,9,1, 98,73,110,118,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,98,73,110,118,0,59,120,0,0,18,98,0,59, 120,0,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59, 120,0,0,18,97,0,0,18,98,73,110,118,0,0,0,0,1,0,10,2,26,1,1,0,10,118,0,0,1,1,0,10,117,0,0,0,1,4,118, diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index e91e0446ad..5b5de07b4f 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -350,9 +350,6 @@ static slang_asm_info AsmInfo[] = { { "vec4_ddx", IR_DDX, 1, 1 }, { "vec4_ddy", IR_DDY, 1, 1 }, /* float binary op */ - { "float_add", IR_ADD, 1, 2 }, - { "float_multiply", IR_MUL, 1, 2 }, - { "float_divide", IR_DIV, 1, 2 }, { "float_power", IR_POW, 1, 2 }, /* texture / sampler */ { "vec4_tex1d", IR_TEX, 1, 2 }, |