Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0db4d1c2
Commit
0db4d1c2
authored
May 23, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
May 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Default to OpenGL 4.4 contexts.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b7566098
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
directx.c
dlls/wined3d/directx.c
+3
-3
wined3d_main.c
dlls/wined3d/wined3d_main.c
+1
-1
No files found.
dlls/wined3d/directx.c
View file @
0db4d1c2
...
...
@@ -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
)
...
...
dlls/wined3d/wined3d_main.c
View file @
0db4d1c2
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment