Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3e68508e
Commit
3e68508e
authored
Jun 09, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl32: Only store the glX name if different from the wgl name.
parent
cac33018
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
make_opengl
dlls/opengl32/make_opengl
+9
-1
opengl_ext.c
dlls/opengl32/opengl_ext.c
+0
-0
wgl.c
dlls/opengl32/wgl.c
+5
-4
No files found.
dlls/opengl32/make_opengl
View file @
3e68508e
...
@@ -168,6 +168,7 @@ sub ConvertType($)
...
@@ -168,6 +168,7 @@ sub ConvertType($)
"GLsizeiptr"
=>
"ptrdiff_t"
,
"GLsizeiptr"
=>
"ptrdiff_t"
,
"GLhandleARB"
=>
"unsigned int"
,
"GLhandleARB"
=>
"unsigned int"
,
"GLcharARB"
=>
"char"
,
"GLcharARB"
=>
"char"
,
"GLchar"
=>
"char"
,
"GLhalfNV"
=>
"unsigned short"
);
"GLhalfNV"
=>
"unsigned short"
);
foreach
my
$org
(
reverse
sort
keys
%
hash
)
{
foreach
my
$org
(
reverse
sort
keys
%
hash
)
{
...
@@ -713,7 +714,14 @@ print EXT "const OpenGL_extension extension_registry[", ($#tmp + 1), "] = {\n";
...
@@ -713,7 +714,14 @@ print EXT "const OpenGL_extension extension_registry[", ($#tmp + 1), "] = {\n";
my
$i
=
0
;
my
$i
=
0
;
foreach
(
sort
keys
%
ext_functions
)
{
foreach
(
sort
keys
%
ext_functions
)
{
my
$func_ref
=
$ext_functions
{
$_
};
my
$func_ref
=
$ext_functions
{
$_
};
print
EXT
" { \"$func_ref->[0]\", \"$func_ref->[3]\", (void *) wine_$func_ref->[0], (void **) (&$ext_prefix$func_ref->[0]) }"
;
if
(
$func_ref
->
[
0
]
eq
$func_ref
->
[
3
])
{
print
EXT
" { \"$func_ref->[0]\", NULL, (void *) wine_$func_ref->[0], (void **) &$ext_prefix$func_ref->[0] }"
;
}
else
{
print
EXT
" { \"$func_ref->[0]\", \"$func_ref->[3]\", (void *) wine_$func_ref->[0], (void **) &$ext_prefix$func_ref->[0] }"
;
}
if
(
$i
!=
$#tmp
)
{
if
(
$i
!=
$#tmp
)
{
print
EXT
","
;
print
EXT
","
;
}
}
...
...
dlls/opengl32/opengl_ext.c
View file @
3e68508e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
dlls/opengl32/wgl.c
View file @
3e68508e
...
@@ -458,8 +458,9 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
...
@@ -458,8 +458,9 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
return
ret
;
return
ret
;
}
}
}
else
{
}
else
{
const
char
*
glx_name
=
ext_ret
->
glx_name
?
ext_ret
->
glx_name
:
ext_ret
->
name
;
ENTER_GL
();
ENTER_GL
();
local_func
=
p_glXGetProcAddressARB
(
(
const
GLubyte
*
)
ext_ret
->
glx_name
);
local_func
=
p_glXGetProcAddressARB
(
(
const
GLubyte
*
)
glx_name
);
LEAVE_GL
();
LEAVE_GL
();
/* After that, look at the extensions defined in the Linux OpenGL library */
/* After that, look at the extensions defined in the Linux OpenGL library */
...
@@ -474,15 +475,15 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
...
@@ -474,15 +475,15 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) {
OpenGL drivers (moreover, it is only useful for old 1.0 apps
OpenGL drivers (moreover, it is only useful for old 1.0 apps
that query the glBindTextureEXT extension).
that query the glBindTextureEXT extension).
*/
*/
memcpy
(
buf
,
ext_ret
->
glx_name
,
strlen
(
ext_ret
->
glx_name
)
-
3
);
memcpy
(
buf
,
glx_name
,
strlen
(
glx_name
)
-
3
);
buf
[
strlen
(
ext_ret
->
glx_name
)
-
3
]
=
'\0'
;
buf
[
strlen
(
glx_name
)
-
3
]
=
'\0'
;
TRACE
(
" extension not found in the Linux OpenGL library, checking against libGL bug with %s..
\n
"
,
buf
);
TRACE
(
" extension not found in the Linux OpenGL library, checking against libGL bug with %s..
\n
"
,
buf
);
ret
=
GetProcAddress
(
opengl32_handle
,
buf
);
ret
=
GetProcAddress
(
opengl32_handle
,
buf
);
if
(
ret
!=
NULL
)
{
if
(
ret
!=
NULL
)
{
TRACE
(
" found function in main OpenGL library (%p) !
\n
"
,
ret
);
TRACE
(
" found function in main OpenGL library (%p) !
\n
"
,
ret
);
}
else
{
}
else
{
WARN
(
"Did not find function %s (%s) in your OpenGL library !
\n
"
,
lpszProc
,
ext_ret
->
glx_name
);
WARN
(
"Did not find function %s (%s) in your OpenGL library !
\n
"
,
lpszProc
,
glx_name
);
}
}
return
ret
;
return
ret
;
...
...
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