Wine-Commits

wine-commits@list.winehq.org

March 2016

2 participants
722 discussions

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_cube_GetLevelDesc().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 9136f9f9c432987b82d5e2682fc77fe21a8e299b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9136f9f9c432987b82d5e2682… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:27 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_cube_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index a1bf0ab..78f40c7 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -589,8 +589,8 @@ static DWORD WINAPI d3d8_texture_cube_GetLevelCount(IDirect3DCubeTexture8 *iface static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); @@ -601,15 +601,10 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac return D3DERR_INVALIDCALL; } - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Michael Stefaniuc : d3dx9/tests: Avoid a TRUE: FALSE conditional expression.
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 020b86b0be6f819ddafa9f8baa779610bcf7fc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=020b86b0be6f819ddafa9f8ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 29 15:53:25 2016 +0100 d3dx9/tests: Avoid a TRUE:FALSE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 482f064..1b895da 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1953,7 +1953,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetBool(effect, parameter, bvalue); if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) { - bvalue = bvalue ? TRUE : FALSE; + bvalue = TRUE; set_number(expected_value, res_desc->Type, &bvalue, D3DXPT_BOOL); ok(hr == D3D_OK, "%u - %s: SetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); }

1 0

Jump to page: