Roderick Colenbrander : opengl32: Don't use 64bit gl types.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Aug 20 16:08:56 CDT 2007


Module: wine
Branch: master
Commit: 0dde222bc574f3c0ea31cd63e5896dd5bb1056b8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0dde222bc574f3c0ea31cd63e5896dd5bb1056b8

Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date:   Mon Aug 20 18:04:40 2007 +0200

opengl32: Don't use 64bit gl types.

---

 dlls/opengl32/make_opengl  |    2 ++
 dlls/opengl32/opengl_ext.c |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index aff30fb..381b1a9 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -328,6 +328,8 @@ 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";
 
 #
 # 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 fc638f7..fc870ee 100644
--- a/dlls/opengl32/opengl_ext.c
+++ b/dlls/opengl32/opengl_ext.c
@@ -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, GLint64EXT* params ) {
-  void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, GLint64EXT* ) = extension_funcs[368];
+static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, INT64* params ) {
+  void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, INT64* ) = 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, GLuint64EXT* params ) {
-  void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, GLuint64EXT* ) = extension_funcs[371];
+static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, UINT64* params ) {
+  void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, UINT64* ) = extension_funcs[371];
   TRACE("(%d, %d, %p)\n", id, pname, params );
   ENTER_GL();
   func_glGetQueryObjectui64vEXT( id, pname, params );




More information about the wine-cvs mailing list