Henri Verbeet : wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8 ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1453baf64b95789792a9bf3a0c341d3629de9083
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1453baf64b95789792a9bf3a0c...

Author: Henri Verbeet 
Date:   Wed Sep 11 08:47:49 2013 +0200

wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8().

---

dlls/wined3d/surface.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 87ae02d..f1a3683 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1292,14 +1292,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined
 /* This function checks if the primary render target uses the 8bit paletted format. */
 static BOOL primary_render_target_is_p8(const struct wined3d_device *device)
 {
-    if (device->fb.render_targets && device->fb.render_targets[0])
-    {
-        const struct wined3d_surface *render_target = device->fb.render_targets[0];
-        if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)
-                && (render_target->resource.format->id == WINED3DFMT_P8_UINT))
-            return TRUE;
-    }
-    return FALSE;
+    return device->swapchains[0]->desc.backbuffer_format == WINED3DFMT_P8_UINT;
 }

static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface,