[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-patches
Subject: [PATCH 5/8] d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_cube_GetLevelDesc().
From: Henri Verbeet <hverbeet () codeweavers ! com>
Date: 2016-02-29 17:19:27
Message-ID: 1456766370-17848-5-git-send-email-hverbeet () codeweavers ! com
[Download RAW message or body]
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
---
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;
--
2.1.4
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic