diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f7232b55..aed0eac7 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -8090,10 +8090,8 @@ fi # | * dlls/wined3d/utils.c # | 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 7124f943..2f17afe1 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -9022,7 +9022,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 -@@ -4636,7 +4636,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w +@@ -4628,7 +4628,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = flip ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -9034,7 +9034,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 ? clip_control ? 1.0f : 2.0f : 0.0f; float z_offset = zenable ? clip_control ? 0.0f : -1.0f : 0.0f; -@@ -5435,7 +5439,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d +@@ -5427,7 +5431,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } diff --git a/patches/wined3d-WINED3DFMT_R32G32_UINT/0001-wined3d-Add-WINED3DFMT_R32G32_-U-S-INT-as-render-tar.patch b/patches/wined3d-WINED3DFMT_R32G32_UINT/0001-wined3d-Add-WINED3DFMT_R32G32_-U-S-INT-as-render-tar.patch deleted file mode 100644 index 85ab7c1e..00000000 --- a/patches/wined3d-WINED3DFMT_R32G32_UINT/0001-wined3d-Add-WINED3DFMT_R32G32_-U-S-INT-as-render-tar.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bd072f35c5514270d32362f11576dcc4cf797cf4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 26 Aug 2016 04:53:17 +0200 -Subject: wined3d: Add WINED3DFMT_R32G32_{U,S}INT as render target format. - ---- - dlls/wined3d/utils.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index ee3af83..5f7c3c6 100644 ---- a/dlls/wined3d/utils.c -+++ b/dlls/wined3d/utils.c -@@ -1292,6 +1292,14 @@ static const struct wined3d_format_texture_info format_texture_info[] = - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_RG, NULL}, -+ {WINED3DFMT_R32G32_UINT, GL_RG32UI, GL_RG32UI, 0, -+ GL_RG, GL_UNSIGNED_INT, 0, -+ WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, -+ ARB_TEXTURE_RG, NULL}, -+ {WINED3DFMT_R32G32_SINT, GL_RG32I, GL_RG32I, 0, -+ GL_RG, GL_INT, 0, -+ WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, -+ ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, - GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING --- -2.9.0 - diff --git a/patches/wined3d-WINED3DFMT_R32G32_UINT/definition b/patches/wined3d-WINED3DFMT_R32G32_UINT/definition deleted file mode 100644 index 7d0cad35..00000000 --- a/patches/wined3d-WINED3DFMT_R32G32_UINT/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Add WINED3DFMT_R32G32_{U,S}INT as render target format