reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

opengl32: Sync with latest GL specs.

Browse Source
This commit is contained in:
Roderick Colenbrander 2012-06-07 23:18:21 -07:00 committed by Alexandre Julliard
parent 7123e44176
commit 29346f28ae
3 changed files with 959 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/opengl32/make_opengl
View File

@ -561,7 +561,7 @@ while (my $line = <REGISTRY>) {
die "Missing 'category' line in function $funcname.\n"; die "Missing 'category' line in function $funcname.\n";
} }
last; last;
} elsif ($line =~ /\t*return\t*(\w*)/) { } elsif ($line =~ /\t*return\t+(\w*)/) {
($ret_type) = ($line =~ /\t*return\s*(\w*)/); ($ret_type) = ($line =~ /\t*return\s*(\w*)/);
$ret_type = $pseudo_to_opengl{$ret_type}; $ret_type = $pseudo_to_opengl{$ret_type};
unless (defined($ret_type)) { unless (defined($ret_type)) {
@ -659,28 +659,28 @@ foreach (sort keys %norm_functions) {
print SPEC ") wine_$func_name\n"; print SPEC ") wine_$func_name\n";
} }
print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat print SPEC "@ stdcall wglChoosePixelFormat(long ptr)
@ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCopyContext(long long long)
@ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateContext(long)
@ stdcall wglCreateLayerContext(long long) @ stdcall wglCreateLayerContext(long long)
@ stdcall wglDeleteContext(long) gdi32.wglDeleteContext @ stdcall wglDeleteContext(long)
@ stdcall wglDescribeLayerPlane(long long long long ptr) @ stdcall wglDescribeLayerPlane(long long long long ptr)
@ stdcall wglDescribePixelFormat(long long long ptr) gdi32.DescribePixelFormat @ stdcall wglDescribePixelFormat(long long long ptr)
@ stdcall wglGetCurrentContext() gdi32.wglGetCurrentContext @ stdcall wglGetCurrentContext()
@ stdcall wglGetCurrentDC() gdi32.wglGetCurrentDC @ stdcall wglGetCurrentDC()
@ stub wglGetDefaultProcAddress @ stub wglGetDefaultProcAddress
@ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetLayerPaletteEntries(long long long long ptr)
@ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat @ stdcall wglGetPixelFormat(long)
@ stdcall wglGetProcAddress(str) @ stdcall wglGetProcAddress(str)
@ stdcall wglMakeCurrent(long long) gdi32.wglMakeCurrent @ stdcall wglMakeCurrent(long long)
@ stdcall wglRealizeLayerPalette(long long long) @ stdcall wglRealizeLayerPalette(long long long)
@ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetLayerPaletteEntries(long long long long ptr)
@ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat @ stdcall wglSetPixelFormat(long long ptr)
@ stdcall wglShareLists(long long) gdi32.wglShareLists @ stdcall wglShareLists(long long)
@ stdcall wglSwapBuffers(long) @ stdcall wglSwapBuffers(long)
@ stdcall wglSwapLayerBuffers(long long) @ stdcall wglSwapLayerBuffers(long long)
@ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA @ stdcall wglUseFontBitmapsA(long long long long)
@ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW @ stdcall wglUseFontBitmapsW(long long long long)
@ stdcall wglUseFontOutlinesA(long long long long long long long ptr) @ stdcall wglUseFontOutlinesA(long long long long long long long ptr)
@ stdcall wglUseFontOutlinesW(long long long long long long long ptr) @ stdcall wglUseFontOutlinesW(long long long long long long long ptr)
"; ";

976
dlls/opengl32/opengl_ext.c
View File

File diff suppressed because it is too large Load Diff

10
dlls/opengl32/opengl_norm.c
View File

@ -20,7 +20,7 @@ void WINAPI wine_glAccum( GLenum op, GLfloat value ) {
/*********************************************************************** /***********************************************************************
* glAlphaFunc (OPENGL32.@) * glAlphaFunc (OPENGL32.@)
*/ */
void WINAPI wine_glAlphaFunc( GLenum func, GLclampf ref ) { void WINAPI wine_glAlphaFunc( GLenum func, GLfloat ref ) {
TRACE("(%d, %f)\n", func, ref ); TRACE("(%d, %f)\n", func, ref );
ENTER_GL(); ENTER_GL();
glAlphaFunc( func, ref ); glAlphaFunc( func, ref );
@ -132,7 +132,7 @@ void WINAPI wine_glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat
/*********************************************************************** /***********************************************************************
* glClearColor (OPENGL32.@) * 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 ); TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
ENTER_GL(); ENTER_GL();
glClearColor( red, green, blue, alpha ); glClearColor( red, green, blue, alpha );
@ -142,7 +142,7 @@ void WINAPI wine_glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLcl
/*********************************************************************** /***********************************************************************
* glClearDepth (OPENGL32.@) * glClearDepth (OPENGL32.@)
*/ */
void WINAPI wine_glClearDepth( GLclampd depth ) { void WINAPI wine_glClearDepth( GLdouble depth ) {
TRACE("(%f)\n", depth ); TRACE("(%f)\n", depth );
ENTER_GL(); ENTER_GL();
glClearDepth( depth ); glClearDepth( depth );
@ -632,7 +632,7 @@ void WINAPI wine_glDepthMask( GLboolean flag ) {
/*********************************************************************** /***********************************************************************
* glDepthRange (OPENGL32.@) * glDepthRange (OPENGL32.@)
*/ */
void WINAPI wine_glDepthRange( GLclampd nearParam, GLclampd farParam ) { void WINAPI wine_glDepthRange( GLdouble nearParam, GLdouble farParam ) {
TRACE("(%f, %f)\n", nearParam, farParam ); TRACE("(%f, %f)\n", nearParam, farParam );
ENTER_GL(); ENTER_GL();
glDepthRange( nearParam, farParam ); glDepthRange( nearParam, farParam );
@ -2052,7 +2052,7 @@ void WINAPI wine_glPopName( void ) {
/*********************************************************************** /***********************************************************************
* glPrioritizeTextures (OPENGL32.@) * 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 ); TRACE("(%d, %p, %p)\n", n, textures, priorities );
ENTER_GL(); ENTER_GL();
glPrioritizeTextures( n, textures, priorities ); glPrioritizeTextures( n, textures, priorities );