From 67ebee7f44f21c7c1f4286c08ec28f46f70a6f6d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 25 Jul 2017 05:50:36 +0200 Subject: [PATCH] Fix typo in a patch directory. --- patches/patchinstall.sh | 18 +++++++++--------- ...ze-conservative-depth-output-register.patch | 0 ...servative-depth-access-information-to.patch | 0 .../definition | 0 4 files changed, 9 insertions(+), 9 deletions(-) rename patches/{wined3d-convervative_depth => wined3d-conservative_depth}/0001-wined3d-Recognize-conservative-depth-output-register.patch (100%) rename patches/{wined3d-convervative_depth => wined3d-conservative_depth}/0002-wined3d-Add-conservative-depth-access-information-to.patch (100%) rename patches/{wined3d-convervative_depth => wined3d-conservative_depth}/definition (100%) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b6d7c81c..37e9b074 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -454,7 +454,7 @@ patch_enable_all () enable_wined3d_WINED3DFMT_R32G32_UINT="$1" enable_wined3d_WINED3D_RS_COLORWRITEENABLE="$1" enable_wined3d_buffer_create="$1" - enable_wined3d_convervative_depth="$1" + enable_wined3d_conservative_depth="$1" enable_wined3d_draw_primitive_arrays="$1" enable_wined3d_sample_c_lz="$1" enable_wined3d_wined3d_guess_gl_vendor="$1" @@ -1629,8 +1629,8 @@ patch_enable () wined3d-buffer_create) enable_wined3d_buffer_create="$2" ;; - wined3d-convervative_depth) - enable_wined3d_convervative_depth="$2" + wined3d-conservative_depth) + enable_wined3d_conservative_depth="$2" ;; wined3d-draw_primitive_arrays) enable_wined3d_draw_primitive_arrays="$2" @@ -2185,9 +2185,9 @@ if test "$enable_wined3d_CSMT_Main" -eq 1; then enable_wined3d_CSMT_Helper=1 fi -if test "$enable_wined3d_convervative_depth" -eq 1; then +if test "$enable_wined3d_conservative_depth" -eq 1; then if test "$enable_wined3d_Copy_Resource_Typeless" -gt 1; then - abort "Patchset wined3d-Copy_Resource_Typeless disabled, but wined3d-convervative_depth depends on that." + abort "Patchset wined3d-Copy_Resource_Typeless disabled, but wined3d-conservative_depth depends on that." fi enable_wined3d_Copy_Resource_Typeless=1 fi @@ -9596,7 +9596,7 @@ if test "$enable_wined3d_buffer_create" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-convervative_depth +# Patchset wined3d-conservative_depth # | # | This patchset has the following (direct or indirect) dependencies: # | * d3d11-Depth_Bias, wined3d-1DTextures, wined3d-Copy_Resource_Typeless @@ -9605,9 +9605,9 @@ fi # | * dlls/wined3d/arb_program_shader.c, dlls/wined3d/directx.c, dlls/wined3d/glsl_shader.c, dlls/wined3d/shader.c, # | dlls/wined3d/shader_sm4.c, dlls/wined3d/wined3d_gl.h, dlls/wined3d/wined3d_private.h # | -if test "$enable_wined3d_convervative_depth" -eq 1; then - patch_apply wined3d-convervative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch - patch_apply wined3d-convervative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch +if test "$enable_wined3d_conservative_depth" -eq 1; then + patch_apply wined3d-conservative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch + patch_apply wined3d-conservative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch ( printf '%s\n' '+ { "Michael Müller", "wined3d: Recognize conservative depth output registers in sm4.", 1 },'; printf '%s\n' '+ { "Michael Müller", "wined3d: Add conservative depth access information to glsl pixel shaders.", 1 },'; diff --git a/patches/wined3d-convervative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch b/patches/wined3d-conservative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch similarity index 100% rename from patches/wined3d-convervative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch rename to patches/wined3d-conservative_depth/0001-wined3d-Recognize-conservative-depth-output-register.patch diff --git a/patches/wined3d-convervative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch b/patches/wined3d-conservative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch similarity index 100% rename from patches/wined3d-convervative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch rename to patches/wined3d-conservative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch diff --git a/patches/wined3d-convervative_depth/definition b/patches/wined3d-conservative_depth/definition similarity index 100% rename from patches/wined3d-convervative_depth/definition rename to patches/wined3d-conservative_depth/definition