Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8c93a90f78582c4e88caccf1c8c5ff64bae99698
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c93a90f78582c4e88caccf1c8...

Author: Henri Verbeet 
Date:   Mon Feb 29 11:38:22 2016 +0100

ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/ddraw/device.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index c460658..9c88d43 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -2500,17 +2500,13 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface,

if ((tex = wined3d_device_get_texture(device->wined3d_device, 0)))
                 {
-                    struct wined3d_resource *sub_resource;
+                    struct wined3d_resource_desc desc;

-                    if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0)))
-                    {
-                        struct wined3d_resource_desc desc;
-
-                        wined3d_resource_get_desc(sub_resource, &desc);
-                        ddfmt.dwSize = sizeof(ddfmt);
-                        ddrawformat_from_wined3dformat(&ddfmt, desc.format);
-                        if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE;
-                    }
+                    wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc);
+                    ddfmt.dwSize = sizeof(ddfmt);
+                    ddrawformat_from_wined3dformat(&ddfmt, desc.format);
+                    if (ddfmt.u5.dwRGBAlphaBitMask)
+                        tex_alpha = TRUE;
                 }

if (!(colorop == WINED3D_TOP_MODULATE