diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3e72f17f..73f0ec53 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -423,7 +423,6 @@ patch_enable_all () enable_wined3d_Limit_Vram="$1" enable_wined3d_QUERY_Stubs="$1" enable_wined3d_Revert_Buffer_Upload="$1" - enable_wined3d_Revert_Pixel_Center_Offset="$1" enable_wined3d_Silence_FIXMEs="$1" enable_wined3d_WINED3DFMT_R32G32_UINT="$1" enable_wined3d_buffer_create="$1" @@ -1500,9 +1499,6 @@ patch_enable () wined3d-Revert_Buffer_Upload) enable_wined3d_Revert_Buffer_Upload="$2" ;; - wined3d-Revert_Pixel_Center_Offset) - enable_wined3d_Revert_Pixel_Center_Offset="$2" - ;; wined3d-Silence_FIXMEs) enable_wined3d_Silence_FIXMEs="$2" ;; @@ -2069,9 +2065,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then if test "$enable_wined3d_Revert_Buffer_Upload" -gt 1; then abort "Patchset wined3d-Revert_Buffer_Upload disabled, but wined3d-CSMT_Helper depends on that." fi - if test "$enable_wined3d_Revert_Pixel_Center_Offset" -gt 1; then - abort "Patchset wined3d-Revert_Pixel_Center_Offset disabled, but wined3d-CSMT_Helper depends on that." - fi if test "$enable_wined3d_Silence_FIXMEs" -gt 1; then abort "Patchset wined3d-Silence_FIXMEs disabled, but wined3d-CSMT_Helper depends on that." fi @@ -2084,7 +2077,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then enable_wined3d_DXTn=1 enable_wined3d_QUERY_Stubs=1 enable_wined3d_Revert_Buffer_Upload=1 - enable_wined3d_Revert_Pixel_Center_Offset=1 enable_wined3d_Silence_FIXMEs=1 fi @@ -8629,18 +8621,6 @@ if test "$enable_wined3d_Revert_Buffer_Upload" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-Revert_Pixel_Center_Offset -# | -# | Modified files: -# | * dlls/wined3d/directx.c, dlls/wined3d/state.c, dlls/wined3d/utils.c -# | -if test "$enable_wined3d_Revert_Pixel_Center_Offset" -eq 1; then - patch_apply wined3d-Revert_Pixel_Center_Offset/0001-Revert-wined3d-Slightly-offset-the-viewport-in-the-A.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "Revert \"wined3d: Slightly offset the viewport in the ARB_clip_control case.\".", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-Silence_FIXMEs # | # | This patchset fixes the following Wine bugs: @@ -8675,7 +8655,7 @@ fi # | This patchset has the following (direct or indirect) dependencies: # | * d3d11-Deferred_Context, d3d9-Tests, makedep-PARENTSPEC, ntdll-Attach_Process_DLLs, ntdll-DllOverrides_WOW64, ntdll- # | Loader_Machine_Type, ntdll-DllRedirects, wined3d-1DTextures, wined3d-Accounting, wined3d-DXTn, wined3d-QUERY_Stubs, -# | wined3d-Revert_Buffer_Upload, wined3d-Revert_Pixel_Center_Offset, wined3d-Silence_FIXMEs +# | wined3d-Revert_Buffer_Upload, wined3d-Silence_FIXMEs # | # | Modified files: # | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc @@ -8757,7 +8737,7 @@ fi # | This patchset has the following (direct or indirect) dependencies: # | * d3d11-Deferred_Context, d3d9-Tests, makedep-PARENTSPEC, ntdll-Attach_Process_DLLs, ntdll-DllOverrides_WOW64, ntdll- # | Loader_Machine_Type, ntdll-DllRedirects, wined3d-1DTextures, wined3d-Accounting, wined3d-DXTn, wined3d-QUERY_Stubs, -# | wined3d-Revert_Buffer_Upload, wined3d-Revert_Pixel_Center_Offset, wined3d-Silence_FIXMEs, wined3d-CSMT_Helper +# | wined3d-Revert_Buffer_Upload, wined3d-Silence_FIXMEs, wined3d-CSMT_Helper # | # | This patchset fixes the following Wine bugs: # | * [#11674] Support for CSMT (command stream) to increase graphic performance diff --git a/patches/wined3d-CSMT_Helper/definition b/patches/wined3d-CSMT_Helper/definition index 1b4e7c76..5859490f 100644 --- a/patches/wined3d-CSMT_Helper/definition +++ b/patches/wined3d-CSMT_Helper/definition @@ -3,7 +3,6 @@ Depends: wined3d-DXTn Depends: wined3d-QUERY_Stubs Depends: wined3d-1DTextures Depends: wined3d-Silence_FIXMEs -Depends: wined3d-Revert_Pixel_Center_Offset Depends: wined3d-Revert_Buffer_Upload Depends: d3d9-Tests Depends: d3d11-Deferred_Context diff --git a/patches/wined3d-Revert_Pixel_Center_Offset/0001-Revert-wined3d-Slightly-offset-the-viewport-in-the-A.patch b/patches/wined3d-Revert_Pixel_Center_Offset/0001-Revert-wined3d-Slightly-offset-the-viewport-in-the-A.patch deleted file mode 100644 index 45007e4f..00000000 --- a/patches/wined3d-Revert_Pixel_Center_Offset/0001-Revert-wined3d-Slightly-offset-the-viewport-in-the-A.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bee3b5c4faa6a7a0bcc8248a7a10095632b0954f Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 15 Oct 2016 04:23:44 +0200 -Subject: Revert "wined3d: Slightly offset the viewport in the ARB_clip_control - case." - -This reverts commit 1bed10abee7d2439a5c7358596c860c454f06b53. ---- - dlls/wined3d/directx.c | 2 +- - dlls/wined3d/state.c | 4 +--- - dlls/wined3d/utils.c | 4 ++-- - 3 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index a8c8c9f..8039942 100644 ---- a/dlls/wined3d/directx.c -+++ b/dlls/wined3d/directx.c -@@ -3881,7 +3881,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_VIEWPORT_SUBPIXEL_BITS, &subpixel_bits); - TRACE("Viewport supports %d subpixel bits.\n", subpixel_bits); -- if (subpixel_bits < 8) -+ if (!subpixel_bits) - gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; - } - if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY]) -diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c -index d462ea5..ddd8d93 100644 ---- a/dlls/wined3d/state.c -+++ b/dlls/wined3d/state.c -@@ -4653,10 +4653,8 @@ static void viewport_miscpart_cc(struct wined3d_context *context, - { - const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; -- /* See get_projection_matrix() in utils.c for a discussion about those -- * values. */ - float pixel_center_offset = context->d3d_info->wined3d_creation_flags -- & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; -+ & WINED3D_PIXEL_CENTER_INTEGER ? 0.5f : 0.0f; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp = state->viewport; - unsigned int width, height; -diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index 2171611..38024ba 100644 ---- a/dlls/wined3d/utils.c -+++ b/dlls/wined3d/utils.c -@@ -4502,8 +4502,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w - * here besides the projection transformation itself: - * - We need to flip along the y-axis in case of offscreen rendering. - * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. -- * - <= D3D9 coordinates refer to pixel centers while GL coordinates -- * refer to pixel corners. -+ * - D3D coordinates refer to pixel centers while GL coordinates refer -+ * to pixel corners. - * - D3D has a top-left filling convention. We need to maintain this - * even after the y-flip mentioned above. - * In order to handle the last two points, we translate by --- -2.9.0 - diff --git a/patches/wined3d-Revert_Pixel_Center_Offset/definition b/patches/wined3d-Revert_Pixel_Center_Offset/definition deleted file mode 100644 index 1b5eb7dc..00000000 --- a/patches/wined3d-Revert_Pixel_Center_Offset/definition +++ /dev/null @@ -1,3 +0,0 @@ -Fixes: Revert changes to offset the pixel center in the ARB_clip_control case -# The main purpose is to avoid test failures on the development machines. -# FIXME: According to Matteo Bruno it could also be a Nvidia driver bug.