Module: wine Branch: master Commit: 51f06dcf0c7d65bae6f88fefc6f8741a99d5b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f06dcf0c7d65bae6f88fefc6... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:30:59 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_get_registers_used(). --- dlls/wined3d/shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 31ece02..0a0aae8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -448,11 +448,10 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } /* Note that this does not count the loop register as an address register. */ -static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, +static HRESULT shader_get_registers_used(IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature_element *input_signature, struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; unsigned int cur_loop_depth = 0, max_loop_depth = 0; void *fe_data = shader->baseShader.frontend_data; struct wined3d_shader_version shader_version; @@ -1607,7 +1606,7 @@ static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD * list_init(&shader->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)shader, fe, + hr = shader_get_registers_used(shader, fe, reg_maps, shader->baseShader.input_signature, shader->baseShader.output_signature, byte_code, float_const_count); if (FAILED(hr)) return hr;