forked from Mirrors/wine-wine
wined3d: Default to OpenGL 4.4 contexts.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
b756609894
commit
0db4d1c251
|
@ -6581,16 +6581,16 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla
|
||||||
{
|
{
|
||||||
const char *gl_vendor, *gl_renderer;
|
const char *gl_vendor, *gl_renderer;
|
||||||
|
|
||||||
if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER))
|
if (wined3d_settings.explicit_gl_version)
|
||||||
return wined3d_settings.max_gl_version;
|
return wined3d_settings.max_gl_version;
|
||||||
|
|
||||||
gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR);
|
gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR);
|
||||||
gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER);
|
gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER);
|
||||||
if (!gl_vendor || !gl_renderer
|
if (!gl_vendor || !gl_renderer
|
||||||
|| wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA)
|
|| wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA)
|
||||||
return wined3d_settings.max_gl_version;
|
return MAKEDWORD_VERSION(1, 0);
|
||||||
|
|
||||||
return MAKEDWORD_VERSION(4, 4);
|
return wined3d_settings.max_gl_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags)
|
static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags)
|
||||||
|
|
|
@ -74,7 +74,7 @@ struct wined3d_settings wined3d_settings =
|
||||||
{
|
{
|
||||||
TRUE, /* Multithreaded CS by default. */
|
TRUE, /* Multithreaded CS by default. */
|
||||||
FALSE, /* explicit_gl_version */
|
FALSE, /* explicit_gl_version */
|
||||||
MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */
|
MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */
|
||||||
TRUE, /* Use of GLSL enabled by default */
|
TRUE, /* Use of GLSL enabled by default */
|
||||||
ORM_FBO, /* Use FBOs to do offscreen rendering */
|
ORM_FBO, /* Use FBOs to do offscreen rendering */
|
||||||
PCI_VENDOR_NONE,/* PCI Vendor ID */
|
PCI_VENDOR_NONE,/* PCI Vendor ID */
|
||||||
|
|
Loading…
Reference in New Issue