Skip to content

W
wine-winehq
Commit 2480c939 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

opengl32: Get rid of wine_ prefix on generated functions.

parent a3d89689
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 43 deletions
dlls/opengl32/make_opengl
View file @ 2480c939
......@@ -257,7 +257,7 @@ sub GenerateThunk($$$$)
$ret = "$ret * $name (OPENGL32.\@)\n";
$ret = "$ret */\n";
}
$ret = $ret . ConvertType($func_ref->[0]) . " WINAPI wine_$name( ";
$ret = $ret . ConvertType($func_ref->[0]) . " WINAPI $name( ";
for (my $i = 0; $i < @{$func_ref->[1]}; $i++) {
## Quick debug code :-)
## print $func_ref->[1]->[$i]->[1] . "\n";
......@@ -374,13 +374,6 @@ sub get_func_proto($$$)
return $ret;
}
sub get_func_link_name($$)
{
my ($name, $func) = @_;
return $name if ($func->[2] =~ /^WGL_/);
return "wine_$name";
}
#
# Extract and checks the number of arguments
#
......@@ -885,44 +878,45 @@ close HEADER;
open(SPEC, ">$spec_file");
foreach (sort keys %norm_functions) {
print SPEC "@ stdcall $_( ";
my $args=" ";
for (my $i = 0; $i < @{$norm_functions{$_}->[1]}; $i++) {
my $type = $norm_functions{$_}->[1]->[$i]->[0];
if ($type =~ /\*/) {
print SPEC "ptr ";
$args .= "ptr ";
} elsif (defined($arg_conv{$type})) {
print SPEC "$@$arg_conv{$type}[0] ";
$args .= "$@$arg_conv{$type}[0] ";
} else {
die "No conversion for GL type $type...\n";
}
}
print SPEC ") wine_$_\n";
$args = substr($args,1,-1);
print SPEC "@ stdcall $_($args)\n";
}
print SPEC "@ stdcall wglChoosePixelFormat(long ptr)
@ stdcall wglCopyContext(long long long)
@ stdcall wglCreateContext(long)
@ stdcall wglCreateLayerContext(long long)
@ stdcall wglDeleteContext(long)
@ stdcall wglDescribeLayerPlane(long long long long ptr)
@ stdcall wglDescribePixelFormat(long long long ptr)
@ stdcall wglGetCurrentContext()
@ stdcall wglGetCurrentDC()
@ stub wglGetDefaultProcAddress
@ stdcall wglGetLayerPaletteEntries(long long long long ptr)
@ stdcall wglGetPixelFormat(long)
@ stdcall wglGetProcAddress(str)
@ stdcall wglMakeCurrent(long long)
@ stdcall wglRealizeLayerPalette(long long long)
@ stdcall wglSetLayerPaletteEntries(long long long long ptr)
@ stdcall wglSetPixelFormat(long long ptr)
@ stdcall wglShareLists(long long)
@ stdcall wglSwapBuffers(long)
@ stdcall wglSwapLayerBuffers(long long)
@ stdcall wglUseFontBitmapsA(long long long long)
@ stdcall wglUseFontBitmapsW(long long long long)
@ stdcall wglUseFontOutlinesA(long long long long long long long ptr)
@ stdcall wglUseFontOutlinesW(long long long long long long long ptr)
print SPEC "@ stdcall wglChoosePixelFormat(long ptr)
@ stdcall wglCopyContext(long long long)
@ stdcall wglCreateContext(long)
@ stdcall wglCreateLayerContext(long long)
@ stdcall wglDeleteContext(long)
@ stdcall wglDescribeLayerPlane(long long long long ptr)
@ stdcall wglDescribePixelFormat(long long long ptr)
@ stdcall wglGetCurrentContext()
@ stdcall wglGetCurrentDC()
@ stub wglGetDefaultProcAddress
@ stdcall wglGetLayerPaletteEntries(long long long long ptr)
@ stdcall wglGetPixelFormat(long)
@ stdcall wglGetProcAddress(str)
@ stdcall wglMakeCurrent(long long)
@ stdcall wglRealizeLayerPalette(long long long)
@ stdcall wglSetLayerPaletteEntries(long long long long ptr)
@ stdcall wglSetPixelFormat(long long ptr)
@ stdcall wglShareLists(long long)
@ stdcall wglSwapBuffers(long)
@ stdcall wglSwapLayerBuffers(long long)
@ stdcall wglUseFontBitmapsA(long long long long)
@ stdcall wglUseFontBitmapsW(long long long long)
@ stdcall wglUseFontOutlinesA(long long long long long long long ptr)
@ stdcall wglUseFontOutlinesW(long long long long long long long ptr)
";
close(SPEC);
......@@ -1005,8 +999,7 @@ print EXT "\nconst OpenGL_extension extension_registry[$count] = {\n";
my $i = 0;
foreach (sort keys %ext_functions) {
my $func_ref = $ext_functions{$_};
my $link_name = get_func_link_name( $_, $func_ref );
print EXT " { \"$_\", \"$func_ref->[2]\", $link_name }";
print EXT " { \"$_\", \"$func_ref->[2]\", $_ }";
if ($i != $count-1) {
print EXT ",";
}
......
dlls/opengl32/opengl_ext.c
View file @ 2480c939
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/opengl32/opengl_norm.c
View file @ 2480c939
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/opengl32/wgl.c
View file @ 2480c939
......@@ -47,8 +47,6 @@ static HMODULE opengl32_handle;
extern struct opengl_funcs null_opengl_funcs;
const GLubyte * WINAPI wine_glGetString( GLenum name );
/* handle management */
#define MAX_WGL_HANDLES 1024
......@@ -691,7 +689,7 @@ static int compar(const void *elt_a, const void *elt_b) {
static BOOL is_extension_supported(const char* extension)
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
const char *gl_ext_string = (const char*)wine_glGetString(GL_EXTENSIONS);
const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS);
TRACE("Checking for extension '%s'\n", extension);
......@@ -1624,7 +1622,7 @@ BOOL WINAPI wglUseFontOutlinesW(HDC hdc,
/***********************************************************************
* glDebugEntry (OPENGL32.@)
*/
GLint WINAPI wine_glDebugEntry( GLint unknown1, GLint unknown2 )
GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 )
{
return 0;
}
......@@ -1692,7 +1690,7 @@ static GLubyte *filter_extensions( const char *extensions )
/***********************************************************************
* glGetString (OPENGL32.@)
*/
const GLubyte * WINAPI wine_glGetString( GLenum name )
const GLubyte * WINAPI glGetString( GLenum name )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
const GLubyte *ret = funcs->gl.p_glGetString( name );
......
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