From bf90df4eedba0a79a3b9a3c190887f9daa6ba5fa Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 4 Sep 2016 21:23:54 +0200 Subject: [PATCH] Added hack for WINED3DFMT_R24_UNORM_X8_TYPELESS format. --- patches/patchinstall.sh | 2 ++ .../wined3d-CSMT_Main/9999-IfDefined.patch | 4 +-- ...-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 patches/wined3d-WINED3DFMT_R32G32_UINT/0002-wined3d-Add-hack-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e48ed114..ec12736c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7476,8 +7476,10 @@ fi # | if test "$enable_wined3d_WINED3DFMT_R32G32_UINT" -eq 1; then patch_apply wined3d-WINED3DFMT_R32G32_UINT/0001-wined3d-Add-WINED3DFMT_R32G32_-U-S-INT-as-render-tar.patch + patch_apply wined3d-WINED3DFMT_R32G32_UINT/0002-wined3d-Add-hack-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch ( echo '+ { "Michael Müller", "wined3d: Add WINED3DFMT_R32G32_{U,S}INT as render target format.", 1 },'; + echo '+ { "Michael Müller", "wined3d: Add hack for WINED3DFMT_R24_UNORM_X8_TYPELESS.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index c9609dfb..f2b038eb 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -8027,7 +8027,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4539,7 +4539,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w +@@ -4543,7 +4543,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = context->render_offscreen ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -8039,7 +8039,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; float z_offset = zenable ? -1.0f : 0.0f; -@@ -5336,7 +5340,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d +@@ -5340,7 +5344,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } diff --git a/patches/wined3d-WINED3DFMT_R32G32_UINT/0002-wined3d-Add-hack-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch b/patches/wined3d-WINED3DFMT_R32G32_UINT/0002-wined3d-Add-hack-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch new file mode 100644 index 00000000..1304efd7 --- /dev/null +++ b/patches/wined3d-WINED3DFMT_R32G32_UINT/0002-wined3d-Add-hack-for-WINED3DFMT_R24_UNORM_X8_TYPELES.patch @@ -0,0 +1,27 @@ +From 41dabd934d1afb8160622f13d95b83ef63beacd0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Sun, 4 Sep 2016 20:58:52 +0200 +Subject: wined3d: Add hack for WINED3DFMT_R24_UNORM_X8_TYPELESS. + +--- + dlls/wined3d/utils.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c +index cf909de..d31b002 100644 +--- a/dlls/wined3d/utils.c ++++ b/dlls/wined3d/utils.c +@@ -1517,6 +1517,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = + GL_RGBA_INTEGER, GL_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_INTEGER, NULL}, ++ {WINED3DFMT_R24_UNORM_X8_TYPELESS, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, ++ GL_DEPTH_COMPONENT, GL_UNSIGNED_INT_24_8, 0, ++ WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH, ++ ARB_DEPTH_TEXTURE, NULL}, + /* Vendor-specific formats */ + {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, +-- +2.9.0 +