wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Henri Verbeet : wined3d: Move min_rel_offset / max_rel_offset to the shader_reg_maps structure.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 03d7f527cf206d254fbe6cad0bef4bd96ccb7321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d7f527cf206d254fbe6cad0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:48 2010 +0100 wined3d: Move min_rel_offset / max_rel_offset to the shader_reg_maps structure. --- dlls/wined3d/shader.c | 27 +++++++++------------------ dlls/wined3d/wined3d_private.h | 4 +--- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9eaf89c..8220d65 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -399,17 +399,8 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *shader, struct case WINED3DSPR_CONST: if (reg->rel_addr) { - if (shader_type != WINED3D_SHADER_TYPE_PIXEL) - { - if (reg->idx < ((IWineD3DVertexShaderImpl *)shader)->min_rel_offset) - { - ((IWineD3DVertexShaderImpl *)shader)->min_rel_offset = reg->idx; - } - if (reg->idx > ((IWineD3DVertexShaderImpl *)shader)->max_rel_offset) - { - ((IWineD3DVertexShaderImpl *)shader)->max_rel_offset = reg->idx; - } - } + if (reg->idx < reg_maps->min_rel_offset) reg_maps->min_rel_offset = reg->idx; + if (reg->idx > reg_maps->max_rel_offset) reg_maps->max_rel_offset = reg->idx; reg_maps->usesrelconstF = TRUE; } else @@ -1904,21 +1895,21 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * if (device->vs_selected_mode == SHADER_ARB && (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) - && shader->min_rel_offset <= shader->max_rel_offset) + && reg_maps->min_rel_offset <= reg_maps->max_rel_offset) { - if (shader->max_rel_offset - shader->min_rel_offset > 127) + if (reg_maps->max_rel_offset - reg_maps->min_rel_offset > 127) { FIXME("The difference between the minimum and maximum relative offset is > 127.\n"); FIXME("Which this OpenGL implementation does not support. Try using GLSL.\n"); - FIXME("Min: %d, Max: %d.\n", shader->min_rel_offset, shader->max_rel_offset); + FIXME("Min: %u, Max: %u.\n", reg_maps->min_rel_offset, reg_maps->max_rel_offset); } - else if (shader->max_rel_offset - shader->min_rel_offset > 63) + else if (reg_maps->max_rel_offset - reg_maps->min_rel_offset > 63) { - shader->rel_offset = shader->min_rel_offset + 63; + shader->rel_offset = reg_maps->min_rel_offset + 63; } - else if (shader->max_rel_offset > 63) + else if (reg_maps->max_rel_offset > 63) { - shader->rel_offset = shader->min_rel_offset; + shader->rel_offset = reg_maps->min_rel_offset; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c10055f..aa77211 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -568,7 +568,7 @@ typedef struct shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; unsigned highest_render_target; - + UINT min_rel_offset, max_rel_offset; } shader_reg_maps; /* Keeps track of details for TEX_M#x# instructions which need to maintain @@ -2868,8 +2868,6 @@ typedef struct IWineD3DVertexShaderImpl { /* Vertex shader attributes. */ struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; - - UINT min_rel_offset, max_rel_offset; UINT rel_offset; } IWineD3DVertexShaderImpl;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to free_private ().
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: a4477fea4ae9d893cffb9d9ee43c09622cb121c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4477fea4ae9d893cffb9d9ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:47 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to free_private(). --- dlls/wined3d/arb_program_shader.c | 13 +++++++------ dlls/wined3d/ati_fragment_shader.c | 10 +++++----- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 196d901..6c28d7f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5501,15 +5501,16 @@ static void arbfp_free_ffpshader(struct wine_rb_entry *entry, void *context) } /* Context activation is done by the caller. */ -static void arbfp_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct shader_arb_priv *priv = This->fragment_priv; +static void arbfp_free(IWineD3DDeviceImpl *device) +{ + struct shader_arb_priv *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, &This->adapter->gl_info); + wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, &device->adapter->gl_info); priv->use_arbfp_fixed_func = FALSE; - if(This->shader_backend != &arb_program_shader_backend) { - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + if (device->shader_backend != &arb_program_shader_backend) + { + HeapFree(GetProcessHeap(), 0, device->fragment_priv); } } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 85903ee..0d17250 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1149,14 +1149,14 @@ static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) } /* Context activation is done by the caller. */ -static void atifs_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct atifs_private_data *priv = This->fragment_priv; +static void atifs_free(IWineD3DDeviceImpl *device) +{ + struct atifs_private_data *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, This); + wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, device); HeapFree(GetProcessHeap(), 0, priv); - This->fragment_priv = NULL; + device->fragment_priv = NULL; } static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a7f6dd..c9920e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2053,7 +2053,7 @@ err_out: This->blitter->free_private(iface); } if (This->fragment_priv) { - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); } if (This->shader_priv) { This->shader_backend->shader_free_private(This); @@ -2186,7 +2186,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ This->blitter->free_private(iface); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); /* Release the buffers (with sanity checks)*/ @@ -6200,7 +6200,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl LEAVE_GL(); This->blitter->free_private(iface); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); destroy_dummy_textures(This, gl_info); @@ -6263,7 +6263,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap if (FAILED(hr)) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); goto err; } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 8e52057..599039e 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -695,7 +695,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct static HRESULT nvrc_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ -static void nvrc_fragment_free(IWineD3DDevice *iface) {} +static void nvrc_fragment_free(IWineD3DDeviceImpl *device) {} /* Two fixed function pipeline implementations using GL_NV_register_combiners and * GL_NV_texture_shader. The nvts_fragment_pipeline assumes that both extensions diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d4c2d11..77f3b98 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5697,7 +5697,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct } static HRESULT ffp_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } -static void ffp_fragment_free(IWineD3DDevice *iface) {} +static void ffp_fragment_free(IWineD3DDeviceImpl *device) {} static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a0500f..c10055f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1146,7 +1146,7 @@ struct fragment_pipeline void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); - void (*free_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDeviceImpl *device); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states; BOOL ffp_proj_control;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private().
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 6b9118e4628059f166d1dcfcf71648e5aa1fc6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9118e4628059f166d1dcfcf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:46 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private(). --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++--------- dlls/wined3d/ati_fragment_shader.c | 13 +++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index efc0ab0..196d901 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5460,24 +5460,27 @@ static void arbfp_enable(BOOL enable) LEAVE_GL(); } -static HRESULT arbfp_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +static HRESULT arbfp_alloc(IWineD3DDeviceImpl *device) +{ struct shader_arb_priv *priv; /* Share private data between the shader backend and the pipeline replacement, if both * are the arb implementation. This is needed to figure out whether ARBfp should be disabled * if no pixel shader is bound or not */ - if(This->shader_backend == &arb_program_shader_backend) { - This->fragment_priv = This->shader_priv; - } else { - This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); - if(!This->fragment_priv) return E_OUTOFMEMORY; + if (device->shader_backend == &arb_program_shader_backend) + { + device->fragment_priv = device->shader_priv; } - priv = This->fragment_priv; + else + { + device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); + if (!device->fragment_priv) return E_OUTOFMEMORY; + } + priv = device->fragment_priv; if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + HeapFree(GetProcessHeap(), 0, device->fragment_priv); return E_OUTOFMEMORY; } priv->use_arbfp_fixed_func = TRUE; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 8ea0cd5..85903ee 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1114,20 +1114,21 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxSimultaneousTextures = 6; } -static HRESULT atifs_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +static HRESULT atifs_alloc(IWineD3DDeviceImpl *device) +{ struct atifs_private_data *priv; - This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); - if(!This->fragment_priv) { + device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); + if (!device->fragment_priv) + { ERR("Out of memory\n"); return E_OUTOFMEMORY; } - priv = This->fragment_priv; + priv = device->fragment_priv; if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + HeapFree(GetProcessHeap(), 0, device->fragment_priv); return E_OUTOFMEMORY; } return WINED3D_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 102b65c..4a7f6dd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1968,7 +1968,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, TRACE("Shader private data couldn't be allocated\n"); goto err_out; } - hr = This->frag_pipe->alloc_private(iface); + hr = This->frag_pipe->alloc_private(This); if(FAILED(hr)) { TRACE("Fragment pipeline private data couldn't be allocated\n"); goto err_out; @@ -6251,7 +6251,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap goto err; } - hr = This->frag_pipe->alloc_private(iface); + hr = This->frag_pipe->alloc_private(This); if (FAILED(hr)) { ERR("Failed to allocate fragment pipe private data, hr %#x.\n", hr); diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index dcf7816..8e52057 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -693,7 +693,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct pCaps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT nvrc_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT nvrc_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void nvrc_fragment_free(IWineD3DDevice *iface) {} diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8c5db84..d4c2d11 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5696,7 +5696,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct pCaps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT ffp_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT ffp_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } static void ffp_fragment_free(IWineD3DDevice *iface) {} static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e04c71e..1a0500f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1145,7 +1145,7 @@ struct fragment_pipeline { void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); - HRESULT (*alloc_private)(IWineD3DDevice *iface); + HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDevice *iface); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states;

1 0

Henri Verbeet : wined3d: Remove a redundant parameter to enable_extension() .
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 00550613e7fecfa9058a3ca816bdb1867f2da1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00550613e7fecfa9058a3ca81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:45 2010 +0100 wined3d: Remove a redundant parameter to enable_extension(). --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 11 +++++------ dlls/wined3d/nvidia_texture_shader.c | 5 +++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bdc4023..efc0ab0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5447,7 +5447,8 @@ struct arbfp_ffp_desc }; /* Context activation is done by the caller. */ -static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) { +static void arbfp_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_FRAGMENT_PROGRAM_ARB); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 35838e1..8ea0cd5 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1054,7 +1054,8 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { }; /* Context activation is done by the caller. */ -static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { +static void atifs_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_FRAGMENT_SHADER_ATI); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f8f5b17..d8988f8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1572,7 +1572,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, LEAVE_GL(); - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); TRACE("Created context %p.\n", ret); @@ -1840,8 +1840,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); + This->frag_pipe->enable_extension(FALSE); } /***************************************************************************** @@ -2130,7 +2129,7 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm if (context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); } /* Blending and clearing should be orthogonal, but tests on the nvidia @@ -2189,7 +2188,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); } ENTER_GL(); @@ -2287,7 +2286,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf if (context != current_context) { if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); - else device->frag_pipe->enable_extension((IWineD3DDevice *)device, !context->last_was_blit); + else device->frag_pipe->enable_extension(!context->last_was_blit); if (context->vshader_const_dirty) { diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 00a51f8..dcf7816 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -621,10 +621,11 @@ static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, stru } /* Context activation is done by the caller. */ -static void nvrc_enable(IWineD3DDevice *iface, BOOL enable) { } +static void nvrc_enable(BOOL enable) {} /* Context activation is done by the caller. */ -static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { +static void nvts_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_TEXTURE_SHADER_NV); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e36bf9a..8c5db84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -8,7 +8,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Henri Verbeet * Copyright 2006-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5654,7 +5654,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { }; /* Context activation is done by the caller. */ -static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } +static void ffp_enable(BOOL enable) {} static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b719aa4..e04c71e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1143,7 +1143,7 @@ struct fragment_caps struct fragment_pipeline { - void (*enable_extension)(IWineD3DDevice *iface, BOOL enable); + void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(IWineD3DDevice *iface); void (*free_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Remove a unused parameter to shader_dirtifyable_constants().
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: f92a0667d796f787d45fbde4fc322f5be2e3eaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92a0667d796f787d45fbde4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:44 2010 +0100 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 ac2b0c9..bdc4023 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 beb57d2..f8f5b17 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 58bb1b0..8b55eb8 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 1804f58..9eaf89c 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 8da99db..b719aa4 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);

1 0

Alexandre Julliard : msxml3: Avoid some uninitialized variable warnings on old gcc.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 9d9ce2982308977374a4a37101d95bfcc7cef1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9ce2982308977374a4a3710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 19:45:34 2010 +0100 msxml3: Avoid some uninitialized variable warnings on old gcc. --- dlls/msxml3/msxml_private.h | 42 ++++++++++++------------------------------ 1 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index ddb3f1c..6dc6cde 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -384,46 +384,28 @@ extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, void **pObj ); extern HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, void **pObj ); extern HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **pObj); -static inline const CLSID* DOMDocument_version(const MSXML_VERSION v) +static inline const CLSID* DOMDocument_version(MSXML_VERSION v) { - CLSID const* clsid; switch (v) { - case MSXML_DEFAULT: - clsid = &CLSID_DOMDocument; - break; - case MSXML3: - clsid = &CLSID_DOMDocument30; - break; - case MSXML4: - clsid = &CLSID_DOMDocument40; - break; - case MSXML6: - clsid = &CLSID_DOMDocument60; - break; + default: + case MSXML_DEFAULT: return &CLSID_DOMDocument; + case MSXML3: return &CLSID_DOMDocument30; + case MSXML4: return &CLSID_DOMDocument40; + case MSXML6: return &CLSID_DOMDocument60; } - return clsid; } -static inline const CLSID* SchemaCache_version(const MSXML_VERSION v) +static inline const CLSID* SchemaCache_version(MSXML_VERSION v) { - CLSID const* clsid; switch (v) { - case MSXML_DEFAULT: - clsid = &CLSID_XMLSchemaCache; - break; - case MSXML3: - clsid = &CLSID_XMLSchemaCache30; - break; - case MSXML4: - clsid = &CLSID_XMLSchemaCache40; - break; - case MSXML6: - clsid = &CLSID_XMLSchemaCache60; - break; + default: + case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; + case MSXML3: return &CLSID_XMLSchemaCache30; + case MSXML4: return &CLSID_XMLSchemaCache40; + case MSXML6: return &CLSID_XMLSchemaCache60; } - return clsid; } typedef struct bsc_t bsc_t;

1 0

Maarten Lankhorst : quartz: Fill up sound buffer while in paused state.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: e591700177ce80b0a0598a9a756111c5342ae554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e591700177ce80b0a0598a9a7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:59 2010 +0100 quartz: Fill up sound buffer while in paused state. --- dlls/quartz/dsoundrender.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index c0591ba..a26bd12 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -146,7 +146,9 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write DSoundRender_UpdatePositions(This, &writepos, &min_writepos); playpos = This->last_playpos; - if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { + if (This->filter.state == State_Paused) { + write_at = cur = -1; + } else if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { max_lag = min_lag; cur = This->play_time + time_from_pos(This, playpos); cur -= This->filter.rtStreamStart; @@ -226,12 +228,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM DWORD writepos, skip = 0, free, size1, size2, ret; BYTE *buf1, *buf2; - if (This->filter.state == State_Running) - hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); - else - hr = S_FALSE; + hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); if (hr != S_OK) { + SetEvent(This->state_change); This->in_loop = 1; LeaveCriticalSection(&This->filter.csFilter); ret = WaitForSingleObject(This->blocked, 10); @@ -251,7 +251,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (skip) FIXME("Sample dropped %u of %u bytes\n", skip, size); if (skip >= size) - return S_OK; + break; data += skip; size -= skip; @@ -362,7 +362,6 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); - SetEvent(This->state_change); hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); LeaveCriticalSection(&This->filter.csFilter); return hr;

1 0

Maarten Lankhorst : quartz: Increase min_lag.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 6e69cd4df4e8bc3794271ad5004a59c2c1158f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e69cd4df4e8bc3794271ad50… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:58 2010 +0100 quartz: Increase min_lag. The max_lag variable determines how much fuzz is allowed between the sound cursor and the scheduled times, some filters are inaccurate wrt time and would skip and overwrite data otherwise. --- dlls/quartz/dsoundrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fcc25e7..c0591ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -141,7 +141,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->pInputPin->pin.mtCurrent.pbFormat; DWORD writepos, min_writepos, playpos; REFERENCE_TIME max_lag = 50 * 10000; - REFERENCE_TIME min_lag = 1 * 10000; + REFERENCE_TIME min_lag = 25 * 10000; REFERENCE_TIME cur, writepos_t, delta_t; DSoundRender_UpdatePositions(This, &writepos, &min_writepos); @@ -157,7 +157,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write cur = -1; if (writepos == min_writepos) - max_lag = min_lag; + max_lag = 0; *skip = 0; if (cur < 0 || write_at < 0) {

1 0

Maarten Lankhorst : quartz: Implement AsyncReader_FindPin.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 945793722d083185d15101f6b87d466575e3ac8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=945793722d083185d15101f6b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:57 2010 +0100 quartz: Implement AsyncReader_FindPin. --- dlls/quartz/filesource.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6a59857..d458144 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -489,9 +489,21 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - FIXME("(%s, %p)\n", debugstr_w(Id), ppPin); + AsyncReader *This = (AsyncReader *)iface; + TRACE("(%s, %p)\n", debugstr_w(Id), ppPin); + + if (!Id || !ppPin) + return E_POINTER; - return E_NOTIMPL; + if (strcmpW(Id, wszOutputPinName)) + { + *ppPin = NULL; + return VFW_E_NOT_FOUND; + } + + *ppPin = (IPin*)This->pOutputPin; + IUnknown_AddRef(*ppPin); + return S_OK; } static const IBaseFilterVtbl AsyncReader_Vtbl =

1 0

André Hentschel : user32/tests: Skip DDE tests on win9x.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 7e5da86076cb8b184e100949e427ddef30c5cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5da86076cb8b184e100949e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 18:51:57 2010 +0100 user32/tests: Skip DDE tests on win9x. --- dlls/user32/tests/dde.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 529c527..b382240 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2043,12 +2043,6 @@ static void test_DdeCreateStringHandle(void) dde_inst = 0xdeadbeef; SetLastError(0xdeadbeef); ret = DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("DdeInitializeW is unimplemented\n"); - return; - } - ok(ret == DMLERR_INVALIDPARAMETER, "DdeInitializeW should fail, but got %04x instead\n", ret); ok(DdeGetLastError(dde_inst) == DMLERR_INVALIDPARAMETER, "expected DMLERR_INVALIDPARAMETER\n"); @@ -2696,6 +2690,7 @@ START_TEST(dde) char buffer[MAX_PATH]; STARTUPINFO startup; PROCESS_INFORMATION proc; + DWORD dde_inst = 0xdeadbeef; argc = winetest_get_mainargs(&argv); if (argc == 3) @@ -2714,6 +2709,14 @@ START_TEST(dde) test_initialisation(); + SetLastError(0xdeadbeef); + DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Skipping tests on win9x because of brokenness\n"); + return; + } + ZeroMemory(&startup, sizeof(STARTUPINFO)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010