October 2012 - Wine-commits

Christian Costa : quartz: Forward IMediaControl_RenderFile to IFilterGraph2_RenderFile.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 7ea44c0007c432b3ef1f6431e0d112a736e79bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea44c0007c432b3ef1f6431e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:01:00 2012 +0200 quartz: Forward IMediaControl_RenderFile to IFilterGraph2_RenderFile. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 239cf0b..58d8588 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2091,9 +2091,9 @@ static HRESULT WINAPI MediaControl_RenderFile(IMediaControl *iface, BSTR strFile { IFilterGraphImpl *This = impl_from_IMediaControl(iface); - FIXME("(%p/%p)->(%s (%p)): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename); + TRACE("(%p/%p)->(%s (%p))\n", This, iface, debugstr_w(strFilename), strFilename); - return S_OK; + return IFilterGraph2_RenderFile(&This->IFilterGraph2_iface, strFilename, NULL); } static HRESULT WINAPI MediaControl_AddSourceFilter(IMediaControl *iface, BSTR strFilename,

1 0

Christian Costa : quartz: Fill right RECT structure in SetDefaultTargetRec.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 03086e87ffbf8a59f7a0a71e45fba35e810ef3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03086e87ffbf8a59f7a0a71e4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:01:08 2012 +0200 quartz: Fill right RECT structure in SetDefaultTargetRec. --- dlls/quartz/videorenderer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a045ba8..5e78c55 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -599,10 +599,10 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = rect.right; - This->SourceRect.bottom = rect.bottom; + This->DestRect.left = 0; + This->DestRect.top = 0; + This->DestRect.right = rect.right; + This->DestRect.bottom = rect.bottom; return S_OK; }

1 0

André Hentschel : winetest: Report actual number of failures in the statusbar.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: f5375256d0e0510ceca16ff6985773edc32114a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5375256d0e0510ceca16ff69… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 18:36:21 2012 +0200 winetest: Report actual number of failures in the statusbar. --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2a74455..45c8602 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -729,6 +729,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch xprintf ("%s:%s done (%d)\n", test->name, subtest, status); if (status) failures++; } + if (failures) report (R_STATUS, "Running tests - %u failures", failures); } static BOOL CALLBACK

1 0

Christian Costa : ntoskrnl.exe: Add MDL flags definitions.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 068ff64e0a98f9c9bc44f4766cda6153b3af4450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068ff64e0a98f9c9bc44f4766… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:00:34 2012 +0200 ntoskrnl.exe: Add MDL flags definitions. --- include/ddk/wdm.h | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index bf9c15e..35773a0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -443,8 +443,6 @@ typedef struct _IRP { typedef struct _IRP *PIRP; #include <poppack.h> -/* MDL definitions */ - typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context); @@ -955,6 +953,33 @@ typedef struct _IO_STACK_LOCATION { } IO_STACK_LOCATION, *PIO_STACK_LOCATION; #include <poppack.h> +/* MDL definitions */ + +#define MDL_MAPPED_TO_SYSTEM_VA 0x0001 +#define MDL_PAGES_LOCKED 0x0002 +#define MDL_SOURCE_IS_NONPAGED_POOL 0x0004 +#define MDL_ALLOCATED_FIXED_SIZE 0x0008 +#define MDL_PARTIAL 0x0010 +#define MDL_PARTIAL_HAS_BEEN_MAPPED 0x0020 +#define MDL_IO_PAGE_READ 0x0040 +#define MDL_WRITE_OPERATION 0x0080 +#define MDL_PARENT_MAPPED_SYSTEM_VA 0x0100 +#define MDL_FREE_EXTRA_PTES 0x0200 +#define MDL_DESCRIBES_AWE 0x0400 +#define MDL_IO_SPACE 0x0800 +#define MDL_NETWORK_HEADER 0x1000 +#define MDL_MAPPING_CAN_FAIL 0x2000 +#define MDL_ALLOCATED_MUST_SUCCEED 0x4000 +#define MDL_INTERNAL 0x8000 + +#define MDL_MAPPING_FLAGS (MDL_MAPPED_TO_SYSTEM_VA | \ + MDL_PAGES_LOCKED | \ + MDL_SOURCE_IS_NONPAGED_POOL | \ + MDL_PARTIAL_HAS_BEEN_MAPPED | \ + MDL_PARENT_MAPPED_SYSTEM_VA | \ + MDL_SYSTEM_VA | \ + MDL_IO_SPACE ) + typedef struct _MDL { struct _MDL *Next; CSHORT Size;

1 0

Erich Hoover : setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 2ee8cd5a6c15af5890145d9c05c31cbeca592eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee8cd5a6c15af5890145d9c0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 4 12:49:14 2012 -0600 setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED. --- dlls/setupapi/setupcab.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index ea1bc99..d92ca6a 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -82,6 +82,7 @@ typedef struct { PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; + CHAR most_recent_target[MAX_PATH]; } SC_HSC_A, *PSC_HSC_A; #define SC_HSC_W_MAGIC 0x0CABFEED @@ -91,6 +92,7 @@ typedef struct { PSP_FILE_CALLBACK_W msghandler; PVOID context; WCHAR most_recent_cabinet_name[MAX_PATH]; + WCHAR most_recent_target[MAX_PATH]; } SC_HSC_W, *PSC_HSC_W; WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -337,6 +339,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpy( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -348,7 +351,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - fp.Target = pfdin->psz1; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ @@ -477,6 +480,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpyW( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -488,10 +492,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, buf, MAX_PATH); - if ((len > MAX_PATH) || (len <= 1)) - buf[0] = '\0'; - fp.Target = buf; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* a valid fixme -- but occurs too many times */

1 0

Henri Verbeet : d3d10: Handle blend state in d3d10_effect_object_apply().
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: eda5c393350571d92aa7ce0638e89832d259af6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5c393350571d92aa7ce063… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:38 2012 +0200 d3d10: Handle blend state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 20 +++++++++++++++++++- dlls/d3d10/tests/effect.c | 9 ++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index fc9cb41..9449da1 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -76,6 +76,7 @@ struct d3d10_effect_object { ID3D10RasterizerState *rs; ID3D10DepthStencilState *ds; + ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4b26562..1afa0b5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1355,6 +1355,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_BLEND_STATE: + { + ID3D10EffectBlendVariable *bv = variable->lpVtbl->AsBlend(variable); + if (FAILED(hr = bv->lpVtbl->GetBlendState(bv, variable_idx, &o->object.bs))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1385,7 +1393,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: case D3D10_EOT_SAMPLE_MASK: @@ -2181,6 +2188,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); return S_OK; + case D3D10_EOT_BLEND_STATE: + ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2194,6 +2205,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) return S_OK; case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: return S_OK; default: @@ -2293,6 +2306,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10DepthStencilState_Release(o->object.ds); break; + case D3D10_EOT_BLEND_STATE: + if (o->object.bs) + ID3D10BlendState_Release(o->object.bs); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ce5e18e..7f5ce0a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3922,12 +3922,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(pass_desc.BlendFactor[2] == 0.7f, "Got unexpected BlendFactor[2] %.8e.\n", pass_desc.BlendFactor[2]); ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = pass->lpVtbl->Apply(pass, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); - if (FAILED(hr)) - { - effect->lpVtbl->Release(effect); - return; - } + ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -3958,7 +3953,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask);

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_sampler_variable_GetSampler() .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 7cea4645c56257143fe93665a0aa26c469a354d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cea4645c56257143fe93665a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:39 2012 +0200 d3d10: Implement d3d10_effect_sampler_variable_GetSampler(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 9449da1..dbd72ba 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -117,6 +117,7 @@ struct d3d10_effect_state_object_variable ID3D10RasterizerState *rasterizer; ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; + ID3D10SamplerState *sampler; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1afa0b5..c465c43 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1608,6 +1608,9 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) break; case D3D10_SVT_SAMPLER: + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &v->u.state.desc.sampler, &v->u.state.object.sampler))) + return hr; break; default: @@ -6778,9 +6781,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetRawValue(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10EffectSamplerVariable *iface, UINT index, ID3D10SamplerState **sampler) { - FIXME("iface %p, index %u, sampler %p stub!\n", iface, index, sampler); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, sampler %p.\n", iface, index, sampler); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_SAMPLER) + { + WARN("Variable is not a sampler state.\n"); + return E_FAIL; + } + + if ((*sampler = v->u.state.object.sampler)) + ID3D10SamplerState_AddRef(*sampler); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(ID3D10EffectSamplerVariable *iface,

1 0

Henri Verbeet : wined3d: wined3d_surface_set_palette() never fails.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 9d127a4d36939079c264ada932863d840b719b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d127a4d36939079c264ada93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:40 2012 +0200 wined3d: wined3d_surface_set_palette() never fails. --- dlls/ddraw/surface.c | 7 ++----- dlls/wined3d/surface.c | 6 ++---- include/wine/wined3d.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8f68425..1f64a18 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4712,11 +4712,8 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir /* Update the wined3d frontbuffer if this is the frontbuffer. */ if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) && This->ddraw->wined3d_frontbuffer) - { - hr = wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, palette_impl ? palette_impl->wineD3DPalette : NULL); - if (FAILED(hr)) - ERR("Failed to set frontbuffer palette, hr %#x.\n", hr); - } + wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); /* If this is a front buffer, also update the back buffers * TODO: How do things work for palettized cube textures? diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71beb51..7dae771 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3150,14 +3150,14 @@ HRESULT CDECL wined3d_surface_restore(struct wined3d_surface *surface) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) +void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) { TRACE("surface %p, palette %p.\n", surface, palette); if (surface->palette == palette) { TRACE("Nop palette change.\n"); - return WINED3D_OK; + return; } if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) @@ -3172,8 +3172,6 @@ HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struc surface->surface_ops->surface_realize_palette(surface); } - - return WINED3D_OK; } HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42b21e6..c15b25b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2344,7 +2344,7 @@ HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); +void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_desc(struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Fix the SM3 int and bool vs constant limits.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: eedbdded236727ae3302085ffad527601b2cfeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedbdded236727ae3302085ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:41 2012 +0200 wined3d: Fix the SM3 int and bool vs constant limits. Reported by Eduard Munteanu. --- dlls/wined3d/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9223dce..aac19ae 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1796,8 +1796,8 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; - shader->limits.constant_bool = 32; - shader->limits.constant_int = 32; + shader->limits.constant_bool = 16; + shader->limits.constant_int = 16; shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 4;

1 0

Henri Verbeet : wined3d: Remove unused wined3d_shader_limits fields.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 07203fa4654b492fbff9e535600bffe48250bf25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07203fa4654b492fbff9e5356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:42 2012 +0200 wined3d: Remove unused wined3d_shader_limits fields. --- dlls/wined3d/shader.c | 46 ---------------------------------------- dlls/wined3d/wined3d_private.h | 5 ---- 2 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index aac19ae..a388606 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1761,21 +1761,16 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->reg_maps.shader_version.minor); struct wined3d_device *device = shader->device; - shader->limits.texcoord = 0; - shader->limits.attributes = 16; shader->limits.packed_input = 0; switch (shader_version) { case WINED3D_SHADER_VERSION(1, 0): case WINED3D_SHADER_VERSION(1, 1): - shader->limits.temporary = 12; shader->limits.constant_bool = 0; shader->limits.constant_int = 0; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 0; /* TODO: vs_1_1 has a minimum of 96 constants. What happens when * a vs_1_1 shader is used on a vs_3_0 capable card that has 256 * constants? */ @@ -1784,24 +1779,18 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(2, 0): case WINED3D_SHADER_VERSION(2, 1): - shader->limits.temporary = 12; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 16; shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; case WINED3D_SHADER_VERSION(3, 0): - shader->limits.temporary = 32; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 4; - shader->limits.label = 16; /* FIXME: 2048 */ /* DX10 cards on Windows advertise a d3d9 constant limit of 256 * even though they are capable of supporting much more (GL * drivers advertise 1024). d3d9.dll and d3d8.dll clamp the @@ -1811,26 +1800,19 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) break; case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_output = 16; shader->limits.packed_input = 0; - shader->limits.attributes = 16; - shader->limits.label = 16; break; default: - shader->limits.temporary = 12; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 16; shader->limits.constant_float = min(256, device->d3d_vshader_constantF); FIXME("Unrecognized vertex shader version \"%u.%u\".\n", shader->reg_maps.shader_version.major, @@ -1896,17 +1878,12 @@ static void geometryshader_set_limits(struct wined3d_shader *shader) switch (shader_version) { case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ - shader->limits.texcoord = 0; shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_output = 32; shader->limits.packed_input = 16; - shader->limits.attributes = 0; - shader->limits.label = 16; break; default: @@ -2094,8 +2071,6 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) DWORD shader_version = WINED3D_SHADER_VERSION(shader->reg_maps.shader_version.major, shader->reg_maps.shader_version.minor); - shader->limits.attributes = 0; - shader->limits.address = 0; shader->limits.packed_output = 0; switch (shader_version) @@ -2104,81 +2079,60 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(1, 1): case WINED3D_SHADER_VERSION(1, 2): case WINED3D_SHADER_VERSION(1, 3): - shader->limits.temporary = 2; shader->limits.constant_float = 8; shader->limits.constant_int = 0; shader->limits.constant_bool = 0; - shader->limits.texcoord = 4; shader->limits.sampler = 4; shader->limits.packed_input = 0; - shader->limits.label = 0; break; case WINED3D_SHADER_VERSION(1, 4): - shader->limits.temporary = 6; shader->limits.constant_float = 8; shader->limits.constant_int = 0; shader->limits.constant_bool = 0; - shader->limits.texcoord = 6; shader->limits.sampler = 6; shader->limits.packed_input = 0; - shader->limits.label = 0; break; /* FIXME: Temporaries must match D3DPSHADERCAPS2_0.NumTemps. */ case WINED3D_SHADER_VERSION(2, 0): - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; break; case WINED3D_SHADER_VERSION(2, 1): - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; - shader->limits.label = 16; break; case WINED3D_SHADER_VERSION(3, 0): - shader->limits.temporary = 32; shader->limits.constant_float = 224; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 0; shader->limits.sampler = 16; shader->limits.packed_input = 12; - shader->limits.label = 16; /* FIXME: 2048 */ break; case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ - shader->limits.texcoord = 0; shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_input = 32; - shader->limits.label = 16; break; default: - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; - shader->limits.label = 0; FIXME("Unrecognized pixel shader version %u.%u\n", shader->reg_maps.shader_version.major, shader->reg_maps.shader_version.minor); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5f0f4d..09dbb83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2553,17 +2553,12 @@ struct wined3d_shader_lconst struct wined3d_shader_limits { - unsigned int temporary; - unsigned int texcoord; unsigned int sampler; unsigned int constant_int; unsigned int constant_float; unsigned int constant_bool; - unsigned int address; unsigned int packed_output; unsigned int packed_input; - unsigned int attributes; - unsigned int label; }; #ifdef __GNUC__

1 0