Skip to content

W
wine-cw
Commit 01092d64 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Just fail if looking up the guessed GPU info fails in wined3d_adapter_init_gl_caps().

This should never happen. Note that the previous code would return a GPU with 64 TiB of VRAM. Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6b53b79e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
dlls/wined3d/directx.c
View file @ 01092d64
......@@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024)
#define DEFAULT_REFRESH_RATE 0
/* The driver names reflect the lowest GPU supported
......@@ -4339,8 +4338,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes)))
{
static const struct gpu_description default_gpu_description =
{HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "Direct3D HAL", DRIVER_UNKNOWN, WINE_DEFAULT_VIDMEM};
enum wined3d_pci_vendor vendor;
enum wined3d_pci_device device;
......@@ -4354,7 +4351,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
if (!(gpu_description = get_gpu_description(vendor, device)))
{
ERR("Card %04x:%04x not found in driver DB.\n", vendor, device);
gpu_description = &default_gpu_description;
return FALSE;
}
}
fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment