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
241ab925
Commit
241ab925
authored
Jul 03, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Use the correct drawable with the X11DRV_GET_DRAWABLE escape.
parent
3ea8de26
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
opengl.c
dlls/winex11.drv/opengl.c
+10
-10
No files found.
dlls/winex11.drv/opengl.c
View file @
241ab925
...
...
@@ -1610,7 +1610,7 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
}
else
{
if
(
escape
.
gl_type
==
DC_GL_BITMAP
)
escape
.
drawable
=
get_context_pixmap
(
hdc
,
ctx
);
if
(
escape
.
gl_type
==
DC_GL_BITMAP
)
escape
.
gl_
drawable
=
get_context_pixmap
(
hdc
,
ctx
);
wine_tsx11_lock
();
...
...
@@ -1619,10 +1619,10 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
pglXGetFBConfigAttrib
(
gdi_display
,
ctx
->
fmt
->
fbconfig
,
GLX_VISUAL_ID
,
&
vis_id
);
describeContext
(
ctx
);
TRACE
(
"hdc %p drawable %lx fmt %u vis %x ctx %p
\n
"
,
hdc
,
escape
.
drawable
,
escape
.
pixel_format
,
vis_id
,
ctx
->
ctx
);
escape
.
gl_
drawable
,
escape
.
pixel_format
,
vis_id
,
ctx
->
ctx
);
}
ret
=
pglXMakeCurrent
(
gdi_display
,
escape
.
drawable
,
ctx
->
ctx
);
ret
=
pglXMakeCurrent
(
gdi_display
,
escape
.
gl_
drawable
,
ctx
->
ctx
);
if
(
ret
)
{
...
...
@@ -1631,8 +1631,8 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
ctx
->
has_been_current
=
TRUE
;
ctx
->
hdc
=
hdc
;
ctx
->
read_hdc
=
hdc
;
ctx
->
drawables
[
0
]
=
escape
.
drawable
;
ctx
->
drawables
[
1
]
=
escape
.
drawable
;
ctx
->
drawables
[
0
]
=
escape
.
gl_
drawable
;
ctx
->
drawables
[
1
]
=
escape
.
gl_
drawable
;
ctx
->
refresh_drawables
=
FALSE
;
if
(
escape
.
gl_type
==
DC_GL_BITMAP
)
pglDrawBuffer
(
GL_FRONT_LEFT
);
...
...
@@ -1684,18 +1684,18 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct
{
if
(
!
pglXMakeContextCurrent
)
return
FALSE
;
if
(
escape_draw
.
gl_type
==
DC_GL_BITMAP
)
escape_draw
.
drawable
=
get_context_pixmap
(
draw_hdc
,
ctx
);
if
(
escape_read
.
gl_type
==
DC_GL_BITMAP
)
escape_read
.
drawable
=
get_context_pixmap
(
read_hdc
,
ctx
);
if
(
escape_draw
.
gl_type
==
DC_GL_BITMAP
)
escape_draw
.
gl_
drawable
=
get_context_pixmap
(
draw_hdc
,
ctx
);
if
(
escape_read
.
gl_type
==
DC_GL_BITMAP
)
escape_read
.
gl_
drawable
=
get_context_pixmap
(
read_hdc
,
ctx
);
wine_tsx11_lock
();
ret
=
pglXMakeContextCurrent
(
gdi_display
,
escape_draw
.
drawable
,
escape_read
.
drawable
,
ctx
->
ctx
);
ret
=
pglXMakeContextCurrent
(
gdi_display
,
escape_draw
.
gl_drawable
,
escape_read
.
gl_
drawable
,
ctx
->
ctx
);
if
(
ret
)
{
ctx
->
has_been_current
=
TRUE
;
ctx
->
hdc
=
draw_hdc
;
ctx
->
read_hdc
=
read_hdc
;
ctx
->
drawables
[
0
]
=
escape_draw
.
drawable
;
ctx
->
drawables
[
1
]
=
escape_read
.
drawable
;
ctx
->
drawables
[
0
]
=
escape_draw
.
gl_
drawable
;
ctx
->
drawables
[
1
]
=
escape_read
.
gl_
drawable
;
ctx
->
refresh_drawables
=
FALSE
;
NtCurrentTeb
()
->
glContext
=
ctx
;
}
...
...
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