Module: wine Branch: master Commit: c9d4aec1ae39c3971ebfdc066cd793cffae9a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d4aec1ae39c3971ebfdc066c...
Author: Roderick Colenbrander thunderbird2k@gmx.net Date: Fri Aug 17 19:22:12 2007 +0200
opengl32: Fix some gl type bugs.
---
dlls/opengl32/make_opengl | 34 ++++++++-------------------------- dlls/opengl32/opengl_ext.c | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 97a12f4..aff30fb 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -6,12 +6,16 @@ use strict; # make_opengl path_to_spec_file opengl_version # # - path_to_spec_file is the path to the directory where the OpenGL -# spec files are located. These files are part of the OpenGL -# sample implementation CVS tree and are located in +# spec files are located. These files are hosted in the OpenGL +# extension registry at opengl.org: +# http://www.opengl.org/registry/api/gl.spec +# http://www.opengl.org/registry/api/gl.tm +# +# The files used to be hosted and maintained by SGI. You can still find +# find them in the sample implementation CVS tree which is located at # CVS_ROOT/projects/ogl-sample/main/doc/registry/specs. -# You can find them on the web at the following URL : +# You can also find them on the web at the following URL : # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry/... -# You will need gl.tm and gl.spec. # # - opengl_version is the OpenGL version emulated by the library # (can be 1.0 to 1.5). @@ -324,28 +328,6 @@ while (my $line = <TYPES>) { } # This is to override the 'void' -> '*' bogus conversion $pseudo_to_opengl{"void"} = "void"; -$pseudo_to_opengl{"Int64EXT"} = "INT64"; -$pseudo_to_opengl{"UInt64EXT"} = "UINT64"; -$pseudo_to_opengl{"BufferAccessARB"} = "GLenum"; -$pseudo_to_opengl{"BufferOffsetARB"} = "GLintptr"; -$pseudo_to_opengl{"BufferOffset"} = "GLintptr"; -$pseudo_to_opengl{"BufferPNameARB"} = "GLenum"; -$pseudo_to_opengl{"BufferPointerNameARB"} = "GLenum"; -$pseudo_to_opengl{"BufferSizeARB"} = "GLsizeiptr"; -$pseudo_to_opengl{"BufferSize"} = "GLsizeiptr"; -$pseudo_to_opengl{"BufferTargetARB"} = "GLenum"; -$pseudo_to_opengl{"BufferUsageARB"} = "GLenum"; -$pseudo_to_opengl{"FramebufferAttachment"} = "GLenum"; -$pseudo_to_opengl{"FramebufferTarget"} = "GLenum"; -$pseudo_to_opengl{"ProgramParameterPName"} = "GLenum"; -$pseudo_to_opengl{"ProgramTarget"} = "GLenum"; -$pseudo_to_opengl{"RenderbufferTarget"} = "GLenum"; -$pseudo_to_opengl{"VertexAttribEnum"} = "GLenum"; -# This is a bug in the spec file... -$pseudo_to_opengl{"FfdTargetSGIX"} = "GLint"; -$pseudo_to_opengl{"FfdMaskSGIX"} = "GLint"; -$pseudo_to_opengl{"IglooFunctionSelectSGIX"} = "GLint"; -$pseudo_to_opengl{"IglooParameterSGIX"} = "GLint";
# # Then, create the list of all OpenGL functions using the 'gl.spec' diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 1c5c39b..fc638f7 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -1173,24 +1173,24 @@ static void WINAPI wine_glCurrentPaletteMatrixARB( GLint index ) { LEAVE_GL(); }
-static void WINAPI wine_glDeformSGIX( GLint mask ) { - void (*func_glDeformSGIX)( GLint ) = extension_funcs[142]; +static void WINAPI wine_glDeformSGIX( GLbitfield mask ) { + void (*func_glDeformSGIX)( GLbitfield ) = extension_funcs[142]; TRACE("(%d)\n", mask ); ENTER_GL(); func_glDeformSGIX( mask ); LEAVE_GL(); }
-static void WINAPI wine_glDeformationMap3dSGIX( GLint target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, GLdouble* points ) { - void (*func_glDeformationMap3dSGIX)( GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble* ) = extension_funcs[143]; +static void WINAPI wine_glDeformationMap3dSGIX( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, GLdouble* points ) { + void (*func_glDeformationMap3dSGIX)( GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble* ) = extension_funcs[143]; TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); ENTER_GL(); func_glDeformationMap3dSGIX( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); LEAVE_GL(); }
-static void WINAPI wine_glDeformationMap3fSGIX( GLint target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, GLfloat* points ) { - void (*func_glDeformationMap3fSGIX)( GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat* ) = extension_funcs[144]; +static void WINAPI wine_glDeformationMap3fSGIX( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, GLfloat* points ) { + void (*func_glDeformationMap3fSGIX)( GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat* ) = extension_funcs[144]; TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); ENTER_GL(); func_glDeformationMap3fSGIX( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); @@ -3001,8 +3001,8 @@ static void WINAPI wine_glGetProgramivNV( GLuint id, GLenum pname, GLint* params LEAVE_GL(); }
-static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, INT64* params ) { - void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, INT64* ) = extension_funcs[368]; +static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, GLint64EXT* params ) { + void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, GLint64EXT* ) = extension_funcs[368]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjecti64vEXT( id, pname, params ); @@ -3025,8 +3025,8 @@ static void WINAPI wine_glGetQueryObjectivARB( GLuint id, GLenum pname, GLint* p LEAVE_GL(); }
-static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, UINT64* params ) { - void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, UINT64* ) = extension_funcs[371]; +static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, GLuint64EXT* params ) { + void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, GLuint64EXT* ) = extension_funcs[371]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjectui64vEXT( id, pname, params ); @@ -3523,8 +3523,8 @@ static void WINAPI wine_glHistogramEXT( GLenum target, GLsizei width, GLenum int LEAVE_GL(); }
-static void WINAPI wine_glIglooInterfaceSGIX( GLint pname, GLint* params ) { - void (*func_glIglooInterfaceSGIX)( GLint, GLint* ) = extension_funcs[432]; +static void WINAPI wine_glIglooInterfaceSGIX( GLenum pname, GLvoid* params ) { + void (*func_glIglooInterfaceSGIX)( GLenum, GLvoid* ) = extension_funcs[432]; TRACE("(%d, %p)\n", pname, params ); ENTER_GL(); func_glIglooInterfaceSGIX( pname, params ); @@ -3857,8 +3857,8 @@ static void WINAPI wine_glListParameterivSGIX( GLuint list, GLenum pname, GLint* LEAVE_GL(); }
-static void WINAPI wine_glLoadIdentityDeformationMapSGIX( GLint mask ) { - void (*func_glLoadIdentityDeformationMapSGIX)( GLint ) = extension_funcs[469]; +static void WINAPI wine_glLoadIdentityDeformationMapSGIX( GLbitfield mask ) { + void (*func_glLoadIdentityDeformationMapSGIX)( GLbitfield ) = extension_funcs[469]; TRACE("(%d)\n", mask ); ENTER_GL(); func_glLoadIdentityDeformationMapSGIX( mask );