From e18629bedd55e980fac09f595460efa6f8367138 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 8 Dec 2008 10:30:01 +0100 Subject: [PATCH] wined3d: Explicitly pass the shader version to shader_skip_unrecognized(). --- dlls/wined3d/baseshader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a5abf6daf1a..56d3c12c1fa 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -136,9 +136,8 @@ static inline int shader_skip_opcode( * Note: This function assumes source or destination token format. * It will not work with specially-formatted tokens like DEF or DCL, * but hopefully those would be recognized */ -static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pToken) +static int shader_skip_unrecognized(const DWORD *pToken, DWORD shader_version) { - DWORD shader_version = ((IWineD3DBaseShaderImpl *)iface)->baseShader.hex_version; int tokens_read = 0; int i = 0; @@ -878,7 +877,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, /* Unknown opcode and its parameters */ if (NULL == curOpcode) { FIXME("Unrecognized opcode: token=0x%08x\n", hw_arg.opcode_token); - pToken += shader_skip_unrecognized(iface, pToken); + pToken += shader_skip_unrecognized(pToken, shader_version); /* Nothing to do */ } else if (WINED3DSIO_DCL == curOpcode->opcode || @@ -1008,7 +1007,7 @@ void shader_trace_init( if (NULL == curOpcode) { int tokens_read; FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); - tokens_read = shader_skip_unrecognized(iface, pToken); + tokens_read = shader_skip_unrecognized(pToken, This->baseShader.hex_version); pToken += tokens_read; len += tokens_read;