From f92a0667d796f787d45fbde4fc322f5be2e3eaa9 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 1 Dec 2010 20:50:44 +0100 Subject: [PATCH] wined3d: Remove a unused parameter to shader_dirtifyable_constants(). --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ac2b0c955eb..bdc40231a93 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4797,7 +4797,8 @@ static void shader_arb_free(IWineD3DDeviceImpl *device) HeapFree(GetProcessHeap(), 0, device->shader_priv); } -static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { +static BOOL shader_arb_dirty_const(void) +{ return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index beb57d290b1..f8f5b17a7e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1410,7 +1410,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, ret->hdc = hdc; ret->pixel_format = pixel_format; - if (device->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *)device)) + if (device->shader_backend->shader_dirtifyable_constants()) { /* Create the dirty constants array and initialize them to dirty */ ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 58bb1b08010..8b55eb86aed 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4901,7 +4901,8 @@ static void shader_glsl_free(IWineD3DDeviceImpl *device) device->shader_priv = NULL; } -static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) { +static BOOL shader_glsl_dirty_const(void) +{ /* TODO: GL_EXT_bindable_uniform can be used to share constants across shaders */ return FALSE; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1804f583999..9eaf89c8d0d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1521,7 +1521,7 @@ static void shader_none_load_np2fixup_constants(void *shader_priv, static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} static void shader_none_free(IWineD3DDeviceImpl *device) {} -static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} +static BOOL shader_none_dirty_const(void) {return FALSE;} static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da99dbd3d6..b719aa49ebb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -761,7 +761,7 @@ typedef struct { void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); void (*shader_free_private)(IWineD3DDeviceImpl *device); - BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); + BOOL (*shader_dirtifyable_constants)(void); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); void (*shader_add_instruction_modifiers)(const struct wined3d_shader_instruction *ins);