diff --git a/README.md b/README.md index 201f6ee5..ce06d343 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,13 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [16]:** +**Bug fixes and features included in the next upcoming release [17]:** * Add stub for D3DXTessellateNPatches * Add stubs for D3DCompile2 and D3DCompileFromFile * Add stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W ([Wine Bug #27739](https://bugs.winehq.org/show_bug.cgi?id=27739)) * Add support for ThreadQuerySetWin32StartAddress info class ([Wine Bug #8277](https://bugs.winehq.org/show_bug.cgi?id=8277)) +* Add wined3d detection for GeForce GT 425M ([Wine Bug #35054](https://bugs.winehq.org/show_bug.cgi?id=35054)) * Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021)) * Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972)) * Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960)) diff --git a/debian/changelog b/debian/changelog index 36d53cb1..81a2441a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ ine-staging (1.7.48) UNRELEASED; urgency=low * Added patch with stub for D3DXTessellateNPatches. * Added patch with stubs for D3DCompile2 and D3DCompileFromFile. * Added patch to implement dbghelp.UnDecorateSymbolNameW. + * Added patch to add wined3d detection of GeForce GT 425M. * Removed patch to allow to enable/disable InsertMode in wineconsole settings (accepted upstream). * Removed patch to improve IoGetDeviceObjectPointer stub to appease SecuROM diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f53e39e7..ad6abc6c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -256,6 +256,7 @@ patch_enable_all () enable_wined3d_CSMT_Helper="$1" enable_wined3d_CSMT_Main="$1" enable_wined3d_DXTn="$1" + enable_wined3d_Geforce_425M="$1" enable_wined3d_MESA_GPU_Info="$1" enable_wined3d_Multisampling="$1" enable_wined3d_Revert_PixelFormat="$1" @@ -846,6 +847,9 @@ patch_enable () wined3d-DXTn) enable_wined3d_DXTn="$2" ;; + wined3d-Geforce_425M) + enable_wined3d_Geforce_425M="$2" + ;; wined3d-MESA_GPU_Info) enable_wined3d_MESA_GPU_Info="$2" ;; @@ -4915,6 +4919,18 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-resource_check_usage +# | +# | Modified files: +# | * dlls/wined3d/resource.c +# | +if test "$enable_wined3d_resource_check_usage" -eq 1; then + patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch + ( + echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-wined3d_swapchain_present # | # | Modified files: @@ -4927,6 +4943,21 @@ if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-Geforce_425M +# | +# | This patchset fixes the following Wine bugs: +# | * [#35054] Add wined3d detection for GeForce GT 425M +# | +# | Modified files: +# | * dlls/wined3d/directx.c, dlls/wined3d/wined3d_private.h +# | +if test "$enable_wined3d_Geforce_425M" -eq 1; then + patch_apply wined3d-Geforce_425M/0001-wined3d-Add-detection-for-NVIDIA-GeForce-425M.patch + ( + echo '+ { "Jarkko Korpi", "wined3d: Add detection for NVIDIA GeForce 425M.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-MESA_GPU_Info # | # | Modified files: @@ -4999,18 +5030,6 @@ if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-resource_check_usage -# | -# | Modified files: -# | * dlls/wined3d/resource.c -# | -if test "$enable_wined3d_resource_check_usage" -eq 1; then - patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch - ( - echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-Geforce_425M/0001-wined3d-Add-detection-for-NVIDIA-GeForce-425M.patch b/patches/wined3d-Geforce_425M/0001-wined3d-Add-detection-for-NVIDIA-GeForce-425M.patch new file mode 100644 index 00000000..fdc3a44a --- /dev/null +++ b/patches/wined3d-Geforce_425M/0001-wined3d-Add-detection-for-NVIDIA-GeForce-425M.patch @@ -0,0 +1,45 @@ +From 3e9c58f0bd7ae338375adc8b4a94c0d7cb0d8f8f Mon Sep 17 00:00:00 2001 +From: Jarkko Korpi +Date: Sun, 12 Jul 2015 17:41:59 +0300 +Subject: wined3d: Add detection for NVIDIA GeForce 425M. + +--- + dlls/wined3d/directx.c | 2 ++ + dlls/wined3d/wined3d_private.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c +index ce23c47..daefa0f 100644 +--- a/dlls/wined3d/directx.c ++++ b/dlls/wined3d/directx.c +@@ -1237,6 +1237,7 @@ static const struct gpu_description gpu_description_table[] = + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE8, 2048}, ++ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT425M, "NVIDIA GeForce GT 425M", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE8, 1024}, +@@ -1745,6 +1746,7 @@ cards_nvidia_binary[] = + {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ + {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ + {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ ++ {"GT 425M", CARD_NVIDIA_GEFORCE_GT425M}, /* Geforce 400 - lowend mobile */ + {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ + {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ + {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ +diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h +index a1331d3..b1e6124 100644 +--- a/dlls/wined3d/wined3d_private.h ++++ b/dlls/wined3d/wined3d_private.h +@@ -1564,6 +1564,7 @@ enum wined3d_pci_device + CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_410M = 0x1055, + CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, ++ CARD_NVIDIA_GEFORCE_GT425M = 0x0df0, + CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, + CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, + CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4, +-- +2.4.5 + diff --git a/patches/wined3d-Geforce_425M/definition b/patches/wined3d-Geforce_425M/definition new file mode 100644 index 00000000..f47167f4 --- /dev/null +++ b/patches/wined3d-Geforce_425M/definition @@ -0,0 +1 @@ +Fixes: [35054] Add wined3d detection for GeForce GT 425M