[PATCH] wined3d: Add 4GB Nvidia GeForce 730 variant.
More common 2GB version of the card already existed but the 4GB card was missing. Signed-off-by: Benjamin Hodgetts <ben(a)xnode.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8f42fe253..50498d7c64 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1361,7 +1361,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_1, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_2, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1f75301d6..ee137763f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2363,7 +2363,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, - CARD_NVIDIA_GEFORCE_GT730 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_1 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_2 = 0x0f02, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, -- 2.16.1
On 13 February 2018 at 17:45, Benjamin Hodgetts <ben(a)xnode.org> wrote:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8f42fe253..50498d7c64 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1361,7 +1361,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_1, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_2, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1f75301d6..ee137763f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2363,7 +2363,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, - CARD_NVIDIA_GEFORCE_GT730 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_1 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_2 = 0x0f02, I don't think that works, cards_nvidia_binary[] still references CARD_NVIDIA_GEFORCE_GT730. More generally, the proprietary driver won't use this extra information unless there's an entry for it in cards_nvidia_binary[]. If you have GLX_MESA_query_renderer it could potentially match on PCI ID, but in that case you also get the video memory size from the driver.
On 2018-02-14 09:16, Henri Verbeet wrote:
On 13 February 2018 at 17:45, Benjamin Hodgetts <ben(a)xnode.org> wrote:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8f42fe253..50498d7c64 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1361,7 +1361,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_1, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730_2, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1f75301d6..ee137763f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2363,7 +2363,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, - CARD_NVIDIA_GEFORCE_GT730 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_1 = 0x1287, + CARD_NVIDIA_GEFORCE_GT730_2 = 0x0f02, I don't think that works, cards_nvidia_binary[] still references CARD_NVIDIA_GEFORCE_GT730. More generally, the proprietary driver won't use this extra information unless there's an entry for it in cards_nvidia_binary[]. If you have GLX_MESA_query_renderer it could potentially match on PCI ID, but in that case you also get the video memory size from the driver.
You're right, my faffing with GIT meant I missed the second edit needed in that file when I redid it. This change is purely for the Nouveau driver, as the official binary driver "just works" without needing this info. Bin this and I'll resubmit the corrected one. Thanks.
participants (2)
-
Benjamin Hodgetts -
Henri Verbeet