All pastes #1935128 Raw Edit

Anonymous

public diff v1 · immutable
#1935128 ·published 2010-09-07 16:11 UTC
rendered paste body
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.cindex 2bf2346..93902d0 100644--- a/dlls/wined3d/directx.c+++ b/dlls/wined3d/directx.c@@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,     OSVERSIONINFOW os_version;     WORD driver_os_version;     unsigned int i;-    enum wined3d_display_driver driver = DRIVER_NVIDIA_TNT;+    enum wined3d_display_driver driver = DRIVER_UNKNOWN;     enum wined3d_driver_model driver_model;     const struct driver_version_information *version_info; @@ -1219,6 +1219,23 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,         }         else         {+            switch (vendor)+            {+                case HW_VENDOR_ATI:+                    driver_info->name = "ati2dvag.dll";+                    break;++                case HW_VENDOR_NVIDIA:+                    driver_info->name = "nv4_disp.dll";+                    break;++                case HW_VENDOR_INTEL:+                default:+                    FIXME_(d3d_caps)("Unhandled vendor %04x.\n", vendor);+                    driver_info->name = "Display";+                    break;+            }+             driver_info->description = "Direct3D HAL";             driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15);             driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.hindex 28d448d..367701b 100644--- a/dlls/wined3d/wined3d_private.h+++ b/dlls/wined3d/wined3d_private.h@@ -1239,6 +1239,7 @@ typedef struct WineD3D_PixelFormat  * R3xx, R4xx and R5xx GPUs. */ enum wined3d_display_driver {+    DRIVER_UNKNOWN,     DRIVER_ATI_R300,     DRIVER_ATI_R600,     DRIVER_NVIDIA_TNT,