Skip to content

W
wine-winehq
Commit d7472026 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

wined3d: Return generic info for unhandled devices/drivers.

parent de9f0b98
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/wined3d/directx.c
View file @ d7472026
...@@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, ...@@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
OSVERSIONINFOW os_version; OSVERSIONINFOW os_version;
WORD driver_os_version; WORD driver_os_version;
unsigned int i; unsigned int i;
enum wined3d_display_driver driver = DRIVER_NVIDIA_TNT; enum wined3d_display_driver driver = DRIVER_UNKNOWN;
enum wined3d_driver_model driver_model; enum wined3d_driver_model driver_model;
const struct driver_version_information *version_info; const struct driver_version_information *version_info;
...@@ -1220,6 +1220,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, ...@@ -1220,6 +1220,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
else else
{ {
driver_info->description = "Direct3D HAL"; driver_info->description = "Direct3D HAL";
driver_info->name = "Display";
driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15);
driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */
......
dlls/wined3d/wined3d_private.h
View file @ d7472026
...@@ -1244,7 +1244,8 @@ enum wined3d_display_driver ...@@ -1244,7 +1244,8 @@ enum wined3d_display_driver
DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_TNT,
DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCE2MX,
DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCEFX,
DRIVER_NVIDIA_GEFORCE6 DRIVER_NVIDIA_GEFORCE6,
DRIVER_UNKNOWN
}; };
enum wined3d_driver_model enum wined3d_driver_model
......
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