Commit 9ac8ba15 authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard

Upgrade OpenGL thunks with latest version of OpenGL extension

registry.
parent 7614f27f
...@@ -107,6 +107,9 @@ $gen_traces = 1; ...@@ -107,6 +107,9 @@ $gen_traces = 1;
"GLubyte" => "%d", "GLubyte" => "%d",
"GLuint" => "%d", "GLuint" => "%d",
"GLushort" => "%d", "GLushort" => "%d",
"GLhalfNV" => "%d",
"GLintptrARB" => "%d",
"GLsizeiptrARB" => "%d",
"GLvoid" => "(void)", "GLvoid" => "(void)",
"_GLfuncptr" => "%p"); "_GLfuncptr" => "%p");
...@@ -130,6 +133,9 @@ $gen_traces = 1; ...@@ -130,6 +133,9 @@ $gen_traces = 1;
"GLubyte" => [ "long", 4 ], "GLubyte" => [ "long", 4 ],
"GLuint" => [ "long", 4 ], "GLuint" => [ "long", 4 ],
"GLushort" => [ "long", 4 ], "GLushort" => [ "long", 4 ],
"GLhalfNV" => [ "long", 4 ],
"GLintptrARB" => [ "long", 4 ],
"GLsizeiptrARB" => [ "long", 4 ],
"GLvoid" => [ "void", 4 ], "GLvoid" => [ "void", 4 ],
"_GLfuncptr" => [ "ptr", 4 ]); "_GLfuncptr" => [ "ptr", 4 ]);
...@@ -230,8 +236,10 @@ open(REGISTRY, $registry_path . "/gl.spec") || die "Could not open 'gl.spec'. Pl ...@@ -230,8 +236,10 @@ open(REGISTRY, $registry_path . "/gl.spec") || die "Could not open 'gl.spec'. Pl
# #
%pseudo_to_opengl = (); %pseudo_to_opengl = ();
while ($line = <TYPES>) { while ($line = <TYPES>) {
($pseudo, $opengl) = ($line =~ /(\w*),\*,\*,\s*(.*),\*,\*/); if ($line !~ /\w*\#/) {
$pseudo_to_opengl{$pseudo} = $opengl; ($pseudo, $opengl) = ($line =~ /(\w*),\*,\*,\s*(.*),\*,\*/);
$pseudo_to_opengl{$pseudo} = $opengl;
}
} }
# This is to override the 'void' -> '*' bogus conversion # This is to override the 'void' -> '*' bogus conversion
$pseudo_to_opengl{"void"} = "void"; $pseudo_to_opengl{"void"} = "void";
...@@ -595,6 +603,10 @@ typedef const GLubyte * GLstring; ...@@ -595,6 +603,10 @@ typedef const GLubyte * GLstring;
WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DEFAULT_DEBUG_CHANNEL(opengl);
typedef ptrdiff_t GLintptrARB;
typedef ptrdiff_t GLsizeiptrARB;
typedef unsigned short GLhalfNV;
"; ";
# First, generate the function pointers # First, generate the function pointers
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment