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
77679c4e
Commit
77679c4e
authored
Mar 03, 2011
by
Matteo Bruni
Committed by
Alexandre Julliard
Mar 30, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: Don't modify current state if glXMakeCurrent fails.
parent
6af0bef4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
opengl.c
dlls/winex11.drv/opengl.c
+6
-3
No files found.
dlls/winex11.drv/opengl.c
View file @
77679c4e
...
...
@@ -1907,7 +1907,6 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) {
{
Drawable
drawable
=
get_glxdrawable
(
physDev
);
Wine_GLContext
*
prev_ctx
=
NtCurrentTeb
()
->
glContext
;
if
(
prev_ctx
)
prev_ctx
->
tid
=
0
;
/* The describe lines below are for debugging purposes only */
if
(
TRACE_ON
(
wgl
))
{
...
...
@@ -1917,10 +1916,12 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) {
TRACE
(
" make current for dis %p, drawable %p, ctx %p
\n
"
,
gdi_display
,
(
void
*
)
drawable
,
ctx
->
ctx
);
ret
=
pglXMakeCurrent
(
gdi_display
,
drawable
,
ctx
->
ctx
);
NtCurrentTeb
()
->
glContext
=
ctx
;
if
(
ret
)
if
(
ret
)
{
if
(
prev_ctx
)
prev_ctx
->
tid
=
0
;
NtCurrentTeb
()
->
glContext
=
ctx
;
ctx
->
has_been_current
=
TRUE
;
ctx
->
tid
=
GetCurrentThreadId
();
ctx
->
hdc
=
hdc
;
...
...
@@ -1935,6 +1936,8 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) {
pglDrawBuffer
(
GL_FRONT_LEFT
);
}
}
else
SetLastError
(
ERROR_INVALID_HANDLE
);
}
wine_tsx11_unlock
();
TRACE
(
" returning %s
\n
"
,
(
ret
?
"True"
:
"False"
));
...
...
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