[PATCH 4/5] wined3d: Ignore driver model if the requested driver model entry is missing.
mbruni at codeweavers.com
Thu Oct 13 17:03:36 CDT 2016
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
We only have a DRIVER_MODEL_NT6X entry for DRIVER_INTEL_HD4000 and,
going forward, it's likely we'll have more similar cases.
It's essentially a different approach to commit
f03c25699723ed03aa0b05e5d432a52402608f94 for fixing the same issue. Feel
free to ignore this one, I just happened to have this patch around...
dlls/wined3d/directx.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 24fb9e5..5825aa5 100644
@@ -61,6 +61,7 @@ enum wined3d_display_driver
@@ -1486,7 +1487,8 @@ static const struct driver_version_information *get_driver_version_info(enum win
const struct driver_version_information *entry = &driver_version_table[i];
- if (entry->driver == driver && entry->driver_model == driver_model)
+ if (entry->driver == driver && (driver_model == DRIVER_MODEL_GENERIC
+ || entry->driver_model == driver_model))
TRACE("Found driver \"%s\", version %u, subversion %u, build %u.\n",
entry->driver_name, entry->version, entry->subversion, entry->build);
@@ -1661,8 +1663,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
* This could be an indication that our database is not up to date, so this should be fixed.
if ((version_info = get_driver_version_info(driver, driver_model))
- || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X))
- || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT6X)))
+ || (version_info = get_driver_version_info(driver, DRIVER_MODEL_GENERIC)))
driver_info->name = version_info->driver_name;
driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version);
More information about the wine-patches