Commit 48de52e2 authored by Nikolay Bogoychev's avatar Nikolay Bogoychev Committed by Alexandre Julliard

wined3d: Recognize Haswell mobile graphics 4600.

parent b968c9c5
...@@ -1330,6 +1330,7 @@ static const struct gpu_description gpu_description_table[] = ...@@ -1330,6 +1330,7 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024},
{HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024},
{HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024},
{HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) Haswell Mobile", DRIVER_INTEL_GMA3000, 1024},
}; };
static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,
...@@ -1991,6 +1992,8 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g ...@@ -1991,6 +1992,8 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g
} }
cards[] = cards[] =
{ {
/* Haswell */
{"Haswell Mobile", CARD_INTEL_HWM},
/* Ivybridge */ /* Ivybridge */
{"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Server", CARD_INTEL_IVBS},
{"Ivybridge Mobile", CARD_INTEL_IVBM}, {"Ivybridge Mobile", CARD_INTEL_IVBM},
......
...@@ -1505,6 +1505,7 @@ enum wined3d_pci_device ...@@ -1505,6 +1505,7 @@ enum wined3d_pci_device
CARD_INTEL_IVBD = 0x0162, CARD_INTEL_IVBD = 0x0162,
CARD_INTEL_IVBM = 0x0166, CARD_INTEL_IVBM = 0x0166,
CARD_INTEL_IVBS = 0x015a, CARD_INTEL_IVBS = 0x015a,
CARD_INTEL_HWM = 0x0416,
}; };
struct wined3d_fbo_ops struct wined3d_fbo_ops
......
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