Module: wine Branch: master Commit: 0db4d1c251d293333e2721a78d6156008a90ff6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db4d1c251d293333e2721a78...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed May 23 16:32:13 2018 +0430
wined3d: Default to OpenGL 4.4 contexts.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a4e4a0c..3ca389e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -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;
- if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + if (wined3d_settings.explicit_gl_version) return wined3d_settings.max_gl_version;
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); if (!gl_vendor || !gl_renderer || 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) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 56fae6b..e322b4d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,7 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ 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 */ ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */