Commit 29346f28 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

opengl32: Sync with latest GL specs.

parent 7123e441
......@@ -561,7 +561,7 @@ while (my $line = <REGISTRY>) {
die "Missing 'category' line in function $funcname.\n";
}
last;
} elsif ($line =~ /\t*return\t*(\w*)/) {
} elsif ($line =~ /\t*return\t+(\w*)/) {
($ret_type) = ($line =~ /\t*return\s*(\w*)/);
$ret_type = $pseudo_to_opengl{$ret_type};
unless (defined($ret_type)) {
......@@ -659,28 +659,28 @@ foreach (sort keys %norm_functions) {
print SPEC ") wine_$func_name\n";
}
print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat
@ stdcall wglCopyContext(long long long) gdi32.wglCopyContext
@ stdcall wglCreateContext(long) gdi32.wglCreateContext
print SPEC "@ stdcall wglChoosePixelFormat(long ptr)
@ stdcall wglCopyContext(long long long)
@ stdcall wglCreateContext(long)
@ stdcall wglCreateLayerContext(long long)
@ stdcall wglDeleteContext(long) gdi32.wglDeleteContext
@ stdcall wglDeleteContext(long)
@ stdcall wglDescribeLayerPlane(long long long long ptr)
@ stdcall wglDescribePixelFormat(long long long ptr) gdi32.DescribePixelFormat
@ stdcall wglGetCurrentContext() gdi32.wglGetCurrentContext
@ stdcall wglGetCurrentDC() gdi32.wglGetCurrentDC
@ stdcall wglDescribePixelFormat(long long long ptr)
@ stdcall wglGetCurrentContext()
@ stdcall wglGetCurrentDC()
@ stub wglGetDefaultProcAddress
@ stdcall wglGetLayerPaletteEntries(long long long long ptr)
@ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat
@ stdcall wglGetPixelFormat(long)
@ stdcall wglGetProcAddress(str)
@ stdcall wglMakeCurrent(long long) gdi32.wglMakeCurrent
@ stdcall wglMakeCurrent(long long)
@ stdcall wglRealizeLayerPalette(long long long)
@ stdcall wglSetLayerPaletteEntries(long long long long ptr)
@ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat
@ stdcall wglShareLists(long long) gdi32.wglShareLists
@ stdcall wglSetPixelFormat(long long ptr)
@ stdcall wglShareLists(long long)
@ stdcall wglSwapBuffers(long)
@ stdcall wglSwapLayerBuffers(long long)
@ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA
@ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW
@ 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)
";
......
......@@ -20,7 +20,7 @@ void WINAPI wine_glAccum( GLenum op, GLfloat value ) {
/***********************************************************************
* glAlphaFunc (OPENGL32.@)
*/
void WINAPI wine_glAlphaFunc( GLenum func, GLclampf ref ) {
void WINAPI wine_glAlphaFunc( GLenum func, GLfloat ref ) {
TRACE("(%d, %f)\n", func, ref );
ENTER_GL();
glAlphaFunc( func, ref );
......@@ -132,7 +132,7 @@ void WINAPI wine_glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat
/***********************************************************************
* glClearColor (OPENGL32.@)
*/
void WINAPI wine_glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) {
void WINAPI wine_glClearColor( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) {
TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
ENTER_GL();
glClearColor( red, green, blue, alpha );
......@@ -142,7 +142,7 @@ void WINAPI wine_glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLcl
/***********************************************************************
* glClearDepth (OPENGL32.@)
*/
void WINAPI wine_glClearDepth( GLclampd depth ) {
void WINAPI wine_glClearDepth( GLdouble depth ) {
TRACE("(%f)\n", depth );
ENTER_GL();
glClearDepth( depth );
......@@ -632,7 +632,7 @@ void WINAPI wine_glDepthMask( GLboolean flag ) {
/***********************************************************************
* glDepthRange (OPENGL32.@)
*/
void WINAPI wine_glDepthRange( GLclampd nearParam, GLclampd farParam ) {
void WINAPI wine_glDepthRange( GLdouble nearParam, GLdouble farParam ) {
TRACE("(%f, %f)\n", nearParam, farParam );
ENTER_GL();
glDepthRange( nearParam, farParam );
......@@ -2052,7 +2052,7 @@ void WINAPI wine_glPopName( void ) {
/***********************************************************************
* glPrioritizeTextures (OPENGL32.@)
*/
void WINAPI wine_glPrioritizeTextures( GLsizei n, GLuint* textures, GLclampf* priorities ) {
void WINAPI wine_glPrioritizeTextures( GLsizei n, GLuint* textures, GLfloat* priorities ) {
TRACE("(%d, %p, %p)\n", n, textures, priorities );
ENTER_GL();
glPrioritizeTextures( n, textures, priorities );
......
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