Henri Verbeet : wined3d: Use shader_glsl_log() in some more places.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e2bc8dfe3b6145b1ad930c7d27f3d405409e1e01
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e2bc8dfe3b6145b1ad930c7d27...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Sep 22 14:53:03 2008 +0200

wined3d: Use shader_glsl_log() in some more places.

---

 dlls/wined3d/glsl_shader.c  |    2 --
 dlls/wined3d/pixelshader.c  |    2 +-
 dlls/wined3d/vertexshader.c |    4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 3ce8188..287109f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1592,8 +1592,6 @@ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) {
         case WINED3DSIO_ABS: instruction = "abs"; break;
         case WINED3DSIO_FRC: instruction = "fract"; break;
         case WINED3DSIO_NRM: instruction = "normalize"; break;
-        case WINED3DSIO_LOGP:
-        case WINED3DSIO_LOG: instruction = "log2"; break;
         case WINED3DSIO_EXP: instruction = "exp2"; break;
         case WINED3DSIO_SGN: instruction = "sign"; break;
         case WINED3DSIO_DSX: instruction = "dFdx"; break;
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 4b619d8..01e6d11 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -117,7 +117,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = {
     {WINED3DSIO_EXP,  "exp",  "EX2", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0},
     {WINED3DSIO_LOG,  "log",  "LG2", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0},
     {WINED3DSIO_EXPP, "expp", "EXP", 1, 2, shader_hw_map2gl, shader_glsl_expp, 0, 0},
-    {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0},
+    {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, shader_hw_map2gl, shader_glsl_log, 0, 0},
     {WINED3DSIO_DST,  "dst",  "DST", 1, 3, shader_hw_map2gl, shader_glsl_dst, 0, 0},
     {WINED3DSIO_LRP,  "lrp",  "LRP", 1, 4, shader_hw_map2gl, shader_glsl_lrp, 0, 0},
     {WINED3DSIO_FRC,  "frc",  "FRC", 1, 2, shader_hw_map2gl, shader_glsl_map2gl, 0, 0},
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 68faa19..ae8130b 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -60,9 +60,9 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
     {WINED3DSIO_SGE,    "sge",  "SGE", 1, 3, shader_hw_map2gl,    shader_glsl_compare, 0, 0},
     {WINED3DSIO_ABS,    "abs",  "ABS", 1, 2, shader_hw_map2gl,    shader_glsl_map2gl, 0, 0},
     {WINED3DSIO_EXP,    "exp",  "EX2", 1, 2, shader_hw_map2gl,    shader_glsl_map2gl, 0, 0},
-    {WINED3DSIO_LOG,    "log",  "LG2", 1, 2, shader_hw_map2gl,    shader_glsl_map2gl, 0, 0},
+    {WINED3DSIO_LOG,    "log",  "LG2", 1, 2, shader_hw_map2gl,    shader_glsl_log, 0, 0},
     {WINED3DSIO_EXPP,   "expp", "EXP", 1, 2, shader_hw_map2gl,    shader_glsl_expp, 0, 0},
-    {WINED3DSIO_LOGP,   "logp", "LOG", 1, 2, shader_hw_map2gl,    shader_glsl_map2gl, 0, 0},
+    {WINED3DSIO_LOGP,   "logp", "LOG", 1, 2, shader_hw_map2gl,    shader_glsl_log, 0, 0},
     {WINED3DSIO_LIT,    "lit",  "LIT", 1, 2, shader_hw_map2gl,    shader_glsl_lit, 0, 0},
     {WINED3DSIO_DST,    "dst",  "DST", 1, 3, shader_hw_map2gl,    shader_glsl_dst, 0, 0},
     {WINED3DSIO_LRP,    "lrp",  "LRP", 1, 4, NULL,                shader_glsl_lrp, 0, 0},