reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Pass a wined3d_state structure to find_arb_ps_compile_args().

Browse Source
This commit is contained in:
Henri Verbeet 2010-09-29 12:20:47 +02:00 committed by Alexandre Julliard
parent e5ef8057ea
commit 5029331f55
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/arb_program_shader.c
View File

@ -4390,13 +4390,12 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl
return &shader_data->gl_shaders[shader_data->num_gl_shaders++];
}
static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock,
struct arb_ps_compile_args *args)
static void find_arb_ps_compile_args(const struct wined3d_state *state,
IWineD3DPixelShaderImpl *shader, struct arb_ps_compile_args *args)
{
int i;
WORD int_skip;
const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)shader->baseShader.device)->adapter->gl_info;
const struct wined3d_state *state = &stateblock->state;
find_ps_compile_args(state, shader, &args->super);
@ -4538,7 +4537,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS,
struct arb_ps_compiled_shader *compiled;
TRACE("Using pixel shader %p.\n", ps);
find_arb_ps_compile_args(ps, This->stateBlock, &compile_args);
find_arb_ps_compile_args(state, ps, &compile_args);
compiled = find_arb_pshader(ps, &compile_args);
priv->current_fprogram_id = compiled->prgId;
priv->compiled_fprog = compiled;