Stefan Dösinger : wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Thu Aug 18 18:44:28 2011 +0200

wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.

---

 dlls/wined3d/directx.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index afc77df..7a659ee 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3242,6 +3242,18 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter,
     /* Only allow depth/stencil formats */
     if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE;
 
+    /* Blacklist formats not supported on Windows */
+    switch (ds_format->id)
+    {
+        case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */
+        case WINED3DFMT_S4X4_UINT_D24_UNORM:
+            TRACE_(d3d_caps)("[FAILED] - not supported on windows\n");
+            return FALSE;
+
+        default:
+            break;
+    }
+
     if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
     {
         /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */
@@ -3425,9 +3437,7 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const
          */
         case WINED3DFMT_D16_LOCKABLE:
         case WINED3DFMT_D16_UNORM:
-        case WINED3DFMT_S1_UINT_D15_UNORM:
         case WINED3DFMT_X8D24_UNORM:
-        case WINED3DFMT_S4X4_UINT_D24_UNORM:
         case WINED3DFMT_D24_UNORM_S8_UINT:
         case WINED3DFMT_S8_UINT_D24_FLOAT:
         case WINED3DFMT_D32_UNORM:
@@ -3440,6 +3450,12 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const
                 return TRUE;
             return FALSE;
 
+        /* Not supported on Windows */
+        case WINED3DFMT_S1_UINT_D15_UNORM:
+        case WINED3DFMT_S4X4_UINT_D24_UNORM:
+            TRACE_(d3d_caps)("[FAILED] - not supported on windows\n");
+            return FALSE;
+
         /*****
          *  Not supported everywhere(depends on GL_ATI_envmap_bumpmap or
          *  GL_NV_texture_shader). Emulated by shaders