Module: wine Branch: refs/heads/master Commit: 0d6eaf363de7608de67c48011663f3e5d864b1b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d6eaf363de7608de67c4801...
Author: Ivan Gyurdiev ivg2@cornell.edu Date: Sun Apr 16 05:43:47 2006 -0400
wined3d: Skip unhandled opcodes in vshaders.
---
dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 735b633..08d194a 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1378,7 +1378,7 @@ inline static VOID IWineD3DPixelShaderIm } else { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); } - pToken += curOpcode->num_params; /* maybe + 1 */ + pToken += curOpcode->num_params; continue; }
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ff33416..902a69c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1672,7 +1672,11 @@ inline static VOID IWineD3DVertexShaderI } else { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); } + + pToken += curOpcode->num_params; + continue; } + if (curOpcode->num_params > 0) { vshader_program_add_param(This, *pToken, FALSE, tmpLine);