Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
a27100b8
Commit
a27100b8
authored
Sep 28, 2014
by
Michael Müller
Committed by
Vitaly Lipatov
Jul 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: Only warn about used contexts in wglShareLists.
parent
e94b8ec7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
opengl.c
dlls/opengl32/tests/opengl.c
+1
-1
opengl.c
dlls/winex11.drv/opengl.c
+4
-6
No files found.
dlls/opengl32/tests/opengl.c
View file @
a27100b8
...
@@ -564,7 +564,7 @@ static void test_sharelists(HDC winhdc)
...
@@ -564,7 +564,7 @@ static void test_sharelists(HDC winhdc)
res
=
wglMakeCurrent
(
winhdc
,
hglrc2
);
res
=
wglMakeCurrent
(
winhdc
,
hglrc2
);
ok
(
res
,
"Make current failed
\n
"
);
ok
(
res
,
"Make current failed
\n
"
);
res
=
wglShareLists
(
hglrc1
,
hglrc2
);
res
=
wglShareLists
(
hglrc1
,
hglrc2
);
todo_wine
ok
(
res
,
"Sharing display lists with a destination context which has been made current failed
\n
"
);
ok
(
res
,
"Sharing display lists with a destination context which has been made current failed
\n
"
);
wglMakeCurrent
(
0
,
0
);
wglMakeCurrent
(
0
,
0
);
wglDeleteContext
(
hglrc2
);
wglDeleteContext
(
hglrc2
);
}
}
...
...
dlls/winex11.drv/opengl.c
View file @
a27100b8
...
@@ -1930,18 +1930,16 @@ static BOOL WINAPI glxdrv_wglShareLists(struct wgl_context *org, struct wgl_cont
...
@@ -1930,18 +1930,16 @@ static BOOL WINAPI glxdrv_wglShareLists(struct wgl_context *org, struct wgl_cont
* current or when it hasn't shared display lists before.
* current or when it hasn't shared display lists before.
*/
*/
if
((
org
->
has_been_current
&&
dest
->
has_been_current
)
||
dest
->
has_been_current
)
if
(
dest
->
sharing
)
{
ERR
(
"Could not share display lists, one of the contexts has been current already !
\n
"
);
return
FALSE
;
}
else
if
(
dest
->
sharing
)
{
{
ERR
(
"Could not share display lists because hglrc2 has already shared lists before
\n
"
);
ERR
(
"Could not share display lists because hglrc2 has already shared lists before
\n
"
);
return
FALSE
;
return
FALSE
;
}
}
else
else
{
{
if
(
dest
->
has_been_current
)
ERR
(
"Recreating OpenGL context to share display lists, although the context has been current!
\n
"
);
/* Re-create the GLX context and share display lists */
/* Re-create the GLX context and share display lists */
pglXDestroyContext
(
gdi_display
,
dest
->
ctx
);
pglXDestroyContext
(
gdi_display
,
dest
->
ctx
);
dest
->
ctx
=
create_glxcontext
(
gdi_display
,
dest
,
org
->
ctx
);
dest
->
ctx
=
create_glxcontext
(
gdi_display
,
dest
,
org
->
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