From a56c5b185e1817232f3edd3469ff885d26b91b9f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 7 Nov 2012 18:06:42 +0100 Subject: [PATCH] opengl32: Don't substitute OpenGL types that are already defined in wgl.h. --- dlls/opengl32/make_opengl | 11 +- dlls/opengl32/opengl_ext.c | 334 +++++++++++++++++------------------ dlls/opengl32/opengl_norm.c | 334 +++++++++++++++++------------------ include/wine/wgl_driver.h | 336 ++++++++++++++++++------------------ 4 files changed, 503 insertions(+), 512 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7d96653464d..6ed2107d51d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -196,16 +196,7 @@ sub ConvertType($) { my ($type) = @_; - my %hash = ( "GLstring" => "const GLubyte *", - "GLintptrARB" => "INT_PTR", - "GLsizeiptrARB" => "INT_PTR", - "GLintptr" => "INT_PTR", - "GLsizeiptr" => "INT_PTR", - "GLhandleARB" => "unsigned int", - "GLcharARB" => "char", - "GLchar" => "char", - "GLhalfNV" => "unsigned short", - "GLvdpauSurfaceNV" => "INT_PTR", + my %hash = ( "struct _cl_context" => "void", "struct _cl_event" => "void", "HGLRC" => "struct wgl_context *", diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index f7e258ab020..22b6732c421 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -46,7 +46,7 @@ static void WINAPI wine_glActiveTextureARB( GLenum texture ) { funcs->ext.p_glActiveTextureARB( texture ); } -static void WINAPI wine_glActiveVaryingNV( GLuint program, const char* name ) { +static void WINAPI wine_glActiveVaryingNV( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); funcs->ext.p_glActiveVaryingNV( program, name ); @@ -106,7 +106,7 @@ static void WINAPI wine_glAsyncMarkerSGIX( GLuint marker ) { funcs->ext.p_glAsyncMarkerSGIX( marker ); } -static void WINAPI wine_glAttachObjectARB( unsigned int containerObj, unsigned int obj ) { +static void WINAPI wine_glAttachObjectARB( GLhandleARB containerObj, GLhandleARB obj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", containerObj, obj ); funcs->ext.p_glAttachObjectARB( containerObj, obj ); @@ -196,13 +196,13 @@ static void WINAPI wine_glBeginVideoCaptureNV( GLuint video_capture_slot ) { funcs->ext.p_glBeginVideoCaptureNV( video_capture_slot ); } -static void WINAPI wine_glBindAttribLocation( GLuint program, GLuint index, const char* name ) { +static void WINAPI wine_glBindAttribLocation( GLuint program, GLuint index, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, index, name ); funcs->ext.p_glBindAttribLocation( program, index, name ); } -static void WINAPI wine_glBindAttribLocationARB( unsigned int programObj, GLuint index, const char* name ) { +static void WINAPI wine_glBindAttribLocationARB( GLhandleARB programObj, GLuint index, const GLcharARB* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", programObj, index, name ); funcs->ext.p_glBindAttribLocationARB( programObj, index, name ); @@ -238,49 +238,49 @@ static void WINAPI wine_glBindBufferBaseNV( GLenum target, GLuint index, GLuint funcs->ext.p_glBindBufferBaseNV( target, index, buffer ); } -static void WINAPI wine_glBindBufferOffsetEXT( GLenum target, GLuint index, GLuint buffer, INT_PTR offset ) { +static void WINAPI wine_glBindBufferOffsetEXT( GLenum target, GLuint index, GLuint buffer, GLintptr offset ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld)\n", target, index, buffer, offset ); funcs->ext.p_glBindBufferOffsetEXT( target, index, buffer, offset ); } -static void WINAPI wine_glBindBufferOffsetNV( GLenum target, GLuint index, GLuint buffer, INT_PTR offset ) { +static void WINAPI wine_glBindBufferOffsetNV( GLenum target, GLuint index, GLuint buffer, GLintptr offset ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld)\n", target, index, buffer, offset ); funcs->ext.p_glBindBufferOffsetNV( target, index, buffer, offset ); } -static void WINAPI wine_glBindBufferRange( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glBindBufferRange( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld, %ld)\n", target, index, buffer, offset, size ); funcs->ext.p_glBindBufferRange( target, index, buffer, offset, size ); } -static void WINAPI wine_glBindBufferRangeEXT( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glBindBufferRangeEXT( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld, %ld)\n", target, index, buffer, offset, size ); funcs->ext.p_glBindBufferRangeEXT( target, index, buffer, offset, size ); } -static void WINAPI wine_glBindBufferRangeNV( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glBindBufferRangeNV( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld, %ld)\n", target, index, buffer, offset, size ); funcs->ext.p_glBindBufferRangeNV( target, index, buffer, offset, size ); } -static void WINAPI wine_glBindFragDataLocation( GLuint program, GLuint color, const char* name ) { +static void WINAPI wine_glBindFragDataLocation( GLuint program, GLuint color, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, color, name ); funcs->ext.p_glBindFragDataLocation( program, color, name ); } -static void WINAPI wine_glBindFragDataLocationEXT( GLuint program, GLuint color, const char* name ) { +static void WINAPI wine_glBindFragDataLocationEXT( GLuint program, GLuint color, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, color, name ); funcs->ext.p_glBindFragDataLocationEXT( program, color, name ); } -static void WINAPI wine_glBindFragDataLocationIndexed( GLuint program, GLuint colorNumber, GLuint index, const char* name ) { +static void WINAPI wine_glBindFragDataLocationIndexed( GLuint program, GLuint colorNumber, GLuint index, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p)\n", program, colorNumber, index, name ); funcs->ext.p_glBindFragDataLocationIndexed( program, colorNumber, index, name ); @@ -418,7 +418,7 @@ static void WINAPI wine_glBindVertexArrayAPPLE( GLuint array ) { funcs->ext.p_glBindVertexArrayAPPLE( array ); } -static void WINAPI wine_glBindVertexBuffer( GLuint bindingindex, GLuint buffer, INT_PTR offset, GLsizei stride ) { +static void WINAPI wine_glBindVertexBuffer( GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %ld, %d)\n", bindingindex, buffer, offset, stride ); funcs->ext.p_glBindVertexBuffer( bindingindex, buffer, offset, stride ); @@ -430,7 +430,7 @@ static void WINAPI wine_glBindVertexShaderEXT( GLuint id ) { funcs->ext.p_glBindVertexShaderEXT( id ); } -static void WINAPI wine_glBindVideoCaptureStreamBufferNV( GLuint video_capture_slot, GLuint stream, GLenum frame_region, INT_PTR offset ) { +static void WINAPI wine_glBindVideoCaptureStreamBufferNV( GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld)\n", video_capture_slot, stream, frame_region, offset ); funcs->ext.p_glBindVideoCaptureStreamBufferNV( video_capture_slot, stream, frame_region, offset ); @@ -646,19 +646,19 @@ static void WINAPI wine_glBlitFramebufferEXT( GLint srcX0, GLint srcY0, GLint sr funcs->ext.p_glBlitFramebufferEXT( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ); } -static void WINAPI wine_glBufferAddressRangeNV( GLenum pname, GLuint index, UINT64 address, INT_PTR length ) { +static void WINAPI wine_glBufferAddressRangeNV( GLenum pname, GLuint index, UINT64 address, GLsizeiptr length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %s, %ld)\n", pname, index, wine_dbgstr_longlong(address), length ); funcs->ext.p_glBufferAddressRangeNV( pname, index, address, length ); } -static void WINAPI wine_glBufferData( GLenum target, INT_PTR size, const GLvoid* data, GLenum usage ) { +static void WINAPI wine_glBufferData( GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %p, %d)\n", target, size, data, usage ); funcs->ext.p_glBufferData( target, size, data, usage ); } -static void WINAPI wine_glBufferDataARB( GLenum target, INT_PTR size, const GLvoid* data, GLenum usage ) { +static void WINAPI wine_glBufferDataARB( GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %p, %d)\n", target, size, data, usage ); funcs->ext.p_glBufferDataARB( target, size, data, usage ); @@ -676,13 +676,13 @@ static GLuint WINAPI wine_glBufferRegionEnabled( void ) { return funcs->ext.p_glBufferRegionEnabled( ); } -static void WINAPI wine_glBufferSubData( GLenum target, INT_PTR offset, INT_PTR size, const GLvoid* data ) { +static void WINAPI wine_glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", target, offset, size, data ); funcs->ext.p_glBufferSubData( target, offset, size, data ); } -static void WINAPI wine_glBufferSubDataARB( GLenum target, INT_PTR offset, INT_PTR size, const GLvoid* data ) { +static void WINAPI wine_glBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", target, offset, size, data ); funcs->ext.p_glBufferSubDataARB( target, offset, size, data ); @@ -724,7 +724,7 @@ static void WINAPI wine_glClearBufferData( GLenum target, GLenum internalformat, funcs->ext.p_glClearBufferData( target, internalformat, format, type, data ); } -static void WINAPI wine_glClearBufferSubData( GLenum target, GLenum internalformat, INT_PTR offset, INT_PTR size, GLenum format, GLenum type, const void* data ) { +static void WINAPI wine_glClearBufferSubData( GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %ld, %ld, %d, %d, %p)\n", target, internalformat, offset, size, format, type, data ); funcs->ext.p_glClearBufferSubData( target, internalformat, offset, size, format, type, data ); @@ -784,7 +784,7 @@ static void WINAPI wine_glClearNamedBufferDataEXT( GLuint buffer, GLenum interna funcs->ext.p_glClearNamedBufferDataEXT( buffer, internalformat, format, type, data ); } -static void WINAPI wine_glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, INT_PTR offset, INT_PTR size, const void* data ) { +static void WINAPI wine_glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %ld, %ld, %p)\n", buffer, internalformat, format, type, offset, size, data ); funcs->ext.p_glClearNamedBufferSubDataEXT( buffer, internalformat, format, type, offset, size, data ); @@ -832,13 +832,13 @@ static void WINAPI wine_glColor3fVertex3fvSUN( const GLfloat* c, const GLfloat* funcs->ext.p_glColor3fVertex3fvSUN( c, v ); } -static void WINAPI wine_glColor3hNV( unsigned short red, unsigned short green, unsigned short blue ) { +static void WINAPI wine_glColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", red, green, blue ); funcs->ext.p_glColor3hNV( red, green, blue ); } -static void WINAPI wine_glColor3hvNV( const unsigned short* v ) { +static void WINAPI wine_glColor3hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glColor3hvNV( v ); @@ -856,13 +856,13 @@ static void WINAPI wine_glColor4fNormal3fVertex3fvSUN( const GLfloat* c, const G funcs->ext.p_glColor4fNormal3fVertex3fvSUN( c, n, v ); } -static void WINAPI wine_glColor4hNV( unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha ) { +static void WINAPI wine_glColor4hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha ); funcs->ext.p_glColor4hNV( red, green, blue, alpha ); } -static void WINAPI wine_glColor4hvNV( const unsigned short* v ) { +static void WINAPI wine_glColor4hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glColor4hvNV( v ); @@ -1072,13 +1072,13 @@ static void WINAPI wine_glCompileShader( GLuint shader ) { funcs->ext.p_glCompileShader( shader ); } -static void WINAPI wine_glCompileShaderARB( unsigned int shaderObj ) { +static void WINAPI wine_glCompileShaderARB( GLhandleARB shaderObj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", shaderObj ); funcs->ext.p_glCompileShaderARB( shaderObj ); } -static void WINAPI wine_glCompileShaderIncludeARB( GLuint shader, GLsizei count, const char** path, const GLint* length ) { +static void WINAPI wine_glCompileShaderIncludeARB( GLuint shader, GLsizei count, const GLchar** path, const GLint* length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", shader, count, path, length ); funcs->ext.p_glCompileShaderIncludeARB( shader, count, path, length ); @@ -1300,7 +1300,7 @@ static void WINAPI wine_glConvolutionParameterivEXT( GLenum target, GLenum pname funcs->ext.p_glConvolutionParameterivEXT( target, pname, params ); } -static void WINAPI wine_glCopyBufferSubData( GLenum readTarget, GLenum writeTarget, INT_PTR readOffset, INT_PTR writeOffset, INT_PTR size ) { +static void WINAPI wine_glCopyBufferSubData( GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %ld, %ld, %ld)\n", readTarget, writeTarget, readOffset, writeOffset, size ); funcs->ext.p_glCopyBufferSubData( readTarget, writeTarget, readOffset, writeOffset, size ); @@ -1498,7 +1498,7 @@ static GLuint WINAPI wine_glCreateProgram( void ) { return funcs->ext.p_glCreateProgram( ); } -static unsigned int WINAPI wine_glCreateProgramObjectARB( void ) { +static GLhandleARB WINAPI wine_glCreateProgramObjectARB( void ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("()\n"); return funcs->ext.p_glCreateProgramObjectARB( ); @@ -1510,19 +1510,19 @@ static GLuint WINAPI wine_glCreateShader( GLenum type ) { return funcs->ext.p_glCreateShader( type ); } -static unsigned int WINAPI wine_glCreateShaderObjectARB( GLenum shaderType ) { +static GLhandleARB WINAPI wine_glCreateShaderObjectARB( GLenum shaderType ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", shaderType ); return funcs->ext.p_glCreateShaderObjectARB( shaderType ); } -static GLuint WINAPI wine_glCreateShaderProgramEXT( GLenum type, const char* string ) { +static GLuint WINAPI wine_glCreateShaderProgramEXT( GLenum type, const GLchar* string ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", type, string ); return funcs->ext.p_glCreateShaderProgramEXT( type, string ); } -static GLuint WINAPI wine_glCreateShaderProgramv( GLenum type, GLsizei count, const char* const* strings ) { +static GLuint WINAPI wine_glCreateShaderProgramv( GLenum type, GLsizei count, const GLchar* const* strings ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", type, count, strings ); return funcs->ext.p_glCreateShaderProgramv( type, count, strings ); @@ -1588,19 +1588,19 @@ static void WINAPI wine_glDebugMessageEnableAMD( GLenum category, GLenum severit funcs->ext.p_glDebugMessageEnableAMD( category, severity, count, ids, enabled ); } -static void WINAPI wine_glDebugMessageInsert( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* buf ) { +static void WINAPI wine_glDebugMessageInsert( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %d, %p)\n", source, type, id, severity, length, buf ); funcs->ext.p_glDebugMessageInsert( source, type, id, severity, length, buf ); } -static void WINAPI wine_glDebugMessageInsertAMD( GLenum category, GLenum severity, GLuint id, GLsizei length, const char* buf ) { +static void WINAPI wine_glDebugMessageInsertAMD( GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %p)\n", category, severity, id, length, buf ); funcs->ext.p_glDebugMessageInsertAMD( category, severity, id, length, buf ); } -static void WINAPI wine_glDebugMessageInsertARB( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* buf ) { +static void WINAPI wine_glDebugMessageInsertARB( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %d, %p)\n", source, type, id, severity, length, buf ); funcs->ext.p_glDebugMessageInsertARB( source, type, id, severity, length, buf ); @@ -1678,7 +1678,7 @@ static void WINAPI wine_glDeleteFramebuffersEXT( GLsizei n, const GLuint* frameb funcs->ext.p_glDeleteFramebuffersEXT( n, framebuffers ); } -static void WINAPI wine_glDeleteNamedStringARB( GLint namelen, const char* name ) { +static void WINAPI wine_glDeleteNamedStringARB( GLint namelen, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", namelen, name ); funcs->ext.p_glDeleteNamedStringARB( namelen, name ); @@ -1690,7 +1690,7 @@ static void WINAPI wine_glDeleteNamesAMD( GLenum identifier, GLuint num, const G funcs->ext.p_glDeleteNamesAMD( identifier, num, names ); } -static void WINAPI wine_glDeleteObjectARB( unsigned int obj ) { +static void WINAPI wine_glDeleteObjectARB( GLhandleARB obj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", obj ); funcs->ext.p_glDeleteObjectARB( obj ); @@ -1858,7 +1858,7 @@ static void WINAPI wine_glDepthRangef( GLfloat n, GLfloat f ) { funcs->ext.p_glDepthRangef( n, f ); } -static void WINAPI wine_glDetachObjectARB( unsigned int containerObj, unsigned int attachedObj ) { +static void WINAPI wine_glDetachObjectARB( GLhandleARB containerObj, GLhandleARB attachedObj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", containerObj, attachedObj ); funcs->ext.p_glDetachObjectARB( containerObj, attachedObj ); @@ -1924,7 +1924,7 @@ static void WINAPI wine_glDispatchCompute( GLuint num_groups_x, GLuint num_group funcs->ext.p_glDispatchCompute( num_groups_x, num_groups_y, num_groups_z ); } -static void WINAPI wine_glDispatchComputeIndirect( INT_PTR indirect ) { +static void WINAPI wine_glDispatchComputeIndirect( GLintptr indirect ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%ld)\n", indirect ); funcs->ext.p_glDispatchComputeIndirect( indirect ); @@ -2326,19 +2326,19 @@ static void WINAPI wine_glFinishTextureSUNX( void ) { funcs->ext.p_glFinishTextureSUNX( ); } -static void WINAPI wine_glFlushMappedBufferRange( GLenum target, INT_PTR offset, INT_PTR length ) { +static void WINAPI wine_glFlushMappedBufferRange( GLenum target, GLintptr offset, GLsizeiptr length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld)\n", target, offset, length ); funcs->ext.p_glFlushMappedBufferRange( target, offset, length ); } -static void WINAPI wine_glFlushMappedBufferRangeAPPLE( GLenum target, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glFlushMappedBufferRangeAPPLE( GLenum target, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld)\n", target, offset, size ); funcs->ext.p_glFlushMappedBufferRangeAPPLE( target, offset, size ); } -static void WINAPI wine_glFlushMappedNamedBufferRangeEXT( GLuint buffer, INT_PTR offset, INT_PTR length ) { +static void WINAPI wine_glFlushMappedNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld)\n", buffer, offset, length ); funcs->ext.p_glFlushMappedNamedBufferRangeEXT( buffer, offset, length ); @@ -2440,13 +2440,13 @@ static void WINAPI wine_glFogCoordfvEXT( const GLfloat* coord ) { funcs->ext.p_glFogCoordfvEXT( coord ); } -static void WINAPI wine_glFogCoordhNV( unsigned short fog ) { +static void WINAPI wine_glFogCoordhNV( GLhalfNV fog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", fog ); funcs->ext.p_glFogCoordhNV( fog ); } -static void WINAPI wine_glFogCoordhvNV( const unsigned short* fog ) { +static void WINAPI wine_glFogCoordhvNV( const GLhalfNV* fog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", fog ); funcs->ext.p_glFogCoordhvNV( fog ); @@ -2866,25 +2866,25 @@ static void WINAPI wine_glGetActiveAtomicCounterBufferiv( GLuint program, GLuint funcs->ext.p_glGetActiveAtomicCounterBufferiv( program, bufferIndex, pname, params ); } -static void WINAPI wine_glGetActiveAttrib( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetActiveAttrib( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", program, index, bufSize, length, size, type, name ); funcs->ext.p_glGetActiveAttrib( program, index, bufSize, length, size, type, name ); } -static void WINAPI wine_glGetActiveAttribARB( unsigned int programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetActiveAttribARB( GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLcharARB* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", programObj, index, maxLength, length, size, type, name ); funcs->ext.p_glGetActiveAttribARB( programObj, index, maxLength, length, size, type, name ); } -static void WINAPI wine_glGetActiveSubroutineName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, char* name ) { +static void WINAPI wine_glGetActiveSubroutineName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %p, %p)\n", program, shadertype, index, bufsize, length, name ); funcs->ext.p_glGetActiveSubroutineName( program, shadertype, index, bufsize, length, name ); } -static void WINAPI wine_glGetActiveSubroutineUniformName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, char* name ) { +static void WINAPI wine_glGetActiveSubroutineUniformName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %p, %p)\n", program, shadertype, index, bufsize, length, name ); funcs->ext.p_glGetActiveSubroutineUniformName( program, shadertype, index, bufsize, length, name ); @@ -2896,19 +2896,19 @@ static void WINAPI wine_glGetActiveSubroutineUniformiv( GLuint program, GLenum s funcs->ext.p_glGetActiveSubroutineUniformiv( program, shadertype, index, pname, values ); } -static void WINAPI wine_glGetActiveUniform( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetActiveUniform( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", program, index, bufSize, length, size, type, name ); funcs->ext.p_glGetActiveUniform( program, index, bufSize, length, size, type, name ); } -static void WINAPI wine_glGetActiveUniformARB( unsigned int programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetActiveUniformARB( GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLcharARB* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", programObj, index, maxLength, length, size, type, name ); funcs->ext.p_glGetActiveUniformARB( programObj, index, maxLength, length, size, type, name ); } -static void WINAPI wine_glGetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, char* uniformBlockName ) { +static void WINAPI wine_glGetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p)\n", program, uniformBlockIndex, bufSize, length, uniformBlockName ); funcs->ext.p_glGetActiveUniformBlockName( program, uniformBlockIndex, bufSize, length, uniformBlockName ); @@ -2920,7 +2920,7 @@ static void WINAPI wine_glGetActiveUniformBlockiv( GLuint program, GLuint unifor funcs->ext.p_glGetActiveUniformBlockiv( program, uniformBlockIndex, pname, params ); } -static void WINAPI wine_glGetActiveUniformName( GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, char* uniformName ) { +static void WINAPI wine_glGetActiveUniformName( GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p)\n", program, uniformIndex, bufSize, length, uniformName ); funcs->ext.p_glGetActiveUniformName( program, uniformIndex, bufSize, length, uniformName ); @@ -2932,7 +2932,7 @@ static void WINAPI wine_glGetActiveUniformsiv( GLuint program, GLsizei uniformCo funcs->ext.p_glGetActiveUniformsiv( program, uniformCount, uniformIndices, pname, params ); } -static void WINAPI wine_glGetActiveVaryingNV( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetActiveVaryingNV( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", program, index, bufSize, length, size, type, name ); funcs->ext.p_glGetActiveVaryingNV( program, index, bufSize, length, size, type, name ); @@ -2950,7 +2950,7 @@ static void WINAPI wine_glGetArrayObjectivATI( GLenum array, GLenum pname, GLint funcs->ext.p_glGetArrayObjectivATI( array, pname, params ); } -static void WINAPI wine_glGetAttachedObjectsARB( unsigned int containerObj, GLsizei maxCount, GLsizei* count, unsigned int* obj ) { +static void WINAPI wine_glGetAttachedObjectsARB( GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB* obj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", containerObj, maxCount, count, obj ); funcs->ext.p_glGetAttachedObjectsARB( containerObj, maxCount, count, obj ); @@ -2962,13 +2962,13 @@ static void WINAPI wine_glGetAttachedShaders( GLuint program, GLsizei maxCount, funcs->ext.p_glGetAttachedShaders( program, maxCount, count, obj ); } -static GLint WINAPI wine_glGetAttribLocation( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetAttribLocation( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetAttribLocation( program, name ); } -static GLint WINAPI wine_glGetAttribLocationARB( unsigned int programObj, const char* name ) { +static GLint WINAPI wine_glGetAttribLocationARB( GLhandleARB programObj, const GLcharARB* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", programObj, name ); return funcs->ext.p_glGetAttribLocationARB( programObj, name ); @@ -3022,13 +3022,13 @@ static void WINAPI wine_glGetBufferPointervARB( GLenum target, GLenum pname, GLv funcs->ext.p_glGetBufferPointervARB( target, pname, params ); } -static void WINAPI wine_glGetBufferSubData( GLenum target, INT_PTR offset, INT_PTR size, GLvoid* data ) { +static void WINAPI wine_glGetBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", target, offset, size, data ); funcs->ext.p_glGetBufferSubData( target, offset, size, data ); } -static void WINAPI wine_glGetBufferSubDataARB( GLenum target, INT_PTR offset, INT_PTR size, GLvoid* data ) { +static void WINAPI wine_glGetBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", target, offset, size, data ); funcs->ext.p_glGetBufferSubDataARB( target, offset, size, data ); @@ -3178,19 +3178,19 @@ static void WINAPI wine_glGetConvolutionParameterivEXT( GLenum target, GLenum pn funcs->ext.p_glGetConvolutionParameterivEXT( target, pname, params ); } -static GLuint WINAPI wine_glGetDebugMessageLog( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, char* messageLog ) { +static GLuint WINAPI wine_glGetDebugMessageLog( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p, %p, %p, %p, %p)\n", count, bufsize, sources, types, ids, severities, lengths, messageLog ); return funcs->ext.p_glGetDebugMessageLog( count, bufsize, sources, types, ids, severities, lengths, messageLog ); } -static GLuint WINAPI wine_glGetDebugMessageLogAMD( GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, char* message ) { +static GLuint WINAPI wine_glGetDebugMessageLogAMD( GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p, %p, %p, %p)\n", count, bufsize, categories, severities, ids, lengths, message ); return funcs->ext.p_glGetDebugMessageLogAMD( count, bufsize, categories, severities, ids, lengths, message ); } -static GLuint WINAPI wine_glGetDebugMessageLogARB( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, char* messageLog ) { +static GLuint WINAPI wine_glGetDebugMessageLogARB( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p, %p, %p, %p, %p)\n", count, bufsize, sources, types, ids, severities, lengths, messageLog ); return funcs->ext.p_glGetDebugMessageLogARB( count, bufsize, sources, types, ids, severities, lengths, messageLog ); @@ -3250,19 +3250,19 @@ static void WINAPI wine_glGetFogFuncSGIS( GLfloat* points ) { funcs->ext.p_glGetFogFuncSGIS( points ); } -static GLint WINAPI wine_glGetFragDataIndex( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetFragDataIndex( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetFragDataIndex( program, name ); } -static GLint WINAPI wine_glGetFragDataLocation( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetFragDataLocation( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetFragDataLocation( program, name ); } -static GLint WINAPI wine_glGetFragDataLocationEXT( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetFragDataLocationEXT( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetFragDataLocationEXT( program, name ); @@ -3322,7 +3322,7 @@ static GLenum WINAPI wine_glGetGraphicsResetStatusARB( void ) { return funcs->ext.p_glGetGraphicsResetStatusARB( ); } -static unsigned int WINAPI wine_glGetHandleARB( GLenum pname ) { +static GLhandleARB WINAPI wine_glGetHandleARB( GLenum pname ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", pname ); return funcs->ext.p_glGetHandleARB( pname ); @@ -3382,7 +3382,7 @@ static void WINAPI wine_glGetImageTransformParameterivHP( GLenum target, GLenum funcs->ext.p_glGetImageTransformParameterivHP( target, pname, params ); } -static void WINAPI wine_glGetInfoLogARB( unsigned int obj, GLsizei maxLength, GLsizei* length, char* infoLog ) { +static void WINAPI wine_glGetInfoLogARB( GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* infoLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", obj, maxLength, length, infoLog ); funcs->ext.p_glGetInfoLogARB( obj, maxLength, length, infoLog ); @@ -3658,7 +3658,7 @@ static void WINAPI wine_glGetNamedBufferPointervEXT( GLuint buffer, GLenum pname funcs->ext.p_glGetNamedBufferPointervEXT( buffer, pname, params ); } -static void WINAPI wine_glGetNamedBufferSubDataEXT( GLuint buffer, INT_PTR offset, INT_PTR size, GLvoid* data ) { +static void WINAPI wine_glGetNamedBufferSubDataEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", buffer, offset, size, data ); funcs->ext.p_glGetNamedBufferSubDataEXT( buffer, offset, size, data ); @@ -3718,13 +3718,13 @@ static void WINAPI wine_glGetNamedRenderbufferParameterivEXT( GLuint renderbuffe funcs->ext.p_glGetNamedRenderbufferParameterivEXT( renderbuffer, pname, params ); } -static void WINAPI wine_glGetNamedStringARB( GLint namelen, const char* name, GLsizei bufSize, GLint* stringlen, char* string ) { +static void WINAPI wine_glGetNamedStringARB( GLint namelen, const GLchar* name, GLsizei bufSize, GLint* stringlen, GLchar* string ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p, %d, %p, %p)\n", namelen, name, bufSize, stringlen, string ); funcs->ext.p_glGetNamedStringARB( namelen, name, bufSize, stringlen, string ); } -static void WINAPI wine_glGetNamedStringivARB( GLint namelen, const char* name, GLenum pname, GLint* params ) { +static void WINAPI wine_glGetNamedStringivARB( GLint namelen, const GLchar* name, GLenum pname, GLint* params ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p, %d, %p)\n", namelen, name, pname, params ); funcs->ext.p_glGetNamedStringivARB( namelen, name, pname, params ); @@ -3742,13 +3742,13 @@ static void WINAPI wine_glGetObjectBufferivATI( GLuint buffer, GLenum pname, GLi funcs->ext.p_glGetObjectBufferivATI( buffer, pname, params ); } -static void WINAPI wine_glGetObjectLabel( GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, char* label ) { +static void WINAPI wine_glGetObjectLabel( GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p)\n", identifier, name, bufSize, length, label ); funcs->ext.p_glGetObjectLabel( identifier, name, bufSize, length, label ); } -static void WINAPI wine_glGetObjectParameterfvARB( unsigned int obj, GLenum pname, GLfloat* params ) { +static void WINAPI wine_glGetObjectParameterfvARB( GLhandleARB obj, GLenum pname, GLfloat* params ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", obj, pname, params ); funcs->ext.p_glGetObjectParameterfvARB( obj, pname, params ); @@ -3760,13 +3760,13 @@ static void WINAPI wine_glGetObjectParameterivAPPLE( GLenum objectType, GLuint n funcs->ext.p_glGetObjectParameterivAPPLE( objectType, name, pname, params ); } -static void WINAPI wine_glGetObjectParameterivARB( unsigned int obj, GLenum pname, GLint* params ) { +static void WINAPI wine_glGetObjectParameterivARB( GLhandleARB obj, GLenum pname, GLint* params ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", obj, pname, params ); funcs->ext.p_glGetObjectParameterivARB( obj, pname, params ); } -static void WINAPI wine_glGetObjectPtrLabel( const void* ptr, GLsizei bufSize, GLsizei* length, char* label ) { +static void WINAPI wine_glGetObjectPtrLabel( const void* ptr, GLsizei bufSize, GLsizei* length, GLchar* label ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p, %d, %p, %p)\n", ptr, bufSize, length, label ); funcs->ext.p_glGetObjectPtrLabel( ptr, bufSize, length, label ); @@ -3874,7 +3874,7 @@ static void WINAPI wine_glGetPerfMonitorCounterInfoAMD( GLuint group, GLuint cou funcs->ext.p_glGetPerfMonitorCounterInfoAMD( group, counter, pname, data ); } -static void WINAPI wine_glGetPerfMonitorCounterStringAMD( GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, char* counterString ) { +static void WINAPI wine_glGetPerfMonitorCounterStringAMD( GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar* counterString ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p)\n", group, counter, bufSize, length, counterString ); funcs->ext.p_glGetPerfMonitorCounterStringAMD( group, counter, bufSize, length, counterString ); @@ -3886,7 +3886,7 @@ static void WINAPI wine_glGetPerfMonitorCountersAMD( GLuint group, GLint* numCou funcs->ext.p_glGetPerfMonitorCountersAMD( group, numCounters, maxActiveCounters, counterSize, counters ); } -static void WINAPI wine_glGetPerfMonitorGroupStringAMD( GLuint group, GLsizei bufSize, GLsizei* length, char* groupString ) { +static void WINAPI wine_glGetPerfMonitorGroupStringAMD( GLuint group, GLsizei bufSize, GLsizei* length, GLchar* groupString ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", group, bufSize, length, groupString ); funcs->ext.p_glGetPerfMonitorGroupStringAMD( group, bufSize, length, groupString ); @@ -3964,7 +3964,7 @@ static void WINAPI wine_glGetProgramEnvParameterfvARB( GLenum target, GLuint ind funcs->ext.p_glGetProgramEnvParameterfvARB( target, index, params ); } -static void WINAPI wine_glGetProgramInfoLog( GLuint program, GLsizei bufSize, GLsizei* length, char* infoLog ) { +static void WINAPI wine_glGetProgramInfoLog( GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", program, bufSize, length, infoLog ); funcs->ext.p_glGetProgramInfoLog( program, bufSize, length, infoLog ); @@ -4024,7 +4024,7 @@ static void WINAPI wine_glGetProgramParameterfvNV( GLenum target, GLuint index, funcs->ext.p_glGetProgramParameterfvNV( target, index, pname, params ); } -static void WINAPI wine_glGetProgramPipelineInfoLog( GLuint pipeline, GLsizei bufSize, GLsizei* length, char* infoLog ) { +static void WINAPI wine_glGetProgramPipelineInfoLog( GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", pipeline, bufSize, length, infoLog ); funcs->ext.p_glGetProgramPipelineInfoLog( pipeline, bufSize, length, infoLog ); @@ -4036,25 +4036,25 @@ static void WINAPI wine_glGetProgramPipelineiv( GLuint pipeline, GLenum pname, G funcs->ext.p_glGetProgramPipelineiv( pipeline, pname, params ); } -static GLuint WINAPI wine_glGetProgramResourceIndex( GLuint program, GLenum programInterface, const char* name ) { +static GLuint WINAPI wine_glGetProgramResourceIndex( GLuint program, GLenum programInterface, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, programInterface, name ); return funcs->ext.p_glGetProgramResourceIndex( program, programInterface, name ); } -static GLint WINAPI wine_glGetProgramResourceLocation( GLuint program, GLenum programInterface, const char* name ) { +static GLint WINAPI wine_glGetProgramResourceLocation( GLuint program, GLenum programInterface, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, programInterface, name ); return funcs->ext.p_glGetProgramResourceLocation( program, programInterface, name ); } -static GLint WINAPI wine_glGetProgramResourceLocationIndex( GLuint program, GLenum programInterface, const char* name ) { +static GLint WINAPI wine_glGetProgramResourceLocationIndex( GLuint program, GLenum programInterface, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, programInterface, name ); return funcs->ext.p_glGetProgramResourceLocationIndex( program, programInterface, name ); } -static void WINAPI wine_glGetProgramResourceName( GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, char* name ) { +static void WINAPI wine_glGetProgramResourceName( GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %p, %p)\n", program, programInterface, index, bufSize, length, name ); funcs->ext.p_glGetProgramResourceName( program, programInterface, index, bufSize, length, name ); @@ -4222,7 +4222,7 @@ static void WINAPI wine_glGetSeparableFilterEXT( GLenum target, GLenum format, G funcs->ext.p_glGetSeparableFilterEXT( target, format, type, row, column, span ); } -static void WINAPI wine_glGetShaderInfoLog( GLuint shader, GLsizei bufSize, GLsizei* length, char* infoLog ) { +static void WINAPI wine_glGetShaderInfoLog( GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", shader, bufSize, length, infoLog ); funcs->ext.p_glGetShaderInfoLog( shader, bufSize, length, infoLog ); @@ -4234,13 +4234,13 @@ static void WINAPI wine_glGetShaderPrecisionFormat( GLenum shadertype, GLenum pr funcs->ext.p_glGetShaderPrecisionFormat( shadertype, precisiontype, range, precision ); } -static void WINAPI wine_glGetShaderSource( GLuint shader, GLsizei bufSize, GLsizei* length, char* source ) { +static void WINAPI wine_glGetShaderSource( GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* source ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", shader, bufSize, length, source ); funcs->ext.p_glGetShaderSource( shader, bufSize, length, source ); } -static void WINAPI wine_glGetShaderSourceARB( unsigned int obj, GLsizei maxLength, GLsizei* length, char* source ) { +static void WINAPI wine_glGetShaderSourceARB( GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* source ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", obj, maxLength, length, source ); funcs->ext.p_glGetShaderSourceARB( obj, maxLength, length, source ); @@ -4264,13 +4264,13 @@ static const GLubyte * WINAPI wine_glGetStringi( GLenum name, GLuint index ) { return funcs->ext.p_glGetStringi( name, index ); } -static GLuint WINAPI wine_glGetSubroutineIndex( GLuint program, GLenum shadertype, const char* name ) { +static GLuint WINAPI wine_glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, shadertype, name ); return funcs->ext.p_glGetSubroutineIndex( program, shadertype, name ); } -static GLint WINAPI wine_glGetSubroutineUniformLocation( GLuint program, GLenum shadertype, const char* name ) { +static GLint WINAPI wine_glGetSubroutineUniformLocation( GLuint program, GLenum shadertype, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", program, shadertype, name ); return funcs->ext.p_glGetSubroutineUniformLocation( program, shadertype, name ); @@ -4390,13 +4390,13 @@ static void WINAPI wine_glGetTrackMatrixivNV( GLenum target, GLuint address, GLe funcs->ext.p_glGetTrackMatrixivNV( target, address, pname, params ); } -static void WINAPI wine_glGetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", program, index, bufSize, length, size, type, name ); funcs->ext.p_glGetTransformFeedbackVarying( program, index, bufSize, length, size, type, name ); } -static void WINAPI wine_glGetTransformFeedbackVaryingEXT( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { +static void WINAPI wine_glGetTransformFeedbackVaryingEXT( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p, %p, %p, %p)\n", program, index, bufSize, length, size, type, name ); funcs->ext.p_glGetTransformFeedbackVaryingEXT( program, index, bufSize, length, size, type, name ); @@ -4408,7 +4408,7 @@ static void WINAPI wine_glGetTransformFeedbackVaryingNV( GLuint program, GLuint funcs->ext.p_glGetTransformFeedbackVaryingNV( program, index, location ); } -static GLuint WINAPI wine_glGetUniformBlockIndex( GLuint program, const char* uniformBlockName ) { +static GLuint WINAPI wine_glGetUniformBlockIndex( GLuint program, const GLchar* uniformBlockName ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, uniformBlockName ); return funcs->ext.p_glGetUniformBlockIndex( program, uniformBlockName ); @@ -4420,25 +4420,25 @@ static GLint WINAPI wine_glGetUniformBufferSizeEXT( GLuint program, GLint locati return funcs->ext.p_glGetUniformBufferSizeEXT( program, location ); } -static void WINAPI wine_glGetUniformIndices( GLuint program, GLsizei uniformCount, const char* const* uniformNames, GLuint* uniformIndices ) { +static void WINAPI wine_glGetUniformIndices( GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", program, uniformCount, uniformNames, uniformIndices ); funcs->ext.p_glGetUniformIndices( program, uniformCount, uniformNames, uniformIndices ); } -static GLint WINAPI wine_glGetUniformLocation( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetUniformLocation( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetUniformLocation( program, name ); } -static GLint WINAPI wine_glGetUniformLocationARB( unsigned int programObj, const char* name ) { +static GLint WINAPI wine_glGetUniformLocationARB( GLhandleARB programObj, const GLcharARB* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", programObj, name ); return funcs->ext.p_glGetUniformLocationARB( programObj, name ); } -static INT_PTR WINAPI wine_glGetUniformOffsetEXT( GLuint program, GLint location ) { +static GLintptr WINAPI wine_glGetUniformOffsetEXT( GLuint program, GLint location ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", program, location ); return funcs->ext.p_glGetUniformOffsetEXT( program, location ); @@ -4462,7 +4462,7 @@ static void WINAPI wine_glGetUniformfv( GLuint program, GLint location, GLfloat* funcs->ext.p_glGetUniformfv( program, location, params ); } -static void WINAPI wine_glGetUniformfvARB( unsigned int programObj, GLint location, GLfloat* params ) { +static void WINAPI wine_glGetUniformfvARB( GLhandleARB programObj, GLint location, GLfloat* params ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", programObj, location, params ); funcs->ext.p_glGetUniformfvARB( programObj, location, params ); @@ -4480,7 +4480,7 @@ static void WINAPI wine_glGetUniformiv( GLuint program, GLint location, GLint* p funcs->ext.p_glGetUniformiv( program, location, params ); } -static void WINAPI wine_glGetUniformivARB( unsigned int programObj, GLint location, GLint* params ) { +static void WINAPI wine_glGetUniformivARB( GLhandleARB programObj, GLint location, GLint* params ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", programObj, location, params ); funcs->ext.p_glGetUniformivARB( programObj, location, params ); @@ -4540,7 +4540,7 @@ static void WINAPI wine_glGetVariantPointervEXT( GLuint id, GLenum value, GLvoid funcs->ext.p_glGetVariantPointervEXT( id, value, data ); } -static GLint WINAPI wine_glGetVaryingLocationNV( GLuint program, const char* name ) { +static GLint WINAPI wine_glGetVaryingLocationNV( GLuint program, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", program, name ); return funcs->ext.p_glGetVaryingLocationNV( program, name ); @@ -4930,7 +4930,7 @@ static void WINAPI wine_glImageTransformParameterivHP( GLenum target, GLenum pna funcs->ext.p_glImageTransformParameterivHP( target, pname, params ); } -static GLvoid* WINAPI wine_glImportSyncEXT( GLenum external_sync_type, INT_PTR external_sync, GLbitfield flags ) { +static GLvoid* WINAPI wine_glImportSyncEXT( GLenum external_sync_type, GLintptr external_sync, GLbitfield flags ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %d)\n", external_sync_type, external_sync, flags ); return funcs->ext.p_glImportSyncEXT( external_sync_type, external_sync, flags ); @@ -4990,7 +4990,7 @@ static void WINAPI wine_glInvalidateBufferData( GLuint buffer ) { funcs->ext.p_glInvalidateBufferData( buffer ); } -static void WINAPI wine_glInvalidateBufferSubData( GLuint buffer, INT_PTR offset, INT_PTR length ) { +static void WINAPI wine_glInvalidateBufferSubData( GLuint buffer, GLintptr offset, GLsizeiptr length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld)\n", buffer, offset, length ); funcs->ext.p_glInvalidateBufferSubData( buffer, offset, length ); @@ -5098,7 +5098,7 @@ static GLboolean WINAPI wine_glIsNamedBufferResidentNV( GLuint buffer ) { return funcs->ext.p_glIsNamedBufferResidentNV( buffer ); } -static GLboolean WINAPI wine_glIsNamedStringARB( GLint namelen, const char* name ) { +static GLboolean WINAPI wine_glIsNamedStringARB( GLint namelen, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", namelen, name ); return funcs->ext.p_glIsNamedStringARB( namelen, name ); @@ -5260,7 +5260,7 @@ static void WINAPI wine_glLinkProgram( GLuint program ) { funcs->ext.p_glLinkProgram( program ); } -static void WINAPI wine_glLinkProgramARB( unsigned int programObj ) { +static void WINAPI wine_glLinkProgramARB( GLhandleARB programObj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", programObj ); funcs->ext.p_glLinkProgramARB( programObj ); @@ -5404,7 +5404,7 @@ static GLvoid* WINAPI wine_glMapBufferARB( GLenum target, GLenum access ) { return funcs->ext.p_glMapBufferARB( target, access ); } -static GLvoid* WINAPI wine_glMapBufferRange( GLenum target, INT_PTR offset, INT_PTR length, GLbitfield access ) { +static GLvoid* WINAPI wine_glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %d)\n", target, offset, length, access ); return funcs->ext.p_glMapBufferRange( target, offset, length, access ); @@ -5422,7 +5422,7 @@ static GLvoid* WINAPI wine_glMapNamedBufferEXT( GLuint buffer, GLenum access ) { return funcs->ext.p_glMapNamedBufferEXT( buffer, access ); } -static GLvoid* WINAPI wine_glMapNamedBufferRangeEXT( GLuint buffer, INT_PTR offset, INT_PTR length, GLbitfield access ) { +static GLvoid* WINAPI wine_glMapNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %d)\n", buffer, offset, length, access ); return funcs->ext.p_glMapNamedBufferRangeEXT( buffer, offset, length, access ); @@ -5824,13 +5824,13 @@ static void WINAPI wine_glMultiTexCoord1fvSGIS( GLenum target, const GLfloat * v funcs->ext.p_glMultiTexCoord1fvSGIS( target, v ); } -static void WINAPI wine_glMultiTexCoord1hNV( GLenum target, unsigned short s ) { +static void WINAPI wine_glMultiTexCoord1hNV( GLenum target, GLhalfNV s ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", target, s ); funcs->ext.p_glMultiTexCoord1hNV( target, s ); } -static void WINAPI wine_glMultiTexCoord1hvNV( GLenum target, const unsigned short* v ) { +static void WINAPI wine_glMultiTexCoord1hvNV( GLenum target, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", target, v ); funcs->ext.p_glMultiTexCoord1hvNV( target, v ); @@ -5980,13 +5980,13 @@ static void WINAPI wine_glMultiTexCoord2fvSGIS( GLenum target, GLfloat * v ) { funcs->ext.p_glMultiTexCoord2fvSGIS( target, v ); } -static void WINAPI wine_glMultiTexCoord2hNV( GLenum target, unsigned short s, unsigned short t ) { +static void WINAPI wine_glMultiTexCoord2hNV( GLenum target, GLhalfNV s, GLhalfNV t ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", target, s, t ); funcs->ext.p_glMultiTexCoord2hNV( target, s, t ); } -static void WINAPI wine_glMultiTexCoord2hvNV( GLenum target, const unsigned short* v ) { +static void WINAPI wine_glMultiTexCoord2hvNV( GLenum target, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", target, v ); funcs->ext.p_glMultiTexCoord2hvNV( target, v ); @@ -6136,13 +6136,13 @@ static void WINAPI wine_glMultiTexCoord3fvSGIS( GLenum target, GLfloat * v ) { funcs->ext.p_glMultiTexCoord3fvSGIS( target, v ); } -static void WINAPI wine_glMultiTexCoord3hNV( GLenum target, unsigned short s, unsigned short t, unsigned short r ) { +static void WINAPI wine_glMultiTexCoord3hNV( GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d)\n", target, s, t, r ); funcs->ext.p_glMultiTexCoord3hNV( target, s, t, r ); } -static void WINAPI wine_glMultiTexCoord3hvNV( GLenum target, const unsigned short* v ) { +static void WINAPI wine_glMultiTexCoord3hvNV( GLenum target, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", target, v ); funcs->ext.p_glMultiTexCoord3hvNV( target, v ); @@ -6292,13 +6292,13 @@ static void WINAPI wine_glMultiTexCoord4fvSGIS( GLenum target, GLfloat * v ) { funcs->ext.p_glMultiTexCoord4fvSGIS( target, v ); } -static void WINAPI wine_glMultiTexCoord4hNV( GLenum target, unsigned short s, unsigned short t, unsigned short r, unsigned short q ) { +static void WINAPI wine_glMultiTexCoord4hNV( GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %d)\n", target, s, t, r, q ); funcs->ext.p_glMultiTexCoord4hNV( target, s, t, r, q ); } -static void WINAPI wine_glMultiTexCoord4hvNV( GLenum target, const unsigned short* v ) { +static void WINAPI wine_glMultiTexCoord4hvNV( GLenum target, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", target, v ); funcs->ext.p_glMultiTexCoord4hvNV( target, v ); @@ -6574,19 +6574,19 @@ static void WINAPI wine_glMultiTexSubImage3DEXT( GLenum texunit, GLenum target, funcs->ext.p_glMultiTexSubImage3DEXT( texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels ); } -static void WINAPI wine_glNamedBufferDataEXT( GLuint buffer, INT_PTR size, const GLvoid* data, GLenum usage ) { +static void WINAPI wine_glNamedBufferDataEXT( GLuint buffer, GLsizeiptr size, const GLvoid* data, GLenum usage ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %p, %d)\n", buffer, size, data, usage ); funcs->ext.p_glNamedBufferDataEXT( buffer, size, data, usage ); } -static void WINAPI wine_glNamedBufferSubDataEXT( GLuint buffer, INT_PTR offset, INT_PTR size, const GLvoid* data ) { +static void WINAPI wine_glNamedBufferSubDataEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid* data ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %ld, %ld, %p)\n", buffer, offset, size, data ); funcs->ext.p_glNamedBufferSubDataEXT( buffer, offset, size, data ); } -static void WINAPI wine_glNamedCopyBufferSubDataEXT( GLuint readBuffer, GLuint writeBuffer, INT_PTR readOffset, INT_PTR writeOffset, INT_PTR size ) { +static void WINAPI wine_glNamedCopyBufferSubDataEXT( GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %ld, %ld, %ld)\n", readBuffer, writeBuffer, readOffset, writeOffset, size ); funcs->ext.p_glNamedCopyBufferSubDataEXT( readBuffer, writeBuffer, readOffset, writeOffset, size ); @@ -6730,7 +6730,7 @@ static void WINAPI wine_glNamedRenderbufferStorageMultisampleEXT( GLuint renderb funcs->ext.p_glNamedRenderbufferStorageMultisampleEXT( renderbuffer, samples, internalformat, width, height ); } -static void WINAPI wine_glNamedStringARB( GLenum type, GLint namelen, const char* name, GLint stringlen, const char* string ) { +static void WINAPI wine_glNamedStringARB( GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar* string ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %d, %p)\n", type, namelen, name, stringlen, string ); funcs->ext.p_glNamedStringARB( type, namelen, name, stringlen, string ); @@ -6760,13 +6760,13 @@ static void WINAPI wine_glNormal3fVertex3fvSUN( const GLfloat* n, const GLfloat* funcs->ext.p_glNormal3fVertex3fvSUN( n, v ); } -static void WINAPI wine_glNormal3hNV( unsigned short nx, unsigned short ny, unsigned short nz ) { +static void WINAPI wine_glNormal3hNV( GLhalfNV nx, GLhalfNV ny, GLhalfNV nz ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", nx, ny, nz ); funcs->ext.p_glNormal3hNV( nx, ny, nz ); } -static void WINAPI wine_glNormal3hvNV( const unsigned short* v ) { +static void WINAPI wine_glNormal3hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glNormal3hvNV( v ); @@ -6868,13 +6868,13 @@ static void WINAPI wine_glNormalStream3svATI( GLenum stream, const GLshort* coor funcs->ext.p_glNormalStream3svATI( stream, coords ); } -static void WINAPI wine_glObjectLabel( GLenum identifier, GLuint name, GLsizei length, const char* label ) { +static void WINAPI wine_glObjectLabel( GLenum identifier, GLuint name, GLsizei length, const GLchar* label ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p)\n", identifier, name, length, label ); funcs->ext.p_glObjectLabel( identifier, name, length, label ); } -static void WINAPI wine_glObjectPtrLabel( const void* ptr, GLsizei length, const char* label ) { +static void WINAPI wine_glObjectPtrLabel( const void* ptr, GLsizei length, const GLchar* label ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p, %d, %p)\n", ptr, length, label ); funcs->ext.p_glObjectPtrLabel( ptr, length, label ); @@ -8230,7 +8230,7 @@ static void WINAPI wine_glPushClientAttribDefaultEXT( GLbitfield mask ) { funcs->ext.p_glPushClientAttribDefaultEXT( mask ); } -static void WINAPI wine_glPushDebugGroup( GLenum source, GLuint id, GLsizei length, const char* message ) { +static void WINAPI wine_glPushDebugGroup( GLenum source, GLuint id, GLsizei length, const GLchar* message ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %p)\n", source, id, length, message ); funcs->ext.p_glPushDebugGroup( source, id, length, message ); @@ -8668,13 +8668,13 @@ static void WINAPI wine_glSecondaryColor3fvEXT( const GLfloat* v ) { funcs->ext.p_glSecondaryColor3fvEXT( v ); } -static void WINAPI wine_glSecondaryColor3hNV( unsigned short red, unsigned short green, unsigned short blue ) { +static void WINAPI wine_glSecondaryColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", red, green, blue ); funcs->ext.p_glSecondaryColor3hNV( red, green, blue ); } -static void WINAPI wine_glSecondaryColor3hvNV( const unsigned short* v ) { +static void WINAPI wine_glSecondaryColor3hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glSecondaryColor3hvNV( v ); @@ -8926,13 +8926,13 @@ static void WINAPI wine_glShaderOp3EXT( GLenum op, GLuint res, GLuint arg1, GLui funcs->ext.p_glShaderOp3EXT( op, res, arg1, arg2, arg3 ); } -static void WINAPI wine_glShaderSource( GLuint shader, GLsizei count, const char* const* string, const GLint* length ) { +static void WINAPI wine_glShaderSource( GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", shader, count, string, length ); funcs->ext.p_glShaderSource( shader, count, string, length ); } -static void WINAPI wine_glShaderSourceARB( unsigned int shaderObj, GLsizei count, const char** string, const GLint* length ) { +static void WINAPI wine_glShaderSourceARB( GLhandleARB shaderObj, GLsizei count, const GLcharARB** string, const GLint* length ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %p)\n", shaderObj, count, string, length ); funcs->ext.p_glShaderSourceARB( shaderObj, count, string, length ); @@ -9190,7 +9190,7 @@ static void WINAPI wine_glTexBufferEXT( GLenum target, GLenum internalformat, GL funcs->ext.p_glTexBufferEXT( target, internalformat, buffer ); } -static void WINAPI wine_glTexBufferRange( GLenum target, GLenum internalformat, GLuint buffer, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glTexBufferRange( GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld, %ld)\n", target, internalformat, buffer, offset, size ); funcs->ext.p_glTexBufferRange( target, internalformat, buffer, offset, size ); @@ -9208,13 +9208,13 @@ static void WINAPI wine_glTexBumpParameterivATI( GLenum pname, const GLint* para funcs->ext.p_glTexBumpParameterivATI( pname, param ); } -static void WINAPI wine_glTexCoord1hNV( unsigned short s ) { +static void WINAPI wine_glTexCoord1hNV( GLhalfNV s ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", s ); funcs->ext.p_glTexCoord1hNV( s ); } -static void WINAPI wine_glTexCoord1hvNV( const unsigned short* v ) { +static void WINAPI wine_glTexCoord1hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glTexCoord1hvNV( v ); @@ -9280,25 +9280,25 @@ static void WINAPI wine_glTexCoord2fVertex3fvSUN( const GLfloat* tc, const GLflo funcs->ext.p_glTexCoord2fVertex3fvSUN( tc, v ); } -static void WINAPI wine_glTexCoord2hNV( unsigned short s, unsigned short t ) { +static void WINAPI wine_glTexCoord2hNV( GLhalfNV s, GLhalfNV t ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", s, t ); funcs->ext.p_glTexCoord2hNV( s, t ); } -static void WINAPI wine_glTexCoord2hvNV( const unsigned short* v ) { +static void WINAPI wine_glTexCoord2hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glTexCoord2hvNV( v ); } -static void WINAPI wine_glTexCoord3hNV( unsigned short s, unsigned short t, unsigned short r ) { +static void WINAPI wine_glTexCoord3hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", s, t, r ); funcs->ext.p_glTexCoord3hNV( s, t, r ); } -static void WINAPI wine_glTexCoord3hvNV( const unsigned short* v ) { +static void WINAPI wine_glTexCoord3hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glTexCoord3hvNV( v ); @@ -9328,13 +9328,13 @@ static void WINAPI wine_glTexCoord4fVertex4fvSUN( const GLfloat* tc, const GLflo funcs->ext.p_glTexCoord4fVertex4fvSUN( tc, v ); } -static void WINAPI wine_glTexCoord4hNV( unsigned short s, unsigned short t, unsigned short r, unsigned short q ) { +static void WINAPI wine_glTexCoord4hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d)\n", s, t, r, q ); funcs->ext.p_glTexCoord4hNV( s, t, r, q ); } -static void WINAPI wine_glTexCoord4hvNV( const unsigned short* v ) { +static void WINAPI wine_glTexCoord4hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glTexCoord4hvNV( v ); @@ -9568,7 +9568,7 @@ static void WINAPI wine_glTextureBufferEXT( GLuint texture, GLenum target, GLenu funcs->ext.p_glTextureBufferEXT( texture, target, internalformat, buffer ); } -static void WINAPI wine_glTextureBufferRangeEXT( GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, INT_PTR offset, INT_PTR size ) { +static void WINAPI wine_glTextureBufferRangeEXT( GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %ld, %ld)\n", texture, target, internalformat, buffer, offset, size ); funcs->ext.p_glTextureBufferRangeEXT( texture, target, internalformat, buffer, offset, size ); @@ -9766,13 +9766,13 @@ static void WINAPI wine_glTransformFeedbackStreamAttribsNV( GLsizei count, const funcs->ext.p_glTransformFeedbackStreamAttribsNV( count, attribs, nbuffers, bufstreams, bufferMode ); } -static void WINAPI wine_glTransformFeedbackVaryings( GLuint program, GLsizei count, const char* const* varyings, GLenum bufferMode ) { +static void WINAPI wine_glTransformFeedbackVaryings( GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %d)\n", program, count, varyings, bufferMode ); funcs->ext.p_glTransformFeedbackVaryings( program, count, varyings, bufferMode ); } -static void WINAPI wine_glTransformFeedbackVaryingsEXT( GLuint program, GLsizei count, const char** varyings, GLenum bufferMode ) { +static void WINAPI wine_glTransformFeedbackVaryingsEXT( GLuint program, GLsizei count, const GLchar** varyings, GLenum bufferMode ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p, %d)\n", program, count, varyings, bufferMode ); funcs->ext.p_glTransformFeedbackVaryingsEXT( program, count, varyings, bufferMode ); @@ -10432,7 +10432,7 @@ static void WINAPI wine_glUseProgram( GLuint program ) { funcs->ext.p_glUseProgram( program ); } -static void WINAPI wine_glUseProgramObjectARB( unsigned int programObj ) { +static void WINAPI wine_glUseProgramObjectARB( GLhandleARB programObj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", programObj ); funcs->ext.p_glUseProgramObjectARB( programObj ); @@ -10456,7 +10456,7 @@ static void WINAPI wine_glVDPAUFiniNV( void ) { funcs->ext.p_glVDPAUFiniNV( ); } -static void WINAPI wine_glVDPAUGetSurfaceivNV( INT_PTR surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) { +static void WINAPI wine_glVDPAUGetSurfaceivNV( GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%ld, %d, %d, %p, %p)\n", surface, pname, bufSize, length, values ); funcs->ext.p_glVDPAUGetSurfaceivNV( surface, pname, bufSize, length, values ); @@ -10468,43 +10468,43 @@ static void WINAPI wine_glVDPAUInitNV( const GLvoid* vdpDevice, const GLvoid* ge funcs->ext.p_glVDPAUInitNV( vdpDevice, getProcAddress ); } -static void WINAPI wine_glVDPAUIsSurfaceNV( INT_PTR surface ) { +static void WINAPI wine_glVDPAUIsSurfaceNV( GLvdpauSurfaceNV surface ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%ld)\n", surface ); funcs->ext.p_glVDPAUIsSurfaceNV( surface ); } -static void WINAPI wine_glVDPAUMapSurfacesNV( GLsizei numSurfaces, const INT_PTR* surfaces ) { +static void WINAPI wine_glVDPAUMapSurfacesNV( GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", numSurfaces, surfaces ); funcs->ext.p_glVDPAUMapSurfacesNV( numSurfaces, surfaces ); } -static INT_PTR WINAPI wine_glVDPAURegisterOutputSurfaceNV( GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { +static GLvdpauSurfaceNV WINAPI wine_glVDPAURegisterOutputSurfaceNV( GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p, %d, %d, %p)\n", vdpSurface, target, numTextureNames, textureNames ); return funcs->ext.p_glVDPAURegisterOutputSurfaceNV( vdpSurface, target, numTextureNames, textureNames ); } -static INT_PTR WINAPI wine_glVDPAURegisterVideoSurfaceNV( const GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { +static GLvdpauSurfaceNV WINAPI wine_glVDPAURegisterVideoSurfaceNV( const GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p, %d, %d, %p)\n", vdpSurface, target, numTextureNames, textureNames ); return funcs->ext.p_glVDPAURegisterVideoSurfaceNV( vdpSurface, target, numTextureNames, textureNames ); } -static void WINAPI wine_glVDPAUSurfaceAccessNV( INT_PTR surface, GLenum access ) { +static void WINAPI wine_glVDPAUSurfaceAccessNV( GLvdpauSurfaceNV surface, GLenum access ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%ld, %d)\n", surface, access ); funcs->ext.p_glVDPAUSurfaceAccessNV( surface, access ); } -static void WINAPI wine_glVDPAUUnmapSurfacesNV( GLsizei numSurface, const INT_PTR* surfaces ) { +static void WINAPI wine_glVDPAUUnmapSurfacesNV( GLsizei numSurface, const GLvdpauSurfaceNV* surfaces ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", numSurface, surfaces ); funcs->ext.p_glVDPAUUnmapSurfacesNV( numSurface, surfaces ); } -static void WINAPI wine_glVDPAUUnregisterSurfaceNV( INT_PTR surface ) { +static void WINAPI wine_glVDPAUUnregisterSurfaceNV( GLvdpauSurfaceNV surface ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%ld)\n", surface ); funcs->ext.p_glVDPAUUnregisterSurfaceNV( surface ); @@ -10516,7 +10516,7 @@ static void WINAPI wine_glValidateProgram( GLuint program ) { funcs->ext.p_glValidateProgram( program ); } -static void WINAPI wine_glValidateProgramARB( unsigned int programObj ) { +static void WINAPI wine_glValidateProgramARB( GLhandleARB programObj ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", programObj ); funcs->ext.p_glValidateProgramARB( programObj ); @@ -10588,43 +10588,43 @@ static void WINAPI wine_glVariantusvEXT( GLuint id, const GLushort* addr ) { funcs->ext.p_glVariantusvEXT( id, addr ); } -static void WINAPI wine_glVertex2hNV( unsigned short x, unsigned short y ) { +static void WINAPI wine_glVertex2hNV( GLhalfNV x, GLhalfNV y ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", x, y ); funcs->ext.p_glVertex2hNV( x, y ); } -static void WINAPI wine_glVertex2hvNV( const unsigned short* v ) { +static void WINAPI wine_glVertex2hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glVertex2hvNV( v ); } -static void WINAPI wine_glVertex3hNV( unsigned short x, unsigned short y, unsigned short z ) { +static void WINAPI wine_glVertex3hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", x, y, z ); funcs->ext.p_glVertex3hNV( x, y, z ); } -static void WINAPI wine_glVertex3hvNV( const unsigned short* v ) { +static void WINAPI wine_glVertex3hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glVertex3hvNV( v ); } -static void WINAPI wine_glVertex4hNV( unsigned short x, unsigned short y, unsigned short z, unsigned short w ) { +static void WINAPI wine_glVertex4hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d)\n", x, y, z, w ); funcs->ext.p_glVertex4hNV( x, y, z, w ); } -static void WINAPI wine_glVertex4hvNV( const unsigned short* v ) { +static void WINAPI wine_glVertex4hvNV( const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", v ); funcs->ext.p_glVertex4hvNV( v ); } -static void WINAPI wine_glVertexArrayBindVertexBufferEXT( GLuint vaobj, GLuint bindingindex, GLuint buffer, INT_PTR offset, GLsizei stride ) { +static void WINAPI wine_glVertexArrayBindVertexBufferEXT( GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %ld, %d)\n", vaobj, bindingindex, buffer, offset, stride ); funcs->ext.p_glVertexArrayBindVertexBufferEXT( vaobj, bindingindex, buffer, offset, stride ); @@ -10672,7 +10672,7 @@ static void WINAPI wine_glVertexArrayVertexAttribLFormatEXT( GLuint vaobj, GLuin funcs->ext.p_glVertexArrayVertexAttribLFormatEXT( vaobj, attribindex, size, type, relativeoffset ); } -static void WINAPI wine_glVertexArrayVertexAttribLOffsetEXT( GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, INT_PTR offset ) { +static void WINAPI wine_glVertexArrayVertexAttribLOffsetEXT( GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %d, %d, %ld)\n", vaobj, buffer, index, size, type, stride, offset ); funcs->ext.p_glVertexArrayVertexAttribLOffsetEXT( vaobj, buffer, index, size, type, stride, offset ); @@ -10756,13 +10756,13 @@ static void WINAPI wine_glVertexAttrib1fvNV( GLuint index, const GLfloat* v ) { funcs->ext.p_glVertexAttrib1fvNV( index, v ); } -static void WINAPI wine_glVertexAttrib1hNV( GLuint index, unsigned short x ) { +static void WINAPI wine_glVertexAttrib1hNV( GLuint index, GLhalfNV x ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d)\n", index, x ); funcs->ext.p_glVertexAttrib1hNV( index, x ); } -static void WINAPI wine_glVertexAttrib1hvNV( GLuint index, const unsigned short* v ) { +static void WINAPI wine_glVertexAttrib1hvNV( GLuint index, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", index, v ); funcs->ext.p_glVertexAttrib1hvNV( index, v ); @@ -10876,13 +10876,13 @@ static void WINAPI wine_glVertexAttrib2fvNV( GLuint index, const GLfloat* v ) { funcs->ext.p_glVertexAttrib2fvNV( index, v ); } -static void WINAPI wine_glVertexAttrib2hNV( GLuint index, unsigned short x, unsigned short y ) { +static void WINAPI wine_glVertexAttrib2hNV( GLuint index, GLhalfNV x, GLhalfNV y ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d)\n", index, x, y ); funcs->ext.p_glVertexAttrib2hNV( index, x, y ); } -static void WINAPI wine_glVertexAttrib2hvNV( GLuint index, const unsigned short* v ) { +static void WINAPI wine_glVertexAttrib2hvNV( GLuint index, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", index, v ); funcs->ext.p_glVertexAttrib2hvNV( index, v ); @@ -10996,13 +10996,13 @@ static void WINAPI wine_glVertexAttrib3fvNV( GLuint index, const GLfloat* v ) { funcs->ext.p_glVertexAttrib3fvNV( index, v ); } -static void WINAPI wine_glVertexAttrib3hNV( GLuint index, unsigned short x, unsigned short y, unsigned short z ) { +static void WINAPI wine_glVertexAttrib3hNV( GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d)\n", index, x, y, z ); funcs->ext.p_glVertexAttrib3hNV( index, x, y, z ); } -static void WINAPI wine_glVertexAttrib3hvNV( GLuint index, const unsigned short* v ) { +static void WINAPI wine_glVertexAttrib3hvNV( GLuint index, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", index, v ); funcs->ext.p_glVertexAttrib3hvNV( index, v ); @@ -11212,13 +11212,13 @@ static void WINAPI wine_glVertexAttrib4fvNV( GLuint index, const GLfloat* v ) { funcs->ext.p_glVertexAttrib4fvNV( index, v ); } -static void WINAPI wine_glVertexAttrib4hNV( GLuint index, unsigned short x, unsigned short y, unsigned short z, unsigned short w ) { +static void WINAPI wine_glVertexAttrib4hNV( GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %d, %d, %d)\n", index, x, y, z, w ); funcs->ext.p_glVertexAttrib4hNV( index, x, y, z, w ); } -static void WINAPI wine_glVertexAttrib4hvNV( GLuint index, const unsigned short* v ) { +static void WINAPI wine_glVertexAttrib4hvNV( GLuint index, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", index, v ); funcs->ext.p_glVertexAttrib4hvNV( index, v ); @@ -11914,7 +11914,7 @@ static void WINAPI wine_glVertexAttribs1fvNV( GLuint index, GLsizei count, const funcs->ext.p_glVertexAttribs1fvNV( index, count, v ); } -static void WINAPI wine_glVertexAttribs1hvNV( GLuint index, GLsizei n, const unsigned short* v ) { +static void WINAPI wine_glVertexAttribs1hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", index, n, v ); funcs->ext.p_glVertexAttribs1hvNV( index, n, v ); @@ -11938,7 +11938,7 @@ static void WINAPI wine_glVertexAttribs2fvNV( GLuint index, GLsizei count, const funcs->ext.p_glVertexAttribs2fvNV( index, count, v ); } -static void WINAPI wine_glVertexAttribs2hvNV( GLuint index, GLsizei n, const unsigned short* v ) { +static void WINAPI wine_glVertexAttribs2hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", index, n, v ); funcs->ext.p_glVertexAttribs2hvNV( index, n, v ); @@ -11962,7 +11962,7 @@ static void WINAPI wine_glVertexAttribs3fvNV( GLuint index, GLsizei count, const funcs->ext.p_glVertexAttribs3fvNV( index, count, v ); } -static void WINAPI wine_glVertexAttribs3hvNV( GLuint index, GLsizei n, const unsigned short* v ) { +static void WINAPI wine_glVertexAttribs3hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", index, n, v ); funcs->ext.p_glVertexAttribs3hvNV( index, n, v ); @@ -11986,7 +11986,7 @@ static void WINAPI wine_glVertexAttribs4fvNV( GLuint index, GLsizei count, const funcs->ext.p_glVertexAttribs4fvNV( index, count, v ); } -static void WINAPI wine_glVertexAttribs4hvNV( GLuint index, GLsizei n, const unsigned short* v ) { +static void WINAPI wine_glVertexAttribs4hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %d, %p)\n", index, n, v ); funcs->ext.p_glVertexAttribs4hvNV( index, n, v ); @@ -12298,13 +12298,13 @@ static void WINAPI wine_glVertexWeightfvEXT( const GLfloat* weight ) { funcs->ext.p_glVertexWeightfvEXT( weight ); } -static void WINAPI wine_glVertexWeighthNV( unsigned short weight ) { +static void WINAPI wine_glVertexWeighthNV( GLhalfNV weight ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d)\n", weight ); funcs->ext.p_glVertexWeighthNV( weight ); } -static void WINAPI wine_glVertexWeighthvNV( const unsigned short* weight ) { +static void WINAPI wine_glVertexWeighthvNV( const GLhalfNV* weight ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%p)\n", weight ); funcs->ext.p_glVertexWeighthvNV( weight ); diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 9e6e363f8f3..150200c625e 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -3376,7 +3376,7 @@ static void null_glActiveShaderProgram( GLuint pipeline, GLuint program ) { } static void null_glActiveStencilFaceEXT( GLenum face ) { } static void null_glActiveTexture( GLenum texture ) { } static void null_glActiveTextureARB( GLenum texture ) { } -static void null_glActiveVaryingNV( GLuint program, const char* name ) { } +static void null_glActiveVaryingNV( GLuint program, const GLchar* name ) { } static void null_glAlphaFragmentOp1ATI( GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod ) { } static void null_glAlphaFragmentOp2ATI( GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod ) { } static void null_glAlphaFragmentOp3ATI( GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod ) { } @@ -3386,7 +3386,7 @@ static GLboolean null_glAreTexturesResidentEXT( GLsizei n, const GLuint* texture static void null_glArrayElementEXT( GLint i ) { } static void null_glArrayObjectATI( GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset ) { } static void null_glAsyncMarkerSGIX( GLuint marker ) { } -static void null_glAttachObjectARB( unsigned int containerObj, unsigned int obj ) { } +static void null_glAttachObjectARB( GLhandleARB containerObj, GLhandleARB obj ) { } static void null_glAttachShader( GLuint program, GLuint shader ) { } static void null_glBeginConditionalRender( GLuint id, GLenum mode ) { } static void null_glBeginConditionalRenderNV( GLuint id, GLenum mode ) { } @@ -3401,21 +3401,21 @@ static void null_glBeginTransformFeedbackEXT( GLenum primitiveMode ) { } static void null_glBeginTransformFeedbackNV( GLenum primitiveMode ) { } static void null_glBeginVertexShaderEXT( void ) { } static void null_glBeginVideoCaptureNV( GLuint video_capture_slot ) { } -static void null_glBindAttribLocation( GLuint program, GLuint index, const char* name ) { } -static void null_glBindAttribLocationARB( unsigned int programObj, GLuint index, const char* name ) { } +static void null_glBindAttribLocation( GLuint program, GLuint index, const GLchar* name ) { } +static void null_glBindAttribLocationARB( GLhandleARB programObj, GLuint index, const GLcharARB* name ) { } static void null_glBindBuffer( GLenum target, GLuint buffer ) { } static void null_glBindBufferARB( GLenum target, GLuint buffer ) { } static void null_glBindBufferBase( GLenum target, GLuint index, GLuint buffer ) { } static void null_glBindBufferBaseEXT( GLenum target, GLuint index, GLuint buffer ) { } static void null_glBindBufferBaseNV( GLenum target, GLuint index, GLuint buffer ) { } -static void null_glBindBufferOffsetEXT( GLenum target, GLuint index, GLuint buffer, INT_PTR offset ) { } -static void null_glBindBufferOffsetNV( GLenum target, GLuint index, GLuint buffer, INT_PTR offset ) { } -static void null_glBindBufferRange( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { } -static void null_glBindBufferRangeEXT( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { } -static void null_glBindBufferRangeNV( GLenum target, GLuint index, GLuint buffer, INT_PTR offset, INT_PTR size ) { } -static void null_glBindFragDataLocation( GLuint program, GLuint color, const char* name ) { } -static void null_glBindFragDataLocationEXT( GLuint program, GLuint color, const char* name ) { } -static void null_glBindFragDataLocationIndexed( GLuint program, GLuint colorNumber, GLuint index, const char* name ) { } +static void null_glBindBufferOffsetEXT( GLenum target, GLuint index, GLuint buffer, GLintptr offset ) { } +static void null_glBindBufferOffsetNV( GLenum target, GLuint index, GLuint buffer, GLintptr offset ) { } +static void null_glBindBufferRange( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { } +static void null_glBindBufferRangeEXT( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { } +static void null_glBindBufferRangeNV( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) { } +static void null_glBindFragDataLocation( GLuint program, GLuint color, const GLchar* name ) { } +static void null_glBindFragDataLocationEXT( GLuint program, GLuint color, const GLchar* name ) { } +static void null_glBindFragDataLocationIndexed( GLuint program, GLuint colorNumber, GLuint index, const GLchar* name ) { } static void null_glBindFragmentShaderATI( GLuint id ) { } static void null_glBindFramebuffer( GLenum target, GLuint framebuffer ) { } static void null_glBindFramebufferEXT( GLenum target, GLuint framebuffer ) { } @@ -3438,9 +3438,9 @@ static void null_glBindTransformFeedback( GLenum target, GLuint id ) { } static void null_glBindTransformFeedbackNV( GLenum target, GLuint id ) { } static void null_glBindVertexArray( GLuint array ) { } static void null_glBindVertexArrayAPPLE( GLuint array ) { } -static void null_glBindVertexBuffer( GLuint bindingindex, GLuint buffer, INT_PTR offset, GLsizei stride ) { } +static void null_glBindVertexBuffer( GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride ) { } static void null_glBindVertexShaderEXT( GLuint id ) { } -static void null_glBindVideoCaptureStreamBufferNV( GLuint video_capture_slot, GLuint stream, GLenum frame_region, INT_PTR offset ) { } +static void null_glBindVideoCaptureStreamBufferNV( GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset ) { } static void null_glBindVideoCaptureStreamTextureNV( GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture ) { } static void null_glBinormal3bEXT( GLbyte bx, GLbyte by, GLbyte bz ) { } static void null_glBinormal3bvEXT( const GLbyte* v ) { } @@ -3476,20 +3476,20 @@ static void null_glBlendFunci( GLuint buf, GLenum src, GLenum dst ) { } static void null_glBlendFunciARB( GLuint buf, GLenum src, GLenum dst ) { } static void null_glBlitFramebuffer( GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter ) { } static void null_glBlitFramebufferEXT( GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter ) { } -static void null_glBufferAddressRangeNV( GLenum pname, GLuint index, UINT64 address, INT_PTR length ) { } -static void null_glBufferData( GLenum target, INT_PTR size, const GLvoid* data, GLenum usage ) { } -static void null_glBufferDataARB( GLenum target, INT_PTR size, const GLvoid* data, GLenum usage ) { } +static void null_glBufferAddressRangeNV( GLenum pname, GLuint index, UINT64 address, GLsizeiptr length ) { } +static void null_glBufferData( GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage ) { } +static void null_glBufferDataARB( GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage ) { } static void null_glBufferParameteriAPPLE( GLenum target, GLenum pname, GLint param ) { } static GLuint null_glBufferRegionEnabled( void ) { return 0; } -static void null_glBufferSubData( GLenum target, INT_PTR offset, INT_PTR size, const GLvoid* data ) { } -static void null_glBufferSubDataARB( GLenum target, INT_PTR offset, INT_PTR size, const GLvoid* data ) { } +static void null_glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data ) { } +static void null_glBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data ) { } static GLenum null_glCheckFramebufferStatus( GLenum target ) { return 0; } static GLenum null_glCheckFramebufferStatusEXT( GLenum target ) { return 0; } static GLenum null_glCheckNamedFramebufferStatusEXT( GLuint framebuffer, GLenum target ) { return 0; } static void null_glClampColor( GLenum target, GLenum clamp ) { } static void null_glClampColorARB( GLenum target, GLenum clamp ) { } static void null_glClearBufferData( GLenum target, GLenum internalformat, GLenum format, GLenum type, const void* data ) { } -static void null_glClearBufferSubData( GLenum target, GLenum internalformat, INT_PTR offset, INT_PTR size, GLenum format, GLenum type, const void* data ) { } +static void null_glClearBufferSubData( GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void* data ) { } static void null_glClearBufferfi( GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil ) { } static void null_glClearBufferfv( GLenum buffer, GLint drawbuffer, const GLfloat* value ) { } static void null_glClearBufferiv( GLenum buffer, GLint drawbuffer, const GLint* value ) { } @@ -3499,7 +3499,7 @@ static void null_glClearColorIuiEXT( GLuint red, GLuint green, GLuint blue, GLui static void null_glClearDepthdNV( GLdouble depth ) { } static void null_glClearDepthf( GLfloat d ) { } static void null_glClearNamedBufferDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void* data ) { } -static void null_glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, INT_PTR offset, INT_PTR size, const void* data ) { } +static void null_glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void* data ) { } static void null_glClientActiveTexture( GLenum texture ) { } static void null_glClientActiveTextureARB( GLenum texture ) { } static void null_glClientActiveVertexStreamATI( GLenum stream ) { } @@ -3507,12 +3507,12 @@ static void null_glClientAttribDefaultEXT( GLbitfield mask ) { } static GLenum null_glClientWaitSync( GLvoid* sync, GLbitfield flags, UINT64 timeout ) { return 0; } static void null_glColor3fVertex3fSUN( GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z ) { } static void null_glColor3fVertex3fvSUN( const GLfloat* c, const GLfloat* v ) { } -static void null_glColor3hNV( unsigned short red, unsigned short green, unsigned short blue ) { } -static void null_glColor3hvNV( const unsigned short* v ) { } +static void null_glColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue ) { } +static void null_glColor3hvNV( const GLhalfNV* v ) { } static void null_glColor4fNormal3fVertex3fSUN( GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z ) { } static void null_glColor4fNormal3fVertex3fvSUN( const GLfloat* c, const GLfloat* n, const GLfloat* v ) { } -static void null_glColor4hNV( unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha ) { } -static void null_glColor4hvNV( const unsigned short* v ) { } +static void null_glColor4hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha ) { } +static void null_glColor4hvNV( const GLhalfNV* v ) { } static void null_glColor4ubVertex2fSUN( GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y ) { } static void null_glColor4ubVertex2fvSUN( const GLubyte* c, const GLfloat* v ) { } static void null_glColor4ubVertex3fSUN( GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z ) { } @@ -3547,8 +3547,8 @@ static void null_glCombinerParameteriNV( GLenum pname, GLint param ) { } static void null_glCombinerParameterivNV( GLenum pname, const GLint* params ) { } static void null_glCombinerStageParameterfvNV( GLenum stage, GLenum pname, const GLfloat* params ) { } static void null_glCompileShader( GLuint shader ) { } -static void null_glCompileShaderARB( unsigned int shaderObj ) { } -static void null_glCompileShaderIncludeARB( GLuint shader, GLsizei count, const char** path, const GLint* length ) { } +static void null_glCompileShaderARB( GLhandleARB shaderObj ) { } +static void null_glCompileShaderIncludeARB( GLuint shader, GLsizei count, const GLchar** path, const GLint* length ) { } static void null_glCompressedMultiTexImage1DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid* bits ) { } static void null_glCompressedMultiTexImage2DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* bits ) { } static void null_glCompressedMultiTexImage3DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* bits ) { } @@ -3585,7 +3585,7 @@ static void null_glConvolutionParameteri( GLenum target, GLenum pname, GLint par static void null_glConvolutionParameteriEXT( GLenum target, GLenum pname, GLint params ) { } static void null_glConvolutionParameteriv( GLenum target, GLenum pname, const GLint* params ) { } static void null_glConvolutionParameterivEXT( GLenum target, GLenum pname, const GLint* params ) { } -static void null_glCopyBufferSubData( GLenum readTarget, GLenum writeTarget, INT_PTR readOffset, INT_PTR writeOffset, INT_PTR size ) { } +static void null_glCopyBufferSubData( GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) { } static void null_glCopyColorSubTable( GLenum target, GLsizei start, GLint x, GLint y, GLsizei width ) { } static void null_glCopyColorSubTableEXT( GLenum target, GLsizei start, GLint x, GLint y, GLsizei width ) { } static void null_glCopyColorTable( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width ) { } @@ -3618,11 +3618,11 @@ static void null_glCoverFillPathNV( GLuint path, GLenum coverMode ) { } static void null_glCoverStrokePathInstancedNV( GLsizei numPaths, GLenum pathNameType, const GLvoid* paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat* transformValues ) { } static void null_glCoverStrokePathNV( GLuint path, GLenum coverMode ) { } static GLuint null_glCreateProgram( void ) { return 0; } -static unsigned int null_glCreateProgramObjectARB( void ) { return 0; } +static GLhandleARB null_glCreateProgramObjectARB( void ) { return 0; } static GLuint null_glCreateShader( GLenum type ) { return 0; } -static unsigned int null_glCreateShaderObjectARB( GLenum shaderType ) { return 0; } -static GLuint null_glCreateShaderProgramEXT( GLenum type, const char* string ) { return 0; } -static GLuint null_glCreateShaderProgramv( GLenum type, GLsizei count, const char* const* strings ) { return 0; } +static GLhandleARB null_glCreateShaderObjectARB( GLenum shaderType ) { return 0; } +static GLuint null_glCreateShaderProgramEXT( GLenum type, const GLchar* string ) { return 0; } +static GLuint null_glCreateShaderProgramv( GLenum type, GLsizei count, const GLchar* const* strings ) { return 0; } static GLvoid* null_glCreateSyncFromCLeventARB( void * context, void * event, GLbitfield flags ) { return 0; } static void null_glCullParameterdvEXT( GLenum pname, GLdouble* params ) { } static void null_glCullParameterfvEXT( GLenum pname, GLfloat* params ) { } @@ -3633,9 +3633,9 @@ static void null_glDebugMessageCallbackARB( void * callback, const GLvoid* userP static void null_glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled ) { } static void null_glDebugMessageControlARB( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled ) { } static void null_glDebugMessageEnableAMD( GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled ) { } -static void null_glDebugMessageInsert( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* buf ) { } -static void null_glDebugMessageInsertAMD( GLenum category, GLenum severity, GLuint id, GLsizei length, const char* buf ) { } -static void null_glDebugMessageInsertARB( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* buf ) { } +static void null_glDebugMessageInsert( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf ) { } +static void null_glDebugMessageInsertAMD( GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf ) { } +static void null_glDebugMessageInsertARB( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf ) { } static void null_glDeformSGIX( GLbitfield mask ) { } static void null_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, const GLdouble* points ) { } static void null_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, const GLfloat* points ) { } @@ -3648,9 +3648,9 @@ static void null_glDeleteFencesNV( GLsizei n, const GLuint* fences ) { } static void null_glDeleteFragmentShaderATI( GLuint id ) { } static void null_glDeleteFramebuffers( GLsizei n, const GLuint* framebuffers ) { } static void null_glDeleteFramebuffersEXT( GLsizei n, const GLuint* framebuffers ) { } -static void null_glDeleteNamedStringARB( GLint namelen, const char* name ) { } +static void null_glDeleteNamedStringARB( GLint namelen, const GLchar* name ) { } static void null_glDeleteNamesAMD( GLenum identifier, GLuint num, const GLuint* names ) { } -static void null_glDeleteObjectARB( unsigned int obj ) { } +static void null_glDeleteObjectARB( GLhandleARB obj ) { } static void null_glDeleteObjectBufferATI( GLuint buffer ) { } static void null_glDeleteOcclusionQueriesNV( GLsizei n, const GLuint* ids ) { } static void null_glDeletePathsNV( GLuint path, GLsizei range ) { } @@ -3678,7 +3678,7 @@ static void null_glDepthRangeArrayv( GLuint first, GLsizei count, const GLdouble static void null_glDepthRangeIndexed( GLuint index, GLdouble n, GLdouble f ) { } static void null_glDepthRangedNV( GLdouble zNear, GLdouble zFar ) { } static void null_glDepthRangef( GLfloat n, GLfloat f ) { } -static void null_glDetachObjectARB( unsigned int containerObj, unsigned int attachedObj ) { } +static void null_glDetachObjectARB( GLhandleARB containerObj, GLhandleARB attachedObj ) { } static void null_glDetachShader( GLuint program, GLuint shader ) { } static void null_glDetailTexFuncSGIS( GLenum target, GLsizei n, const GLfloat* points ) { } static void null_glDisableClientStateIndexedEXT( GLenum array, GLuint index ) { } @@ -3689,7 +3689,7 @@ static void null_glDisableVertexAttribArray( GLuint index ) { } static void null_glDisableVertexAttribArrayARB( GLuint index ) { } static void null_glDisablei( GLenum target, GLuint index ) { } static void null_glDispatchCompute( GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z ) { } -static void null_glDispatchComputeIndirect( INT_PTR indirect ) { } +static void null_glDispatchComputeIndirect( GLintptr indirect ) { } static void null_glDrawArraysEXT( GLenum mode, GLint first, GLsizei count ) { } static void null_glDrawArraysIndirect( GLenum mode, const GLvoid* indirect ) { } static void null_glDrawArraysInstanced( GLenum mode, GLint first, GLsizei count, GLsizei instancecount ) { } @@ -3756,9 +3756,9 @@ static void null_glFinishFenceAPPLE( GLuint fence ) { } static void null_glFinishFenceNV( GLuint fence ) { } static void null_glFinishObjectAPPLE( GLenum object, GLint name ) { } static void null_glFinishTextureSUNX( void ) { } -static void null_glFlushMappedBufferRange( GLenum target, INT_PTR offset, INT_PTR length ) { } -static void null_glFlushMappedBufferRangeAPPLE( GLenum target, INT_PTR offset, INT_PTR size ) { } -static void null_glFlushMappedNamedBufferRangeEXT( GLuint buffer, INT_PTR offset, INT_PTR length ) { } +static void null_glFlushMappedBufferRange( GLenum target, GLintptr offset, GLsizeiptr length ) { } +static void null_glFlushMappedBufferRangeAPPLE( GLenum target, GLintptr offset, GLsizeiptr size ) { } +static void null_glFlushMappedNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length ) { } static void null_glFlushPixelDataRangeNV( GLenum target ) { } static void null_glFlushRasterSGIX( void ) { } static void null_glFlushVertexArrayRangeAPPLE( GLsizei length, GLvoid* pointer ) { } @@ -3775,8 +3775,8 @@ static void null_glFogCoordf( GLfloat coord ) { } static void null_glFogCoordfEXT( GLfloat coord ) { } static void null_glFogCoordfv( const GLfloat* coord ) { } static void null_glFogCoordfvEXT( const GLfloat* coord ) { } -static void null_glFogCoordhNV( unsigned short fog ) { } -static void null_glFogCoordhvNV( const unsigned short* fog ) { } +static void null_glFogCoordhNV( GLhalfNV fog ) { } +static void null_glFogCoordhvNV( const GLhalfNV* fog ) { } static void null_glFogFuncSGIS( GLsizei n, const GLfloat* points ) { } static void null_glFragmentColorMaterialSGIX( GLenum face, GLenum mode ) { } static void null_glFragmentLightModelfSGIX( GLenum pname, GLfloat param ) { } @@ -3846,24 +3846,24 @@ static void null_glGenerateMipmapEXT( GLenum target ) { } static void null_glGenerateMultiTexMipmapEXT( GLenum texunit, GLenum target ) { } static void null_glGenerateTextureMipmapEXT( GLuint texture, GLenum target ) { } static void null_glGetActiveAtomicCounterBufferiv( GLuint program, GLuint bufferIndex, GLenum pname, GLint* params ) { } -static void null_glGetActiveAttrib( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, char* name ) { } -static void null_glGetActiveAttribARB( unsigned int programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, char* name ) { } -static void null_glGetActiveSubroutineName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, char* name ) { } -static void null_glGetActiveSubroutineUniformName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, char* name ) { } +static void null_glGetActiveAttrib( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name ) { } +static void null_glGetActiveAttribARB( GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLcharARB* name ) { } +static void null_glGetActiveSubroutineName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar* name ) { } +static void null_glGetActiveSubroutineUniformName( GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar* name ) { } static void null_glGetActiveSubroutineUniformiv( GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values ) { } -static void null_glGetActiveUniform( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, char* name ) { } -static void null_glGetActiveUniformARB( unsigned int programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, char* name ) { } -static void null_glGetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, char* uniformBlockName ) { } +static void null_glGetActiveUniform( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name ) { } +static void null_glGetActiveUniformARB( GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLcharARB* name ) { } +static void null_glGetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName ) { } static void null_glGetActiveUniformBlockiv( GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params ) { } -static void null_glGetActiveUniformName( GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, char* uniformName ) { } +static void null_glGetActiveUniformName( GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName ) { } static void null_glGetActiveUniformsiv( GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params ) { } -static void null_glGetActiveVaryingNV( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { } +static void null_glGetActiveVaryingNV( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { } static void null_glGetArrayObjectfvATI( GLenum array, GLenum pname, GLfloat* params ) { } static void null_glGetArrayObjectivATI( GLenum array, GLenum pname, GLint* params ) { } -static void null_glGetAttachedObjectsARB( unsigned int containerObj, GLsizei maxCount, GLsizei* count, unsigned int* obj ) { } +static void null_glGetAttachedObjectsARB( GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB* obj ) { } static void null_glGetAttachedShaders( GLuint program, GLsizei maxCount, GLsizei* count, GLuint* obj ) { } -static GLint null_glGetAttribLocation( GLuint program, const char* name ) { return 0; } -static GLint null_glGetAttribLocationARB( unsigned int programObj, const char* name ) { return 0; } +static GLint null_glGetAttribLocation( GLuint program, const GLchar* name ) { return 0; } +static GLint null_glGetAttribLocationARB( GLhandleARB programObj, const GLcharARB* name ) { return 0; } static void null_glGetBooleanIndexedvEXT( GLenum target, GLuint index, GLboolean* data ) { } static void null_glGetBooleani_v( GLenum target, GLuint index, GLboolean* data ) { } static void null_glGetBufferParameteri64v( GLenum target, GLenum pname, INT64* params ) { } @@ -3872,8 +3872,8 @@ static void null_glGetBufferParameterivARB( GLenum target, GLenum pname, GLint* static void null_glGetBufferParameterui64vNV( GLenum target, GLenum pname, UINT64* params ) { } static void null_glGetBufferPointerv( GLenum target, GLenum pname, GLvoid** params ) { } static void null_glGetBufferPointervARB( GLenum target, GLenum pname, GLvoid** params ) { } -static void null_glGetBufferSubData( GLenum target, INT_PTR offset, INT_PTR size, GLvoid* data ) { } -static void null_glGetBufferSubDataARB( GLenum target, INT_PTR offset, INT_PTR size, GLvoid* data ) { } +static void null_glGetBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data ) { } +static void null_glGetBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid* data ) { } static void null_glGetColorTable( GLenum target, GLenum format, GLenum type, GLvoid* table ) { } static void null_glGetColorTableEXT( GLenum target, GLenum format, GLenum type, GLvoid* data ) { } static void null_glGetColorTableParameterfv( GLenum target, GLenum pname, GLfloat* params ) { } @@ -3898,9 +3898,9 @@ static void null_glGetConvolutionParameterfv( GLenum target, GLenum pname, GLflo static void null_glGetConvolutionParameterfvEXT( GLenum target, GLenum pname, GLfloat* params ) { } static void null_glGetConvolutionParameteriv( GLenum target, GLenum pname, GLint* params ) { } static void null_glGetConvolutionParameterivEXT( GLenum target, GLenum pname, GLint* params ) { } -static GLuint null_glGetDebugMessageLog( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, char* messageLog ) { return 0; } -static GLuint null_glGetDebugMessageLogAMD( GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, char* message ) { return 0; } -static GLuint null_glGetDebugMessageLogARB( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, char* messageLog ) { return 0; } +static GLuint null_glGetDebugMessageLog( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog ) { return 0; } +static GLuint null_glGetDebugMessageLogAMD( GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message ) { return 0; } +static GLuint null_glGetDebugMessageLogARB( GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog ) { return 0; } static void null_glGetDetailTexFuncSGIS( GLenum target, GLfloat* points ) { } static void null_glGetDoubleIndexedvEXT( GLenum target, GLuint index, GLdouble* data ) { } static void null_glGetDoublei_v( GLenum target, GLuint index, GLdouble* data ) { } @@ -3910,9 +3910,9 @@ static void null_glGetFinalCombinerInputParameterivNV( GLenum variable, GLenum p static void null_glGetFloatIndexedvEXT( GLenum target, GLuint index, GLfloat* data ) { } static void null_glGetFloati_v( GLenum target, GLuint index, GLfloat* data ) { } static void null_glGetFogFuncSGIS( GLfloat* points ) { } -static GLint null_glGetFragDataIndex( GLuint program, const char* name ) { return 0; } -static GLint null_glGetFragDataLocation( GLuint program, const char* name ) { return 0; } -static GLint null_glGetFragDataLocationEXT( GLuint program, const char* name ) { return 0; } +static GLint null_glGetFragDataIndex( GLuint program, const GLchar* name ) { return 0; } +static GLint null_glGetFragDataLocation( GLuint program, const GLchar* name ) { return 0; } +static GLint null_glGetFragDataLocationEXT( GLuint program, const GLchar* name ) { return 0; } static void null_glGetFragmentLightfvSGIX( GLenum light, GLenum pname, GLfloat* params ) { } static void null_glGetFragmentLightivSGIX( GLenum light, GLenum pname, GLint* params ) { } static void null_glGetFragmentMaterialfvSGIX( GLenum face, GLenum pname, GLfloat* params ) { } @@ -3922,7 +3922,7 @@ static void null_glGetFramebufferAttachmentParameterivEXT( GLenum target, GLenum static void null_glGetFramebufferParameteriv( GLenum target, GLenum pname, GLint* params ) { } static void null_glGetFramebufferParameterivEXT( GLuint framebuffer, GLenum pname, GLint* params ) { } static GLenum null_glGetGraphicsResetStatusARB( void ) { return 0; } -static unsigned int null_glGetHandleARB( GLenum pname ) { return 0; } +static GLhandleARB null_glGetHandleARB( GLenum pname ) { return 0; } static void null_glGetHistogram( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid* values ) { } static void null_glGetHistogramEXT( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid* values ) { } static void null_glGetHistogramParameterfv( GLenum target, GLenum pname, GLfloat* params ) { } @@ -3932,7 +3932,7 @@ static void null_glGetHistogramParameterivEXT( GLenum target, GLenum pname, GLin static UINT64 null_glGetImageHandleNV( GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format ) { return 0; } static void null_glGetImageTransformParameterfvHP( GLenum target, GLenum pname, GLfloat* params ) { } static void null_glGetImageTransformParameterivHP( GLenum target, GLenum pname, GLint* params ) { } -static void null_glGetInfoLogARB( unsigned int obj, GLsizei maxLength, GLsizei* length, char* infoLog ) { } +static void null_glGetInfoLogARB( GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* infoLog ) { } static GLint null_glGetInstrumentsSGIX( void ) { return 0; } static void null_glGetInteger64i_v( GLenum target, GLuint index, INT64* data ) { } static void null_glGetInteger64v( GLenum pname, INT64* params ) { } @@ -3978,7 +3978,7 @@ static void null_glGetMultisamplefvNV( GLenum pname, GLuint index, GLfloat* val static void null_glGetNamedBufferParameterivEXT( GLuint buffer, GLenum pname, GLint* params ) { } static void null_glGetNamedBufferParameterui64vNV( GLuint buffer, GLenum pname, UINT64* params ) { } static void null_glGetNamedBufferPointervEXT( GLuint buffer, GLenum pname, GLvoid** params ) { } -static void null_glGetNamedBufferSubDataEXT( GLuint buffer, INT_PTR offset, INT_PTR size, GLvoid* data ) { } +static void null_glGetNamedBufferSubDataEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid* data ) { } static void null_glGetNamedFramebufferAttachmentParameterivEXT( GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params ) { } static void null_glGetNamedFramebufferParameterivEXT( GLuint framebuffer, GLenum pname, GLint* params ) { } static void null_glGetNamedProgramLocalParameterIivEXT( GLuint program, GLenum target, GLuint index, GLint* params ) { } @@ -3988,15 +3988,15 @@ static void null_glGetNamedProgramLocalParameterfvEXT( GLuint program, GLenum ta static void null_glGetNamedProgramStringEXT( GLuint program, GLenum target, GLenum pname, GLvoid* string ) { } static void null_glGetNamedProgramivEXT( GLuint program, GLenum target, GLenum pname, GLint* params ) { } static void null_glGetNamedRenderbufferParameterivEXT( GLuint renderbuffer, GLenum pname, GLint* params ) { } -static void null_glGetNamedStringARB( GLint namelen, const char* name, GLsizei bufSize, GLint* stringlen, char* string ) { } -static void null_glGetNamedStringivARB( GLint namelen, const char* name, GLenum pname, GLint* params ) { } +static void null_glGetNamedStringARB( GLint namelen, const GLchar* name, GLsizei bufSize, GLint* stringlen, GLchar* string ) { } +static void null_glGetNamedStringivARB( GLint namelen, const GLchar* name, GLenum pname, GLint* params ) { } static void null_glGetObjectBufferfvATI( GLuint buffer, GLenum pname, GLfloat* params ) { } static void null_glGetObjectBufferivATI( GLuint buffer, GLenum pname, GLint* params ) { } -static void null_glGetObjectLabel( GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, char* label ) { } -static void null_glGetObjectParameterfvARB( unsigned int obj, GLenum pname, GLfloat* params ) { } +static void null_glGetObjectLabel( GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label ) { } +static void null_glGetObjectParameterfvARB( GLhandleARB obj, GLenum pname, GLfloat* params ) { } static void null_glGetObjectParameterivAPPLE( GLenum objectType, GLuint name, GLenum pname, GLint* params ) { } -static void null_glGetObjectParameterivARB( unsigned int obj, GLenum pname, GLint* params ) { } -static void null_glGetObjectPtrLabel( const void* ptr, GLsizei bufSize, GLsizei* length, char* label ) { } +static void null_glGetObjectParameterivARB( GLhandleARB obj, GLenum pname, GLint* params ) { } +static void null_glGetObjectPtrLabel( const void* ptr, GLsizei bufSize, GLsizei* length, GLchar* label ) { } static void null_glGetOcclusionQueryivNV( GLuint id, GLenum pname, GLint* params ) { } static void null_glGetOcclusionQueryuivNV( GLuint id, GLenum pname, GLuint* params ) { } static void null_glGetPathColorGenfvNV( GLenum color, GLenum pname, GLfloat* value ) { } @@ -4014,9 +4014,9 @@ static void null_glGetPathTexGenfvNV( GLenum texCoordSet, GLenum pname, GLfloat* static void null_glGetPathTexGenivNV( GLenum texCoordSet, GLenum pname, GLint* value ) { } static void null_glGetPerfMonitorCounterDataAMD( GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint* bytesWritten ) { } static void null_glGetPerfMonitorCounterInfoAMD( GLuint group, GLuint counter, GLenum pname, GLvoid* data ) { } -static void null_glGetPerfMonitorCounterStringAMD( GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, char* counterString ) { } +static void null_glGetPerfMonitorCounterStringAMD( GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar* counterString ) { } static void null_glGetPerfMonitorCountersAMD( GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters ) { } -static void null_glGetPerfMonitorGroupStringAMD( GLuint group, GLsizei bufSize, GLsizei* length, char* groupString ) { } +static void null_glGetPerfMonitorGroupStringAMD( GLuint group, GLsizei bufSize, GLsizei* length, GLchar* groupString ) { } static void null_glGetPerfMonitorGroupsAMD( GLint* numGroups, GLsizei groupsSize, GLuint* groups ) { } static void null_glGetPixelTexGenParameterfvSGIS( GLenum pname, GLfloat* params ) { } static void null_glGetPixelTexGenParameterivSGIS( GLenum pname, GLint* params ) { } @@ -4029,7 +4029,7 @@ static void null_glGetProgramEnvParameterIivNV( GLenum target, GLuint index, GLi static void null_glGetProgramEnvParameterIuivNV( GLenum target, GLuint index, GLuint* params ) { } static void null_glGetProgramEnvParameterdvARB( GLenum target, GLuint index, GLdouble* params ) { } static void null_glGetProgramEnvParameterfvARB( GLenum target, GLuint index, GLfloat* params ) { } -static void null_glGetProgramInfoLog( GLuint program, GLsizei bufSize, GLsizei* length, char* infoLog ) { } +static void null_glGetProgramInfoLog( GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { } static void null_glGetProgramInterfaceiv( GLuint program, GLenum programInterface, GLenum pname, GLint* params ) { } static void null_glGetProgramLocalParameterIivNV( GLenum target, GLuint index, GLint* params ) { } static void null_glGetProgramLocalParameterIuivNV( GLenum target, GLuint index, GLuint* params ) { } @@ -4039,12 +4039,12 @@ static void null_glGetProgramNamedParameterdvNV( GLuint id, GLsizei len, const G static void null_glGetProgramNamedParameterfvNV( GLuint id, GLsizei len, const GLubyte* name, GLfloat* params ) { } static void null_glGetProgramParameterdvNV( GLenum target, GLuint index, GLenum pname, GLdouble* params ) { } static void null_glGetProgramParameterfvNV( GLenum target, GLuint index, GLenum pname, GLfloat* params ) { } -static void null_glGetProgramPipelineInfoLog( GLuint pipeline, GLsizei bufSize, GLsizei* length, char* infoLog ) { } +static void null_glGetProgramPipelineInfoLog( GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { } static void null_glGetProgramPipelineiv( GLuint pipeline, GLenum pname, GLint* params ) { } -static GLuint null_glGetProgramResourceIndex( GLuint program, GLenum programInterface, const char* name ) { return 0; } -static GLint null_glGetProgramResourceLocation( GLuint program, GLenum programInterface, const char* name ) { return 0; } -static GLint null_glGetProgramResourceLocationIndex( GLuint program, GLenum programInterface, const char* name ) { return 0; } -static void null_glGetProgramResourceName( GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, char* name ) { } +static GLuint null_glGetProgramResourceIndex( GLuint program, GLenum programInterface, const GLchar* name ) { return 0; } +static GLint null_glGetProgramResourceLocation( GLuint program, GLenum programInterface, const GLchar* name ) { return 0; } +static GLint null_glGetProgramResourceLocationIndex( GLuint program, GLenum programInterface, const GLchar* name ) { return 0; } +static void null_glGetProgramResourceName( GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar* name ) { } static void null_glGetProgramResourceiv( GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei* length, GLint* params ) { } static void null_glGetProgramStageiv( GLuint program, GLenum shadertype, GLenum pname, GLint* values ) { } static void null_glGetProgramStringARB( GLenum target, GLenum pname, GLvoid* string ) { } @@ -4072,15 +4072,15 @@ static void null_glGetSamplerParameterfv( GLuint sampler, GLenum pname, GLfloat* static void null_glGetSamplerParameteriv( GLuint sampler, GLenum pname, GLint* params ) { } static void null_glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid* row, GLvoid* column, GLvoid* span ) { } static void null_glGetSeparableFilterEXT( GLenum target, GLenum format, GLenum type, GLvoid* row, GLvoid* column, GLvoid* span ) { } -static void null_glGetShaderInfoLog( GLuint shader, GLsizei bufSize, GLsizei* length, char* infoLog ) { } +static void null_glGetShaderInfoLog( GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog ) { } static void null_glGetShaderPrecisionFormat( GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision ) { } -static void null_glGetShaderSource( GLuint shader, GLsizei bufSize, GLsizei* length, char* source ) { } -static void null_glGetShaderSourceARB( unsigned int obj, GLsizei maxLength, GLsizei* length, char* source ) { } +static void null_glGetShaderSource( GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* source ) { } +static void null_glGetShaderSourceARB( GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* source ) { } static void null_glGetShaderiv( GLuint shader, GLenum pname, GLint* params ) { } static void null_glGetSharpenTexFuncSGIS( GLenum target, GLfloat* points ) { } static const GLubyte * null_glGetStringi( GLenum name, GLuint index ) { return 0; } -static GLuint null_glGetSubroutineIndex( GLuint program, GLenum shadertype, const char* name ) { return 0; } -static GLint null_glGetSubroutineUniformLocation( GLuint program, GLenum shadertype, const char* name ) { return 0; } +static GLuint null_glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar* name ) { return 0; } +static GLint null_glGetSubroutineUniformLocation( GLuint program, GLenum shadertype, const GLchar* name ) { return 0; } static void null_glGetSynciv( GLvoid* sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) { } static void null_glGetTexBumpParameterfvATI( GLenum pname, GLfloat* param ) { } static void null_glGetTexBumpParameterivATI( GLenum pname, GLint* param ) { } @@ -4100,22 +4100,22 @@ static void null_glGetTextureParameterfvEXT( GLuint texture, GLenum target, GLen static void null_glGetTextureParameterivEXT( GLuint texture, GLenum target, GLenum pname, GLint* params ) { } static UINT64 null_glGetTextureSamplerHandleNV( GLuint texture, GLuint sampler ) { return 0; } static void null_glGetTrackMatrixivNV( GLenum target, GLuint address, GLenum pname, GLint* params ) { } -static void null_glGetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { } -static void null_glGetTransformFeedbackVaryingEXT( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, char* name ) { } +static void null_glGetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { } +static void null_glGetTransformFeedbackVaryingEXT( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) { } static void null_glGetTransformFeedbackVaryingNV( GLuint program, GLuint index, GLint* location ) { } -static GLuint null_glGetUniformBlockIndex( GLuint program, const char* uniformBlockName ) { return 0; } +static GLuint null_glGetUniformBlockIndex( GLuint program, const GLchar* uniformBlockName ) { return 0; } static GLint null_glGetUniformBufferSizeEXT( GLuint program, GLint location ) { return 0; } -static void null_glGetUniformIndices( GLuint program, GLsizei uniformCount, const char* const* uniformNames, GLuint* uniformIndices ) { } -static GLint null_glGetUniformLocation( GLuint program, const char* name ) { return 0; } -static GLint null_glGetUniformLocationARB( unsigned int programObj, const char* name ) { return 0; } -static INT_PTR null_glGetUniformOffsetEXT( GLuint program, GLint location ) { return 0; } +static void null_glGetUniformIndices( GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices ) { } +static GLint null_glGetUniformLocation( GLuint program, const GLchar* name ) { return 0; } +static GLint null_glGetUniformLocationARB( GLhandleARB programObj, const GLcharARB* name ) { return 0; } +static GLintptr null_glGetUniformOffsetEXT( GLuint program, GLint location ) { return 0; } static void null_glGetUniformSubroutineuiv( GLenum shadertype, GLint location, GLuint* params ) { } static void null_glGetUniformdv( GLuint program, GLint location, GLdouble* params ) { } static void null_glGetUniformfv( GLuint program, GLint location, GLfloat* params ) { } -static void null_glGetUniformfvARB( unsigned int programObj, GLint location, GLfloat* params ) { } +static void null_glGetUniformfvARB( GLhandleARB programObj, GLint location, GLfloat* params ) { } static void null_glGetUniformi64vNV( GLuint program, GLint location, INT64* params ) { } static void null_glGetUniformiv( GLuint program, GLint location, GLint* params ) { } -static void null_glGetUniformivARB( unsigned int programObj, GLint location, GLint* params ) { } +static void null_glGetUniformivARB( GLhandleARB programObj, GLint location, GLint* params ) { } static void null_glGetUniformui64vNV( GLuint program, GLint location, UINT64* params ) { } static void null_glGetUniformuiv( GLuint program, GLint location, GLuint* params ) { } static void null_glGetUniformuivEXT( GLuint program, GLint location, GLuint* params ) { } @@ -4125,7 +4125,7 @@ static void null_glGetVariantBooleanvEXT( GLuint id, GLenum value, GLboolean* da static void null_glGetVariantFloatvEXT( GLuint id, GLenum value, GLfloat* data ) { } static void null_glGetVariantIntegervEXT( GLuint id, GLenum value, GLint* data ) { } static void null_glGetVariantPointervEXT( GLuint id, GLenum value, GLvoid** data ) { } -static GLint null_glGetVaryingLocationNV( GLuint program, const char* name ) { return 0; } +static GLint null_glGetVaryingLocationNV( GLuint program, const GLchar* name ) { return 0; } static void null_glGetVertexAttribArrayObjectfvATI( GLuint index, GLenum pname, GLfloat* params ) { } static void null_glGetVertexAttribArrayObjectivATI( GLuint index, GLenum pname, GLint* params ) { } static void null_glGetVertexAttribIiv( GLuint index, GLenum pname, GLint* params ) { } @@ -4190,7 +4190,7 @@ static void null_glImageTransformParameterfHP( GLenum target, GLenum pname, GLfl static void null_glImageTransformParameterfvHP( GLenum target, GLenum pname, const GLfloat* params ) { } static void null_glImageTransformParameteriHP( GLenum target, GLenum pname, GLint param ) { } static void null_glImageTransformParameterivHP( GLenum target, GLenum pname, const GLint* params ) { } -static GLvoid* null_glImportSyncEXT( GLenum external_sync_type, INT_PTR external_sync, GLbitfield flags ) { return 0; } +static GLvoid* null_glImportSyncEXT( GLenum external_sync_type, GLintptr external_sync, GLbitfield flags ) { return 0; } static void null_glIndexFormatNV( GLenum type, GLsizei stride ) { } static void null_glIndexFuncEXT( GLenum func, GLclampf ref ) { } static void null_glIndexMaterialEXT( GLenum face, GLenum mode ) { } @@ -4200,7 +4200,7 @@ static void null_glInsertComponentEXT( GLuint res, GLuint src, GLuint num ) { } static void null_glInstrumentsBufferSGIX( GLsizei size, GLint* buffer ) { } static void null_glInterpolatePathsNV( GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight ) { } static void null_glInvalidateBufferData( GLuint buffer ) { } -static void null_glInvalidateBufferSubData( GLuint buffer, INT_PTR offset, INT_PTR length ) { } +static void null_glInvalidateBufferSubData( GLuint buffer, GLintptr offset, GLsizeiptr length ) { } static void null_glInvalidateFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments ) { } static void null_glInvalidateSubFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height ) { } static void null_glInvalidateTexImage( GLuint texture, GLint level ) { } @@ -4218,7 +4218,7 @@ static GLboolean null_glIsFramebufferEXT( GLuint framebuffer ) { return 0; } static GLboolean null_glIsImageHandleResidentNV( UINT64 handle ) { return 0; } static GLboolean null_glIsNameAMD( GLenum identifier, GLuint name ) { return 0; } static GLboolean null_glIsNamedBufferResidentNV( GLuint buffer ) { return 0; } -static GLboolean null_glIsNamedStringARB( GLint namelen, const char* name ) { return 0; } +static GLboolean null_glIsNamedStringARB( GLint namelen, const GLchar* name ) { return 0; } static GLboolean null_glIsObjectBufferATI( GLuint buffer ) { return 0; } static GLboolean null_glIsOcclusionQueryNV( GLuint id ) { return 0; } static GLboolean null_glIsPathNV( GLuint path ) { return 0; } @@ -4245,7 +4245,7 @@ static GLboolean null_glIsVertexArrayAPPLE( GLuint array ) { return 0; } static GLboolean null_glIsVertexAttribEnabledAPPLE( GLuint index, GLenum pname ) { return 0; } static void null_glLightEnviSGIX( GLenum pname, GLint param ) { } static void null_glLinkProgram( GLuint program ) { } -static void null_glLinkProgramARB( unsigned int programObj ) { } +static void null_glLinkProgramARB( GLhandleARB programObj ) { } static void null_glListParameterfSGIX( GLuint list, GLenum pname, GLfloat param ) { } static void null_glListParameterfvSGIX( GLuint list, GLenum pname, const GLfloat* params ) { } static void null_glListParameteriSGIX( GLuint list, GLenum pname, GLint param ) { } @@ -4269,10 +4269,10 @@ static void null_glMakeTextureHandleNonResidentNV( UINT64 handle ) { } static void null_glMakeTextureHandleResidentNV( UINT64 handle ) { } static GLvoid* null_glMapBuffer( GLenum target, GLenum access ) { return 0; } static GLvoid* null_glMapBufferARB( GLenum target, GLenum access ) { return 0; } -static GLvoid* null_glMapBufferRange( GLenum target, INT_PTR offset, INT_PTR length, GLbitfield access ) { return 0; } +static GLvoid* null_glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access ) { return 0; } static void null_glMapControlPointsNV( GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid* points ) { } static GLvoid* null_glMapNamedBufferEXT( GLuint buffer, GLenum access ) { return 0; } -static GLvoid* null_glMapNamedBufferRangeEXT( GLuint buffer, INT_PTR offset, INT_PTR length, GLbitfield access ) { return 0; } +static GLvoid* null_glMapNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access ) { return 0; } static GLvoid* null_glMapObjectBufferATI( GLuint buffer ) { return 0; } static void null_glMapParameterfvNV( GLenum target, GLenum pname, const GLfloat* params ) { } static void null_glMapParameterivNV( GLenum target, GLenum pname, const GLint* params ) { } @@ -4339,8 +4339,8 @@ static void null_glMultiTexCoord1fSGIS( GLenum target, GLfloat s ) { } static void null_glMultiTexCoord1fv( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord1fvARB( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord1fvSGIS( GLenum target, const GLfloat * v ) { } -static void null_glMultiTexCoord1hNV( GLenum target, unsigned short s ) { } -static void null_glMultiTexCoord1hvNV( GLenum target, const unsigned short* v ) { } +static void null_glMultiTexCoord1hNV( GLenum target, GLhalfNV s ) { } +static void null_glMultiTexCoord1hvNV( GLenum target, const GLhalfNV* v ) { } static void null_glMultiTexCoord1i( GLenum target, GLint s ) { } static void null_glMultiTexCoord1iARB( GLenum target, GLint s ) { } static void null_glMultiTexCoord1iSGIS( GLenum target, GLint s ) { } @@ -4365,8 +4365,8 @@ static void null_glMultiTexCoord2fSGIS( GLenum target, GLfloat s, GLfloat t ) { static void null_glMultiTexCoord2fv( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord2fvARB( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord2fvSGIS( GLenum target, GLfloat * v ) { } -static void null_glMultiTexCoord2hNV( GLenum target, unsigned short s, unsigned short t ) { } -static void null_glMultiTexCoord2hvNV( GLenum target, const unsigned short* v ) { } +static void null_glMultiTexCoord2hNV( GLenum target, GLhalfNV s, GLhalfNV t ) { } +static void null_glMultiTexCoord2hvNV( GLenum target, const GLhalfNV* v ) { } static void null_glMultiTexCoord2i( GLenum target, GLint s, GLint t ) { } static void null_glMultiTexCoord2iARB( GLenum target, GLint s, GLint t ) { } static void null_glMultiTexCoord2iSGIS( GLenum target, GLint s, GLint t ) { } @@ -4391,8 +4391,8 @@ static void null_glMultiTexCoord3fSGIS( GLenum target, GLfloat s, GLfloat t, GLf static void null_glMultiTexCoord3fv( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord3fvARB( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord3fvSGIS( GLenum target, GLfloat * v ) { } -static void null_glMultiTexCoord3hNV( GLenum target, unsigned short s, unsigned short t, unsigned short r ) { } -static void null_glMultiTexCoord3hvNV( GLenum target, const unsigned short* v ) { } +static void null_glMultiTexCoord3hNV( GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r ) { } +static void null_glMultiTexCoord3hvNV( GLenum target, const GLhalfNV* v ) { } static void null_glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r ) { } static void null_glMultiTexCoord3iARB( GLenum target, GLint s, GLint t, GLint r ) { } static void null_glMultiTexCoord3iSGIS( GLenum target, GLint s, GLint t, GLint r ) { } @@ -4417,8 +4417,8 @@ static void null_glMultiTexCoord4fSGIS( GLenum target, GLfloat s, GLfloat t, GLf static void null_glMultiTexCoord4fv( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord4fvARB( GLenum target, const GLfloat* v ) { } static void null_glMultiTexCoord4fvSGIS( GLenum target, GLfloat * v ) { } -static void null_glMultiTexCoord4hNV( GLenum target, unsigned short s, unsigned short t, unsigned short r, unsigned short q ) { } -static void null_glMultiTexCoord4hvNV( GLenum target, const unsigned short* v ) { } +static void null_glMultiTexCoord4hNV( GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q ) { } +static void null_glMultiTexCoord4hvNV( GLenum target, const GLhalfNV* v ) { } static void null_glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q ) { } static void null_glMultiTexCoord4iARB( GLenum target, GLint s, GLint t, GLint r, GLint q ) { } static void null_glMultiTexCoord4iSGIS( GLenum target, GLint s, GLint t, GLint r, GLint q ) { } @@ -4464,9 +4464,9 @@ static void null_glMultiTexRenderbufferEXT( GLenum texunit, GLenum target, GLuin static void null_glMultiTexSubImage1DEXT( GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid* pixels ) { } static void null_glMultiTexSubImage2DEXT( GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels ) { } static void null_glMultiTexSubImage3DEXT( GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels ) { } -static void null_glNamedBufferDataEXT( GLuint buffer, INT_PTR size, const GLvoid* data, GLenum usage ) { } -static void null_glNamedBufferSubDataEXT( GLuint buffer, INT_PTR offset, INT_PTR size, const GLvoid* data ) { } -static void null_glNamedCopyBufferSubDataEXT( GLuint readBuffer, GLuint writeBuffer, INT_PTR readOffset, INT_PTR writeOffset, INT_PTR size ) { } +static void null_glNamedBufferDataEXT( GLuint buffer, GLsizeiptr size, const GLvoid* data, GLenum usage ) { } +static void null_glNamedBufferSubDataEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid* data ) { } +static void null_glNamedCopyBufferSubDataEXT( GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) { } static void null_glNamedFramebufferParameteriEXT( GLuint framebuffer, GLenum pname, GLint param ) { } static void null_glNamedFramebufferRenderbufferEXT( GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer ) { } static void null_glNamedFramebufferTexture1DEXT( GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level ) { } @@ -4490,13 +4490,13 @@ static void null_glNamedProgramStringEXT( GLuint program, GLenum target, GLenum static void null_glNamedRenderbufferStorageEXT( GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height ) { } static void null_glNamedRenderbufferStorageMultisampleCoverageEXT( GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height ) { } static void null_glNamedRenderbufferStorageMultisampleEXT( GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height ) { } -static void null_glNamedStringARB( GLenum type, GLint namelen, const char* name, GLint stringlen, const char* string ) { } +static void null_glNamedStringARB( GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar* string ) { } static GLuint null_glNewBufferRegion( GLenum type ) { return 0; } static GLuint null_glNewObjectBufferATI( GLsizei size, const GLvoid* pointer, GLenum usage ) { return 0; } static void null_glNormal3fVertex3fSUN( GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z ) { } static void null_glNormal3fVertex3fvSUN( const GLfloat* n, const GLfloat* v ) { } -static void null_glNormal3hNV( unsigned short nx, unsigned short ny, unsigned short nz ) { } -static void null_glNormal3hvNV( const unsigned short* v ) { } +static void null_glNormal3hNV( GLhalfNV nx, GLhalfNV ny, GLhalfNV nz ) { } +static void null_glNormal3hvNV( const GLhalfNV* v ) { } static void null_glNormalFormatNV( GLenum type, GLsizei stride ) { } static void null_glNormalP3ui( GLenum type, GLuint coords ) { } static void null_glNormalP3uiv( GLenum type, const GLuint* coords ) { } @@ -4513,8 +4513,8 @@ static void null_glNormalStream3iATI( GLenum stream, GLint nx, GLint ny, GLint n static void null_glNormalStream3ivATI( GLenum stream, const GLint* coords ) { } static void null_glNormalStream3sATI( GLenum stream, GLshort nx, GLshort ny, GLshort nz ) { } static void null_glNormalStream3svATI( GLenum stream, const GLshort* coords ) { } -static void null_glObjectLabel( GLenum identifier, GLuint name, GLsizei length, const char* label ) { } -static void null_glObjectPtrLabel( const void* ptr, GLsizei length, const char* label ) { } +static void null_glObjectLabel( GLenum identifier, GLuint name, GLsizei length, const GLchar* label ) { } +static void null_glObjectPtrLabel( const void* ptr, GLsizei length, const GLchar* label ) { } static GLenum null_glObjectPurgeableAPPLE( GLenum objectType, GLuint name, GLenum option ) { return 0; } static GLenum null_glObjectUnpurgeableAPPLE( GLenum objectType, GLuint name, GLenum option ) { return 0; } static void null_glPNTrianglesfATI( GLenum pname, GLfloat param ) { } @@ -4740,7 +4740,7 @@ static void null_glProgramVertexLimitNV( GLenum target, GLint limit ) { } static void null_glProvokingVertex( GLenum mode ) { } static void null_glProvokingVertexEXT( GLenum mode ) { } static void null_glPushClientAttribDefaultEXT( GLbitfield mask ) { } -static void null_glPushDebugGroup( GLenum source, GLuint id, GLsizei length, const char* message ) { } +static void null_glPushDebugGroup( GLenum source, GLuint id, GLsizei length, const GLchar* message ) { } static void null_glQueryCounter( GLuint id, GLenum target ) { } static void null_glReadBufferRegion( GLenum region, GLint x, GLint y, GLsizei width, GLsizei height ) { } static void null_glReadInstrumentsSGIX( GLint marker ) { } @@ -4813,8 +4813,8 @@ static void null_glSecondaryColor3f( GLfloat red, GLfloat green, GLfloat blue ) static void null_glSecondaryColor3fEXT( GLfloat red, GLfloat green, GLfloat blue ) { } static void null_glSecondaryColor3fv( const GLfloat* v ) { } static void null_glSecondaryColor3fvEXT( const GLfloat* v ) { } -static void null_glSecondaryColor3hNV( unsigned short red, unsigned short green, unsigned short blue ) { } -static void null_glSecondaryColor3hvNV( const unsigned short* v ) { } +static void null_glSecondaryColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue ) { } +static void null_glSecondaryColor3hvNV( const GLhalfNV* v ) { } static void null_glSecondaryColor3i( GLint red, GLint green, GLint blue ) { } static void null_glSecondaryColor3iEXT( GLint red, GLint green, GLint blue ) { } static void null_glSecondaryColor3iv( const GLint* v ) { } @@ -4856,8 +4856,8 @@ static void null_glShaderBinary( GLsizei count, const GLuint* shaders, GLenum bi static void null_glShaderOp1EXT( GLenum op, GLuint res, GLuint arg1 ) { } static void null_glShaderOp2EXT( GLenum op, GLuint res, GLuint arg1, GLuint arg2 ) { } static void null_glShaderOp3EXT( GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3 ) { } -static void null_glShaderSource( GLuint shader, GLsizei count, const char* const* string, const GLint* length ) { } -static void null_glShaderSourceARB( unsigned int shaderObj, GLsizei count, const char** string, const GLint* length ) { } +static void null_glShaderSource( GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length ) { } +static void null_glShaderSourceARB( GLhandleARB shaderObj, GLsizei count, const GLcharARB** string, const GLint* length ) { } static void null_glShaderStorageBlockBinding( GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding ) { } static void null_glSharpenTexFuncSGIS( GLenum target, GLsizei n, const GLfloat* points ) { } static void null_glSpriteParameterfSGIX( GLenum pname, GLfloat param ) { } @@ -4900,11 +4900,11 @@ static GLboolean null_glTestObjectAPPLE( GLenum object, GLuint name ) { return 0 static void null_glTexBuffer( GLenum target, GLenum internalformat, GLuint buffer ) { } static void null_glTexBufferARB( GLenum target, GLenum internalformat, GLuint buffer ) { } static void null_glTexBufferEXT( GLenum target, GLenum internalformat, GLuint buffer ) { } -static void null_glTexBufferRange( GLenum target, GLenum internalformat, GLuint buffer, INT_PTR offset, INT_PTR size ) { } +static void null_glTexBufferRange( GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size ) { } static void null_glTexBumpParameterfvATI( GLenum pname, const GLfloat* param ) { } static void null_glTexBumpParameterivATI( GLenum pname, const GLint* param ) { } -static void null_glTexCoord1hNV( unsigned short s ) { } -static void null_glTexCoord1hvNV( const unsigned short* v ) { } +static void null_glTexCoord1hNV( GLhalfNV s ) { } +static void null_glTexCoord1hvNV( const GLhalfNV* v ) { } static void null_glTexCoord2fColor3fVertex3fSUN( GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z ) { } static void null_glTexCoord2fColor3fVertex3fvSUN( const GLfloat* tc, const GLfloat* c, const GLfloat* v ) { } static void null_glTexCoord2fColor4fNormal3fVertex3fSUN( GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z ) { } @@ -4915,16 +4915,16 @@ static void null_glTexCoord2fNormal3fVertex3fSUN( GLfloat s, GLfloat t, GLfloat static void null_glTexCoord2fNormal3fVertex3fvSUN( const GLfloat* tc, const GLfloat* n, const GLfloat* v ) { } static void null_glTexCoord2fVertex3fSUN( GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z ) { } static void null_glTexCoord2fVertex3fvSUN( const GLfloat* tc, const GLfloat* v ) { } -static void null_glTexCoord2hNV( unsigned short s, unsigned short t ) { } -static void null_glTexCoord2hvNV( const unsigned short* v ) { } -static void null_glTexCoord3hNV( unsigned short s, unsigned short t, unsigned short r ) { } -static void null_glTexCoord3hvNV( const unsigned short* v ) { } +static void null_glTexCoord2hNV( GLhalfNV s, GLhalfNV t ) { } +static void null_glTexCoord2hvNV( const GLhalfNV* v ) { } +static void null_glTexCoord3hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r ) { } +static void null_glTexCoord3hvNV( const GLhalfNV* v ) { } static void null_glTexCoord4fColor4fNormal3fVertex4fSUN( GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { } static void null_glTexCoord4fColor4fNormal3fVertex4fvSUN( const GLfloat* tc, const GLfloat* c, const GLfloat* n, const GLfloat* v ) { } static void null_glTexCoord4fVertex4fSUN( GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { } static void null_glTexCoord4fVertex4fvSUN( const GLfloat* tc, const GLfloat* v ) { } -static void null_glTexCoord4hNV( unsigned short s, unsigned short t, unsigned short r, unsigned short q ) { } -static void null_glTexCoord4hvNV( const unsigned short* v ) { } +static void null_glTexCoord4hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q ) { } +static void null_glTexCoord4hvNV( const GLhalfNV* v ) { } static void null_glTexCoordFormatNV( GLint size, GLenum type, GLsizei stride ) { } static void null_glTexCoordP1ui( GLenum type, GLuint coords ) { } static void null_glTexCoordP1uiv( GLenum type, const GLuint* coords ) { } @@ -4963,7 +4963,7 @@ static void null_glTexSubImage3DEXT( GLenum target, GLint level, GLint xoffset, static void null_glTexSubImage4DSGIS( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid* pixels ) { } static void null_glTextureBarrierNV( void ) { } static void null_glTextureBufferEXT( GLuint texture, GLenum target, GLenum internalformat, GLuint buffer ) { } -static void null_glTextureBufferRangeEXT( GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, INT_PTR offset, INT_PTR size ) { } +static void null_glTextureBufferRangeEXT( GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size ) { } static void null_glTextureColorMaskSGIS( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) { } static void null_glTextureImage1DEXT( GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid* pixels ) { } static void null_glTextureImage2DEXT( GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels ) { } @@ -4996,8 +4996,8 @@ static void null_glTextureView( GLuint texture, GLenum target, GLuint origtextur static void null_glTrackMatrixNV( GLenum target, GLuint address, GLenum matrix, GLenum transform ) { } static void null_glTransformFeedbackAttribsNV( GLuint count, const GLint* attribs, GLenum bufferMode ) { } static void null_glTransformFeedbackStreamAttribsNV( GLsizei count, const GLint* attribs, GLsizei nbuffers, const GLint* bufstreams, GLenum bufferMode ) { } -static void null_glTransformFeedbackVaryings( GLuint program, GLsizei count, const char* const* varyings, GLenum bufferMode ) { } -static void null_glTransformFeedbackVaryingsEXT( GLuint program, GLsizei count, const char** varyings, GLenum bufferMode ) { } +static void null_glTransformFeedbackVaryings( GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode ) { } +static void null_glTransformFeedbackVaryingsEXT( GLuint program, GLsizei count, const GLchar** varyings, GLenum bufferMode ) { } static void null_glTransformFeedbackVaryingsNV( GLuint program, GLsizei count, const GLint* locations, GLenum bufferMode ) { } static void null_glTransformPathNV( GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat* transformValues ) { } static void null_glUniform1d( GLint location, GLdouble x ) { } @@ -5107,21 +5107,21 @@ static GLboolean null_glUnmapNamedBufferEXT( GLuint buffer ) { return 0; } static void null_glUnmapObjectBufferATI( GLuint buffer ) { } static void null_glUpdateObjectBufferATI( GLuint buffer, GLuint offset, GLsizei size, const GLvoid* pointer, GLenum preserve ) { } static void null_glUseProgram( GLuint program ) { } -static void null_glUseProgramObjectARB( unsigned int programObj ) { } +static void null_glUseProgramObjectARB( GLhandleARB programObj ) { } static void null_glUseProgramStages( GLuint pipeline, GLbitfield stages, GLuint program ) { } static void null_glUseShaderProgramEXT( GLenum type, GLuint program ) { } static void null_glVDPAUFiniNV( void ) { } -static void null_glVDPAUGetSurfaceivNV( INT_PTR surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) { } +static void null_glVDPAUGetSurfaceivNV( GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) { } static void null_glVDPAUInitNV( const GLvoid* vdpDevice, const GLvoid* getProcAddress ) { } -static void null_glVDPAUIsSurfaceNV( INT_PTR surface ) { } -static void null_glVDPAUMapSurfacesNV( GLsizei numSurfaces, const INT_PTR* surfaces ) { } -static INT_PTR null_glVDPAURegisterOutputSurfaceNV( GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { return 0; } -static INT_PTR null_glVDPAURegisterVideoSurfaceNV( const GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { return 0; } -static void null_glVDPAUSurfaceAccessNV( INT_PTR surface, GLenum access ) { } -static void null_glVDPAUUnmapSurfacesNV( GLsizei numSurface, const INT_PTR* surfaces ) { } -static void null_glVDPAUUnregisterSurfaceNV( INT_PTR surface ) { } +static void null_glVDPAUIsSurfaceNV( GLvdpauSurfaceNV surface ) { } +static void null_glVDPAUMapSurfacesNV( GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces ) { } +static GLvdpauSurfaceNV null_glVDPAURegisterOutputSurfaceNV( GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { return 0; } +static GLvdpauSurfaceNV null_glVDPAURegisterVideoSurfaceNV( const GLvoid* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames ) { return 0; } +static void null_glVDPAUSurfaceAccessNV( GLvdpauSurfaceNV surface, GLenum access ) { } +static void null_glVDPAUUnmapSurfacesNV( GLsizei numSurface, const GLvdpauSurfaceNV* surfaces ) { } +static void null_glVDPAUUnregisterSurfaceNV( GLvdpauSurfaceNV surface ) { } static void null_glValidateProgram( GLuint program ) { } -static void null_glValidateProgramARB( unsigned int programObj ) { } +static void null_glValidateProgramARB( GLhandleARB programObj ) { } static void null_glValidateProgramPipeline( GLuint pipeline ) { } static void null_glVariantArrayObjectATI( GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset ) { } static void null_glVariantPointerEXT( GLuint id, GLenum type, GLuint stride, const GLvoid* addr ) { } @@ -5133,13 +5133,13 @@ static void null_glVariantsvEXT( GLuint id, const GLshort* addr ) { } static void null_glVariantubvEXT( GLuint id, const GLubyte* addr ) { } static void null_glVariantuivEXT( GLuint id, const GLuint* addr ) { } static void null_glVariantusvEXT( GLuint id, const GLushort* addr ) { } -static void null_glVertex2hNV( unsigned short x, unsigned short y ) { } -static void null_glVertex2hvNV( const unsigned short* v ) { } -static void null_glVertex3hNV( unsigned short x, unsigned short y, unsigned short z ) { } -static void null_glVertex3hvNV( const unsigned short* v ) { } -static void null_glVertex4hNV( unsigned short x, unsigned short y, unsigned short z, unsigned short w ) { } -static void null_glVertex4hvNV( const unsigned short* v ) { } -static void null_glVertexArrayBindVertexBufferEXT( GLuint vaobj, GLuint bindingindex, GLuint buffer, INT_PTR offset, GLsizei stride ) { } +static void null_glVertex2hNV( GLhalfNV x, GLhalfNV y ) { } +static void null_glVertex2hvNV( const GLhalfNV* v ) { } +static void null_glVertex3hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z ) { } +static void null_glVertex3hvNV( const GLhalfNV* v ) { } +static void null_glVertex4hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w ) { } +static void null_glVertex4hvNV( const GLhalfNV* v ) { } +static void null_glVertexArrayBindVertexBufferEXT( GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride ) { } static void null_glVertexArrayParameteriAPPLE( GLenum pname, GLint param ) { } static void null_glVertexArrayRangeAPPLE( GLsizei length, GLvoid* pointer ) { } static void null_glVertexArrayRangeNV( GLsizei length, const GLvoid* pointer ) { } @@ -5147,7 +5147,7 @@ static void null_glVertexArrayVertexAttribBindingEXT( GLuint vaobj, GLuint attri static void null_glVertexArrayVertexAttribFormatEXT( GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset ) { } static void null_glVertexArrayVertexAttribIFormatEXT( GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset ) { } static void null_glVertexArrayVertexAttribLFormatEXT( GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset ) { } -static void null_glVertexArrayVertexAttribLOffsetEXT( GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, INT_PTR offset ) { } +static void null_glVertexArrayVertexAttribLOffsetEXT( GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset ) { } static void null_glVertexArrayVertexBindingDivisorEXT( GLuint vaobj, GLuint bindingindex, GLuint divisor ) { } static void null_glVertexAttrib1d( GLuint index, GLdouble x ) { } static void null_glVertexAttrib1dARB( GLuint index, GLdouble x ) { } @@ -5161,8 +5161,8 @@ static void null_glVertexAttrib1fNV( GLuint index, GLfloat x ) { } static void null_glVertexAttrib1fv( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib1fvARB( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib1fvNV( GLuint index, const GLfloat* v ) { } -static void null_glVertexAttrib1hNV( GLuint index, unsigned short x ) { } -static void null_glVertexAttrib1hvNV( GLuint index, const unsigned short* v ) { } +static void null_glVertexAttrib1hNV( GLuint index, GLhalfNV x ) { } +static void null_glVertexAttrib1hvNV( GLuint index, const GLhalfNV* v ) { } static void null_glVertexAttrib1s( GLuint index, GLshort x ) { } static void null_glVertexAttrib1sARB( GLuint index, GLshort x ) { } static void null_glVertexAttrib1sNV( GLuint index, GLshort x ) { } @@ -5181,8 +5181,8 @@ static void null_glVertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) { } static void null_glVertexAttrib2fv( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib2fvARB( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib2fvNV( GLuint index, const GLfloat* v ) { } -static void null_glVertexAttrib2hNV( GLuint index, unsigned short x, unsigned short y ) { } -static void null_glVertexAttrib2hvNV( GLuint index, const unsigned short* v ) { } +static void null_glVertexAttrib2hNV( GLuint index, GLhalfNV x, GLhalfNV y ) { } +static void null_glVertexAttrib2hvNV( GLuint index, const GLhalfNV* v ) { } static void null_glVertexAttrib2s( GLuint index, GLshort x, GLshort y ) { } static void null_glVertexAttrib2sARB( GLuint index, GLshort x, GLshort y ) { } static void null_glVertexAttrib2sNV( GLuint index, GLshort x, GLshort y ) { } @@ -5201,8 +5201,8 @@ static void null_glVertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, GLfloat static void null_glVertexAttrib3fv( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib3fvARB( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib3fvNV( GLuint index, const GLfloat* v ) { } -static void null_glVertexAttrib3hNV( GLuint index, unsigned short x, unsigned short y, unsigned short z ) { } -static void null_glVertexAttrib3hvNV( GLuint index, const unsigned short* v ) { } +static void null_glVertexAttrib3hNV( GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z ) { } +static void null_glVertexAttrib3hvNV( GLuint index, const GLhalfNV* v ) { } static void null_glVertexAttrib3s( GLuint index, GLshort x, GLshort y, GLshort z ) { } static void null_glVertexAttrib3sARB( GLuint index, GLshort x, GLshort y, GLshort z ) { } static void null_glVertexAttrib3sNV( GLuint index, GLshort x, GLshort y, GLshort z ) { } @@ -5237,8 +5237,8 @@ static void null_glVertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat static void null_glVertexAttrib4fv( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib4fvARB( GLuint index, const GLfloat* v ) { } static void null_glVertexAttrib4fvNV( GLuint index, const GLfloat* v ) { } -static void null_glVertexAttrib4hNV( GLuint index, unsigned short x, unsigned short y, unsigned short z, unsigned short w ) { } -static void null_glVertexAttrib4hvNV( GLuint index, const unsigned short* v ) { } +static void null_glVertexAttrib4hNV( GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w ) { } +static void null_glVertexAttrib4hvNV( GLuint index, const GLhalfNV* v ) { } static void null_glVertexAttrib4iv( GLuint index, const GLint* v ) { } static void null_glVertexAttrib4ivARB( GLuint index, const GLint* v ) { } static void null_glVertexAttrib4s( GLuint index, GLshort x, GLshort y, GLshort z, GLshort w ) { } @@ -5354,19 +5354,19 @@ static void null_glVertexAttribPointerARB( GLuint index, GLint size, GLenum type static void null_glVertexAttribPointerNV( GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid* pointer ) { } static void null_glVertexAttribs1dvNV( GLuint index, GLsizei count, const GLdouble* v ) { } static void null_glVertexAttribs1fvNV( GLuint index, GLsizei count, const GLfloat* v ) { } -static void null_glVertexAttribs1hvNV( GLuint index, GLsizei n, const unsigned short* v ) { } +static void null_glVertexAttribs1hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { } static void null_glVertexAttribs1svNV( GLuint index, GLsizei count, const GLshort* v ) { } static void null_glVertexAttribs2dvNV( GLuint index, GLsizei count, const GLdouble* v ) { } static void null_glVertexAttribs2fvNV( GLuint index, GLsizei count, const GLfloat* v ) { } -static void null_glVertexAttribs2hvNV( GLuint index, GLsizei n, const unsigned short* v ) { } +static void null_glVertexAttribs2hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { } static void null_glVertexAttribs2svNV( GLuint index, GLsizei count, const GLshort* v ) { } static void null_glVertexAttribs3dvNV( GLuint index, GLsizei count, const GLdouble* v ) { } static void null_glVertexAttribs3fvNV( GLuint index, GLsizei count, const GLfloat* v ) { } -static void null_glVertexAttribs3hvNV( GLuint index, GLsizei n, const unsigned short* v ) { } +static void null_glVertexAttribs3hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { } static void null_glVertexAttribs3svNV( GLuint index, GLsizei count, const GLshort* v ) { } static void null_glVertexAttribs4dvNV( GLuint index, GLsizei count, const GLdouble* v ) { } static void null_glVertexAttribs4fvNV( GLuint index, GLsizei count, const GLfloat* v ) { } -static void null_glVertexAttribs4hvNV( GLuint index, GLsizei n, const unsigned short* v ) { } +static void null_glVertexAttribs4hvNV( GLuint index, GLsizei n, const GLhalfNV* v ) { } static void null_glVertexAttribs4svNV( GLuint index, GLsizei count, const GLshort* v ) { } static void null_glVertexAttribs4ubvNV( GLuint index, GLsizei count, const GLubyte* v ) { } static void null_glVertexBindingDivisor( GLuint bindingindex, GLuint divisor ) { } @@ -5418,8 +5418,8 @@ static void null_glVertexStream4svATI( GLenum stream, const GLshort* coords ) { static void null_glVertexWeightPointerEXT( GLint size, GLenum type, GLsizei stride, const GLvoid* pointer ) { } static void null_glVertexWeightfEXT( GLfloat weight ) { } static void null_glVertexWeightfvEXT( const GLfloat* weight ) { } -static void null_glVertexWeighthNV( unsigned short weight ) { } -static void null_glVertexWeighthvNV( const unsigned short* weight ) { } +static void null_glVertexWeighthNV( GLhalfNV weight ) { } +static void null_glVertexWeighthvNV( const GLhalfNV* weight ) { } static GLenum null_glVideoCaptureNV( GLuint video_capture_slot, GLuint* sequence_num, UINT64* capture_time ) { return 0; } static void null_glVideoCaptureStreamParameterdvNV( GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params ) { } static void null_glVideoCaptureStreamParameterfvNV( GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params ) { } diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 8c77c83b5ae..8d235017b84 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif -#define WINE_WGL_DRIVER_VERSION 9 +#define WINE_WGL_DRIVER_VERSION 10 struct wgl_context; struct wgl_pbuffer; @@ -375,7 +375,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glActiveStencilFaceEXT)(GLenum); void (WINE_GLAPI *p_glActiveTexture)(GLenum); void (WINE_GLAPI *p_glActiveTextureARB)(GLenum); - void (WINE_GLAPI *p_glActiveVaryingNV)(GLuint,const char*); + void (WINE_GLAPI *p_glActiveVaryingNV)(GLuint,const GLchar*); void (WINE_GLAPI *p_glAlphaFragmentOp1ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glAlphaFragmentOp2ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glAlphaFragmentOp3ATI)(GLenum,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint,GLuint); @@ -385,7 +385,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glArrayElementEXT)(GLint); void (WINE_GLAPI *p_glArrayObjectATI)(GLenum,GLint,GLenum,GLsizei,GLuint,GLuint); void (WINE_GLAPI *p_glAsyncMarkerSGIX)(GLuint); - void (WINE_GLAPI *p_glAttachObjectARB)(unsigned int,unsigned int); + void (WINE_GLAPI *p_glAttachObjectARB)(GLhandleARB,GLhandleARB); void (WINE_GLAPI *p_glAttachShader)(GLuint,GLuint); void (WINE_GLAPI *p_glBeginConditionalRender)(GLuint,GLenum); void (WINE_GLAPI *p_glBeginConditionalRenderNV)(GLuint,GLenum); @@ -400,21 +400,21 @@ struct opengl_funcs void (WINE_GLAPI *p_glBeginTransformFeedbackNV)(GLenum); void (WINE_GLAPI *p_glBeginVertexShaderEXT)(void); void (WINE_GLAPI *p_glBeginVideoCaptureNV)(GLuint); - void (WINE_GLAPI *p_glBindAttribLocation)(GLuint,GLuint,const char*); - void (WINE_GLAPI *p_glBindAttribLocationARB)(unsigned int,GLuint,const char*); + void (WINE_GLAPI *p_glBindAttribLocation)(GLuint,GLuint,const GLchar*); + void (WINE_GLAPI *p_glBindAttribLocationARB)(GLhandleARB,GLuint,const GLcharARB*); void (WINE_GLAPI *p_glBindBuffer)(GLenum,GLuint); void (WINE_GLAPI *p_glBindBufferARB)(GLenum,GLuint); void (WINE_GLAPI *p_glBindBufferBase)(GLenum,GLuint,GLuint); void (WINE_GLAPI *p_glBindBufferBaseEXT)(GLenum,GLuint,GLuint); void (WINE_GLAPI *p_glBindBufferBaseNV)(GLenum,GLuint,GLuint); - void (WINE_GLAPI *p_glBindBufferOffsetEXT)(GLenum,GLuint,GLuint,INT_PTR); - void (WINE_GLAPI *p_glBindBufferOffsetNV)(GLenum,GLuint,GLuint,INT_PTR); - void (WINE_GLAPI *p_glBindBufferRange)(GLenum,GLuint,GLuint,INT_PTR,INT_PTR); - void (WINE_GLAPI *p_glBindBufferRangeEXT)(GLenum,GLuint,GLuint,INT_PTR,INT_PTR); - void (WINE_GLAPI *p_glBindBufferRangeNV)(GLenum,GLuint,GLuint,INT_PTR,INT_PTR); - void (WINE_GLAPI *p_glBindFragDataLocation)(GLuint,GLuint,const char*); - void (WINE_GLAPI *p_glBindFragDataLocationEXT)(GLuint,GLuint,const char*); - void (WINE_GLAPI *p_glBindFragDataLocationIndexed)(GLuint,GLuint,GLuint,const char*); + void (WINE_GLAPI *p_glBindBufferOffsetEXT)(GLenum,GLuint,GLuint,GLintptr); + void (WINE_GLAPI *p_glBindBufferOffsetNV)(GLenum,GLuint,GLuint,GLintptr); + void (WINE_GLAPI *p_glBindBufferRange)(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glBindBufferRangeEXT)(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glBindBufferRangeNV)(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glBindFragDataLocation)(GLuint,GLuint,const GLchar*); + void (WINE_GLAPI *p_glBindFragDataLocationEXT)(GLuint,GLuint,const GLchar*); + void (WINE_GLAPI *p_glBindFragDataLocationIndexed)(GLuint,GLuint,GLuint,const GLchar*); void (WINE_GLAPI *p_glBindFragmentShaderATI)(GLuint); void (WINE_GLAPI *p_glBindFramebuffer)(GLenum,GLuint); void (WINE_GLAPI *p_glBindFramebufferEXT)(GLenum,GLuint); @@ -437,9 +437,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glBindTransformFeedbackNV)(GLenum,GLuint); void (WINE_GLAPI *p_glBindVertexArray)(GLuint); void (WINE_GLAPI *p_glBindVertexArrayAPPLE)(GLuint); - void (WINE_GLAPI *p_glBindVertexBuffer)(GLuint,GLuint,INT_PTR,GLsizei); + void (WINE_GLAPI *p_glBindVertexBuffer)(GLuint,GLuint,GLintptr,GLsizei); void (WINE_GLAPI *p_glBindVertexShaderEXT)(GLuint); - void (WINE_GLAPI *p_glBindVideoCaptureStreamBufferNV)(GLuint,GLuint,GLenum,INT_PTR); + void (WINE_GLAPI *p_glBindVideoCaptureStreamBufferNV)(GLuint,GLuint,GLenum,GLintptrARB); void (WINE_GLAPI *p_glBindVideoCaptureStreamTextureNV)(GLuint,GLuint,GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glBinormal3bEXT)(GLbyte,GLbyte,GLbyte); void (WINE_GLAPI *p_glBinormal3bvEXT)(const GLbyte*); @@ -475,20 +475,20 @@ struct opengl_funcs void (WINE_GLAPI *p_glBlendFunciARB)(GLuint,GLenum,GLenum); void (WINE_GLAPI *p_glBlitFramebuffer)(GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLbitfield,GLenum); void (WINE_GLAPI *p_glBlitFramebufferEXT)(GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLint,GLbitfield,GLenum); - void (WINE_GLAPI *p_glBufferAddressRangeNV)(GLenum,GLuint,UINT64,INT_PTR); - void (WINE_GLAPI *p_glBufferData)(GLenum,INT_PTR,const GLvoid*,GLenum); - void (WINE_GLAPI *p_glBufferDataARB)(GLenum,INT_PTR,const GLvoid*,GLenum); + void (WINE_GLAPI *p_glBufferAddressRangeNV)(GLenum,GLuint,UINT64,GLsizeiptr); + void (WINE_GLAPI *p_glBufferData)(GLenum,GLsizeiptr,const GLvoid*,GLenum); + void (WINE_GLAPI *p_glBufferDataARB)(GLenum,GLsizeiptrARB,const GLvoid*,GLenum); void (WINE_GLAPI *p_glBufferParameteriAPPLE)(GLenum,GLenum,GLint); GLuint (WINE_GLAPI *p_glBufferRegionEnabled)(void); - void (WINE_GLAPI *p_glBufferSubData)(GLenum,INT_PTR,INT_PTR,const GLvoid*); - void (WINE_GLAPI *p_glBufferSubDataARB)(GLenum,INT_PTR,INT_PTR,const GLvoid*); + void (WINE_GLAPI *p_glBufferSubData)(GLenum,GLintptr,GLsizeiptr,const GLvoid*); + void (WINE_GLAPI *p_glBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,const GLvoid*); GLenum (WINE_GLAPI *p_glCheckFramebufferStatus)(GLenum); GLenum (WINE_GLAPI *p_glCheckFramebufferStatusEXT)(GLenum); GLenum (WINE_GLAPI *p_glCheckNamedFramebufferStatusEXT)(GLuint,GLenum); void (WINE_GLAPI *p_glClampColor)(GLenum,GLenum); void (WINE_GLAPI *p_glClampColorARB)(GLenum,GLenum); void (WINE_GLAPI *p_glClearBufferData)(GLenum,GLenum,GLenum,GLenum,const void*); - void (WINE_GLAPI *p_glClearBufferSubData)(GLenum,GLenum,INT_PTR,INT_PTR,GLenum,GLenum,const void*); + void (WINE_GLAPI *p_glClearBufferSubData)(GLenum,GLenum,GLintptr,GLsizeiptr,GLenum,GLenum,const void*); void (WINE_GLAPI *p_glClearBufferfi)(GLenum,GLint,GLfloat,GLint); void (WINE_GLAPI *p_glClearBufferfv)(GLenum,GLint,const GLfloat*); void (WINE_GLAPI *p_glClearBufferiv)(GLenum,GLint,const GLint*); @@ -498,7 +498,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glClearDepthdNV)(GLdouble); void (WINE_GLAPI *p_glClearDepthf)(GLfloat); void (WINE_GLAPI *p_glClearNamedBufferDataEXT)(GLuint,GLenum,GLenum,GLenum,const void*); - void (WINE_GLAPI *p_glClearNamedBufferSubDataEXT)(GLuint,GLenum,GLenum,GLenum,INT_PTR,INT_PTR,const void*); + void (WINE_GLAPI *p_glClearNamedBufferSubDataEXT)(GLuint,GLenum,GLenum,GLenum,GLsizeiptr,GLsizeiptr,const void*); void (WINE_GLAPI *p_glClientActiveTexture)(GLenum); void (WINE_GLAPI *p_glClientActiveTextureARB)(GLenum); void (WINE_GLAPI *p_glClientActiveVertexStreamATI)(GLenum); @@ -506,12 +506,12 @@ struct opengl_funcs GLenum (WINE_GLAPI *p_glClientWaitSync)(GLvoid*,GLbitfield,UINT64); void (WINE_GLAPI *p_glColor3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor3fVertex3fvSUN)(const GLfloat*,const GLfloat*); - void (WINE_GLAPI *p_glColor3hNV)(unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glColor3hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glColor3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glColor3hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glColor4fNormal3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor4fNormal3fVertex3fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*); - void (WINE_GLAPI *p_glColor4hNV)(unsigned short,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glColor4hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glColor4hNV)(GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glColor4hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glColor4ubVertex2fSUN)(GLubyte,GLubyte,GLubyte,GLubyte,GLfloat,GLfloat); void (WINE_GLAPI *p_glColor4ubVertex2fvSUN)(const GLubyte*,const GLfloat*); void (WINE_GLAPI *p_glColor4ubVertex3fSUN)(GLubyte,GLubyte,GLubyte,GLubyte,GLfloat,GLfloat,GLfloat); @@ -546,8 +546,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glCombinerParameterivNV)(GLenum,const GLint*); void (WINE_GLAPI *p_glCombinerStageParameterfvNV)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glCompileShader)(GLuint); - void (WINE_GLAPI *p_glCompileShaderARB)(unsigned int); - void (WINE_GLAPI *p_glCompileShaderIncludeARB)(GLuint,GLsizei,const char**,const GLint*); + void (WINE_GLAPI *p_glCompileShaderARB)(GLhandleARB); + void (WINE_GLAPI *p_glCompileShaderIncludeARB)(GLuint,GLsizei,const GLchar**,const GLint*); void (WINE_GLAPI *p_glCompressedMultiTexImage1DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,const GLvoid*); void (WINE_GLAPI *p_glCompressedMultiTexImage2DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); void (WINE_GLAPI *p_glCompressedMultiTexImage3DEXT)(GLenum,GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,const GLvoid*); @@ -584,7 +584,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glConvolutionParameteriEXT)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glConvolutionParameteriv)(GLenum,GLenum,const GLint*); void (WINE_GLAPI *p_glConvolutionParameterivEXT)(GLenum,GLenum,const GLint*); - void (WINE_GLAPI *p_glCopyBufferSubData)(GLenum,GLenum,INT_PTR,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glCopyBufferSubData)(GLenum,GLenum,GLintptr,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glCopyColorSubTable)(GLenum,GLsizei,GLint,GLint,GLsizei); void (WINE_GLAPI *p_glCopyColorSubTableEXT)(GLenum,GLsizei,GLint,GLint,GLsizei); void (WINE_GLAPI *p_glCopyColorTable)(GLenum,GLenum,GLint,GLint,GLsizei); @@ -617,11 +617,11 @@ struct opengl_funcs void (WINE_GLAPI *p_glCoverStrokePathInstancedNV)(GLsizei,GLenum,const GLvoid*,GLuint,GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glCoverStrokePathNV)(GLuint,GLenum); GLuint (WINE_GLAPI *p_glCreateProgram)(void); - unsigned int (WINE_GLAPI *p_glCreateProgramObjectARB)(void); + GLhandleARB (WINE_GLAPI *p_glCreateProgramObjectARB)(void); GLuint (WINE_GLAPI *p_glCreateShader)(GLenum); - unsigned int (WINE_GLAPI *p_glCreateShaderObjectARB)(GLenum); - GLuint (WINE_GLAPI *p_glCreateShaderProgramEXT)(GLenum,const char*); - GLuint (WINE_GLAPI *p_glCreateShaderProgramv)(GLenum,GLsizei,const char* const*); + GLhandleARB (WINE_GLAPI *p_glCreateShaderObjectARB)(GLenum); + GLuint (WINE_GLAPI *p_glCreateShaderProgramEXT)(GLenum,const GLchar*); + GLuint (WINE_GLAPI *p_glCreateShaderProgramv)(GLenum,GLsizei,const GLchar* const*); GLvoid* (WINE_GLAPI *p_glCreateSyncFromCLeventARB)(void *,void *,GLbitfield); void (WINE_GLAPI *p_glCullParameterdvEXT)(GLenum,GLdouble*); void (WINE_GLAPI *p_glCullParameterfvEXT)(GLenum,GLfloat*); @@ -632,9 +632,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glDebugMessageControl)(GLenum,GLenum,GLenum,GLsizei,const GLuint*,GLboolean); void (WINE_GLAPI *p_glDebugMessageControlARB)(GLenum,GLenum,GLenum,GLsizei,const GLuint*,GLboolean); void (WINE_GLAPI *p_glDebugMessageEnableAMD)(GLenum,GLenum,GLsizei,const GLuint*,GLboolean); - void (WINE_GLAPI *p_glDebugMessageInsert)(GLenum,GLenum,GLuint,GLenum,GLsizei,const char*); - void (WINE_GLAPI *p_glDebugMessageInsertAMD)(GLenum,GLenum,GLuint,GLsizei,const char*); - void (WINE_GLAPI *p_glDebugMessageInsertARB)(GLenum,GLenum,GLuint,GLenum,GLsizei,const char*); + void (WINE_GLAPI *p_glDebugMessageInsert)(GLenum,GLenum,GLuint,GLenum,GLsizei,const GLchar*); + void (WINE_GLAPI *p_glDebugMessageInsertAMD)(GLenum,GLenum,GLuint,GLsizei,const GLchar*); + void (WINE_GLAPI *p_glDebugMessageInsertARB)(GLenum,GLenum,GLuint,GLenum,GLsizei,const GLchar*); void (WINE_GLAPI *p_glDeformSGIX)(GLbitfield); void (WINE_GLAPI *p_glDeformationMap3dSGIX)(GLenum,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble,GLint,GLint,const GLdouble*); void (WINE_GLAPI *p_glDeformationMap3fSGIX)(GLenum,GLfloat,GLfloat,GLint,GLint,GLfloat,GLfloat,GLint,GLint,GLfloat,GLfloat,GLint,GLint,const GLfloat*); @@ -647,9 +647,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glDeleteFragmentShaderATI)(GLuint); void (WINE_GLAPI *p_glDeleteFramebuffers)(GLsizei,const GLuint*); void (WINE_GLAPI *p_glDeleteFramebuffersEXT)(GLsizei,const GLuint*); - void (WINE_GLAPI *p_glDeleteNamedStringARB)(GLint,const char*); + void (WINE_GLAPI *p_glDeleteNamedStringARB)(GLint,const GLchar*); void (WINE_GLAPI *p_glDeleteNamesAMD)(GLenum,GLuint,const GLuint*); - void (WINE_GLAPI *p_glDeleteObjectARB)(unsigned int); + void (WINE_GLAPI *p_glDeleteObjectARB)(GLhandleARB); void (WINE_GLAPI *p_glDeleteObjectBufferATI)(GLuint); void (WINE_GLAPI *p_glDeleteOcclusionQueriesNV)(GLsizei,const GLuint*); void (WINE_GLAPI *p_glDeletePathsNV)(GLuint,GLsizei); @@ -677,7 +677,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glDepthRangeIndexed)(GLuint,GLdouble,GLdouble); void (WINE_GLAPI *p_glDepthRangedNV)(GLdouble,GLdouble); void (WINE_GLAPI *p_glDepthRangef)(GLfloat,GLfloat); - void (WINE_GLAPI *p_glDetachObjectARB)(unsigned int,unsigned int); + void (WINE_GLAPI *p_glDetachObjectARB)(GLhandleARB,GLhandleARB); void (WINE_GLAPI *p_glDetachShader)(GLuint,GLuint); void (WINE_GLAPI *p_glDetailTexFuncSGIS)(GLenum,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glDisableClientStateIndexedEXT)(GLenum,GLuint); @@ -688,7 +688,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glDisableVertexAttribArrayARB)(GLuint); void (WINE_GLAPI *p_glDisablei)(GLenum,GLuint); void (WINE_GLAPI *p_glDispatchCompute)(GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glDispatchComputeIndirect)(INT_PTR); + void (WINE_GLAPI *p_glDispatchComputeIndirect)(GLintptr); void (WINE_GLAPI *p_glDrawArraysEXT)(GLenum,GLint,GLsizei); void (WINE_GLAPI *p_glDrawArraysIndirect)(GLenum,const GLvoid*); void (WINE_GLAPI *p_glDrawArraysInstanced)(GLenum,GLint,GLsizei,GLsizei); @@ -755,9 +755,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glFinishFenceNV)(GLuint); void (WINE_GLAPI *p_glFinishObjectAPPLE)(GLenum,GLint); void (WINE_GLAPI *p_glFinishTextureSUNX)(void); - void (WINE_GLAPI *p_glFlushMappedBufferRange)(GLenum,INT_PTR,INT_PTR); - void (WINE_GLAPI *p_glFlushMappedBufferRangeAPPLE)(GLenum,INT_PTR,INT_PTR); - void (WINE_GLAPI *p_glFlushMappedNamedBufferRangeEXT)(GLuint,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glFlushMappedBufferRange)(GLenum,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glFlushMappedBufferRangeAPPLE)(GLenum,GLintptr,GLsizeiptr); + void (WINE_GLAPI *p_glFlushMappedNamedBufferRangeEXT)(GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glFlushPixelDataRangeNV)(GLenum); void (WINE_GLAPI *p_glFlushRasterSGIX)(void); void (WINE_GLAPI *p_glFlushVertexArrayRangeAPPLE)(GLsizei,GLvoid*); @@ -774,8 +774,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glFogCoordfEXT)(GLfloat); void (WINE_GLAPI *p_glFogCoordfv)(const GLfloat*); void (WINE_GLAPI *p_glFogCoordfvEXT)(const GLfloat*); - void (WINE_GLAPI *p_glFogCoordhNV)(unsigned short); - void (WINE_GLAPI *p_glFogCoordhvNV)(const unsigned short*); + void (WINE_GLAPI *p_glFogCoordhNV)(GLhalfNV); + void (WINE_GLAPI *p_glFogCoordhvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glFogFuncSGIS)(GLsizei,const GLfloat*); void (WINE_GLAPI *p_glFragmentColorMaterialSGIX)(GLenum,GLenum); void (WINE_GLAPI *p_glFragmentLightModelfSGIX)(GLenum,GLfloat); @@ -845,24 +845,24 @@ struct opengl_funcs void (WINE_GLAPI *p_glGenerateMultiTexMipmapEXT)(GLenum,GLenum); void (WINE_GLAPI *p_glGenerateTextureMipmapEXT)(GLuint,GLenum); void (WINE_GLAPI *p_glGetActiveAtomicCounterBufferiv)(GLuint,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetActiveAttrib)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,char*); - void (WINE_GLAPI *p_glGetActiveAttribARB)(unsigned int,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,char*); - void (WINE_GLAPI *p_glGetActiveSubroutineName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,char*); - void (WINE_GLAPI *p_glGetActiveSubroutineUniformName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetActiveAttrib)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*); + void (WINE_GLAPI *p_glGetActiveAttribARB)(GLhandleARB,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLcharARB*); + void (WINE_GLAPI *p_glGetActiveSubroutineName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,GLchar*); + void (WINE_GLAPI *p_glGetActiveSubroutineUniformName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetActiveSubroutineUniformiv)(GLuint,GLenum,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetActiveUniform)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,char*); - void (WINE_GLAPI *p_glGetActiveUniformARB)(unsigned int,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,char*); - void (WINE_GLAPI *p_glGetActiveUniformBlockName)(GLuint,GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetActiveUniform)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*); + void (WINE_GLAPI *p_glGetActiveUniformARB)(GLhandleARB,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLcharARB*); + void (WINE_GLAPI *p_glGetActiveUniformBlockName)(GLuint,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetActiveUniformBlockiv)(GLuint,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetActiveUniformName)(GLuint,GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetActiveUniformName)(GLuint,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetActiveUniformsiv)(GLuint,GLsizei,const GLuint*,GLenum,GLint*); - void (WINE_GLAPI *p_glGetActiveVaryingNV)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,char*); + void (WINE_GLAPI *p_glGetActiveVaryingNV)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*); void (WINE_GLAPI *p_glGetArrayObjectfvATI)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetArrayObjectivATI)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetAttachedObjectsARB)(unsigned int,GLsizei,GLsizei*,unsigned int*); + void (WINE_GLAPI *p_glGetAttachedObjectsARB)(GLhandleARB,GLsizei,GLsizei*,GLhandleARB*); void (WINE_GLAPI *p_glGetAttachedShaders)(GLuint,GLsizei,GLsizei*,GLuint*); - GLint (WINE_GLAPI *p_glGetAttribLocation)(GLuint,const char*); - GLint (WINE_GLAPI *p_glGetAttribLocationARB)(unsigned int,const char*); + GLint (WINE_GLAPI *p_glGetAttribLocation)(GLuint,const GLchar*); + GLint (WINE_GLAPI *p_glGetAttribLocationARB)(GLhandleARB,const GLcharARB*); void (WINE_GLAPI *p_glGetBooleanIndexedvEXT)(GLenum,GLuint,GLboolean*); void (WINE_GLAPI *p_glGetBooleani_v)(GLenum,GLuint,GLboolean*); void (WINE_GLAPI *p_glGetBufferParameteri64v)(GLenum,GLenum,INT64*); @@ -871,8 +871,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetBufferParameterui64vNV)(GLenum,GLenum,UINT64*); void (WINE_GLAPI *p_glGetBufferPointerv)(GLenum,GLenum,GLvoid**); void (WINE_GLAPI *p_glGetBufferPointervARB)(GLenum,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetBufferSubData)(GLenum,INT_PTR,INT_PTR,GLvoid*); - void (WINE_GLAPI *p_glGetBufferSubDataARB)(GLenum,INT_PTR,INT_PTR,GLvoid*); + void (WINE_GLAPI *p_glGetBufferSubData)(GLenum,GLintptr,GLsizeiptr,GLvoid*); + void (WINE_GLAPI *p_glGetBufferSubDataARB)(GLenum,GLintptrARB,GLsizeiptrARB,GLvoid*); void (WINE_GLAPI *p_glGetColorTable)(GLenum,GLenum,GLenum,GLvoid*); void (WINE_GLAPI *p_glGetColorTableEXT)(GLenum,GLenum,GLenum,GLvoid*); void (WINE_GLAPI *p_glGetColorTableParameterfv)(GLenum,GLenum,GLfloat*); @@ -897,9 +897,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetConvolutionParameterfvEXT)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetConvolutionParameteriv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetConvolutionParameterivEXT)(GLenum,GLenum,GLint*); - GLuint (WINE_GLAPI *p_glGetDebugMessageLog)(GLuint,GLsizei,GLenum*,GLenum*,GLuint*,GLenum*,GLsizei*,char*); - GLuint (WINE_GLAPI *p_glGetDebugMessageLogAMD)(GLuint,GLsizei,GLenum*,GLuint*,GLuint*,GLsizei*,char*); - GLuint (WINE_GLAPI *p_glGetDebugMessageLogARB)(GLuint,GLsizei,GLenum*,GLenum*,GLuint*,GLenum*,GLsizei*,char*); + GLuint (WINE_GLAPI *p_glGetDebugMessageLog)(GLuint,GLsizei,GLenum*,GLenum*,GLuint*,GLenum*,GLsizei*,GLchar*); + GLuint (WINE_GLAPI *p_glGetDebugMessageLogAMD)(GLuint,GLsizei,GLenum*,GLuint*,GLuint*,GLsizei*,GLchar*); + GLuint (WINE_GLAPI *p_glGetDebugMessageLogARB)(GLuint,GLsizei,GLenum*,GLenum*,GLuint*,GLenum*,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetDetailTexFuncSGIS)(GLenum,GLfloat*); void (WINE_GLAPI *p_glGetDoubleIndexedvEXT)(GLenum,GLuint,GLdouble*); void (WINE_GLAPI *p_glGetDoublei_v)(GLenum,GLuint,GLdouble*); @@ -909,9 +909,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetFloatIndexedvEXT)(GLenum,GLuint,GLfloat*); void (WINE_GLAPI *p_glGetFloati_v)(GLenum,GLuint,GLfloat*); void (WINE_GLAPI *p_glGetFogFuncSGIS)(GLfloat*); - GLint (WINE_GLAPI *p_glGetFragDataIndex)(GLuint,const char*); - GLint (WINE_GLAPI *p_glGetFragDataLocation)(GLuint,const char*); - GLint (WINE_GLAPI *p_glGetFragDataLocationEXT)(GLuint,const char*); + GLint (WINE_GLAPI *p_glGetFragDataIndex)(GLuint,const GLchar*); + GLint (WINE_GLAPI *p_glGetFragDataLocation)(GLuint,const GLchar*); + GLint (WINE_GLAPI *p_glGetFragDataLocationEXT)(GLuint,const GLchar*); void (WINE_GLAPI *p_glGetFragmentLightfvSGIX)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetFragmentLightivSGIX)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetFragmentMaterialfvSGIX)(GLenum,GLenum,GLfloat*); @@ -921,7 +921,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetFramebufferParameteriv)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetFramebufferParameterivEXT)(GLuint,GLenum,GLint*); GLenum (WINE_GLAPI *p_glGetGraphicsResetStatusARB)(void); - unsigned int (WINE_GLAPI *p_glGetHandleARB)(GLenum); + GLhandleARB (WINE_GLAPI *p_glGetHandleARB)(GLenum); void (WINE_GLAPI *p_glGetHistogram)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); void (WINE_GLAPI *p_glGetHistogramEXT)(GLenum,GLboolean,GLenum,GLenum,GLvoid*); void (WINE_GLAPI *p_glGetHistogramParameterfv)(GLenum,GLenum,GLfloat*); @@ -931,7 +931,7 @@ struct opengl_funcs UINT64 (WINE_GLAPI *p_glGetImageHandleNV)(GLuint,GLint,GLboolean,GLint,GLenum); void (WINE_GLAPI *p_glGetImageTransformParameterfvHP)(GLenum,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetImageTransformParameterivHP)(GLenum,GLenum,GLint*); - void (WINE_GLAPI *p_glGetInfoLogARB)(unsigned int,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetInfoLogARB)(GLhandleARB,GLsizei,GLsizei*,GLcharARB*); GLint (WINE_GLAPI *p_glGetInstrumentsSGIX)(void); void (WINE_GLAPI *p_glGetInteger64i_v)(GLenum,GLuint,INT64*); void (WINE_GLAPI *p_glGetInteger64v)(GLenum,INT64*); @@ -977,7 +977,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetNamedBufferParameterivEXT)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedBufferParameterui64vNV)(GLuint,GLenum,UINT64*); void (WINE_GLAPI *p_glGetNamedBufferPointervEXT)(GLuint,GLenum,GLvoid**); - void (WINE_GLAPI *p_glGetNamedBufferSubDataEXT)(GLuint,INT_PTR,INT_PTR,GLvoid*); + void (WINE_GLAPI *p_glGetNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,GLvoid*); void (WINE_GLAPI *p_glGetNamedFramebufferAttachmentParameterivEXT)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedFramebufferParameterivEXT)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedProgramLocalParameterIivEXT)(GLuint,GLenum,GLuint,GLint*); @@ -987,15 +987,15 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetNamedProgramStringEXT)(GLuint,GLenum,GLenum,GLvoid*); void (WINE_GLAPI *p_glGetNamedProgramivEXT)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetNamedRenderbufferParameterivEXT)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetNamedStringARB)(GLint,const char*,GLsizei,GLint*,char*); - void (WINE_GLAPI *p_glGetNamedStringivARB)(GLint,const char*,GLenum,GLint*); + void (WINE_GLAPI *p_glGetNamedStringARB)(GLint,const GLchar*,GLsizei,GLint*,GLchar*); + void (WINE_GLAPI *p_glGetNamedStringivARB)(GLint,const GLchar*,GLenum,GLint*); void (WINE_GLAPI *p_glGetObjectBufferfvATI)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetObjectBufferivATI)(GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetObjectLabel)(GLenum,GLuint,GLsizei,GLsizei*,char*); - void (WINE_GLAPI *p_glGetObjectParameterfvARB)(unsigned int,GLenum,GLfloat*); + void (WINE_GLAPI *p_glGetObjectLabel)(GLenum,GLuint,GLsizei,GLsizei*,GLchar*); + void (WINE_GLAPI *p_glGetObjectParameterfvARB)(GLhandleARB,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetObjectParameterivAPPLE)(GLenum,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetObjectParameterivARB)(unsigned int,GLenum,GLint*); - void (WINE_GLAPI *p_glGetObjectPtrLabel)(const void*,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetObjectParameterivARB)(GLhandleARB,GLenum,GLint*); + void (WINE_GLAPI *p_glGetObjectPtrLabel)(const void*,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetOcclusionQueryivNV)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetOcclusionQueryuivNV)(GLuint,GLenum,GLuint*); void (WINE_GLAPI *p_glGetPathColorGenfvNV)(GLenum,GLenum,GLfloat*); @@ -1013,9 +1013,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetPathTexGenivNV)(GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetPerfMonitorCounterDataAMD)(GLuint,GLenum,GLsizei,GLuint*,GLint*); void (WINE_GLAPI *p_glGetPerfMonitorCounterInfoAMD)(GLuint,GLuint,GLenum,GLvoid*); - void (WINE_GLAPI *p_glGetPerfMonitorCounterStringAMD)(GLuint,GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetPerfMonitorCounterStringAMD)(GLuint,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetPerfMonitorCountersAMD)(GLuint,GLint*,GLint*,GLsizei,GLuint*); - void (WINE_GLAPI *p_glGetPerfMonitorGroupStringAMD)(GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetPerfMonitorGroupStringAMD)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetPerfMonitorGroupsAMD)(GLint*,GLsizei,GLuint*); void (WINE_GLAPI *p_glGetPixelTexGenParameterfvSGIS)(GLenum,GLfloat*); void (WINE_GLAPI *p_glGetPixelTexGenParameterivSGIS)(GLenum,GLint*); @@ -1028,7 +1028,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetProgramEnvParameterIuivNV)(GLenum,GLuint,GLuint*); void (WINE_GLAPI *p_glGetProgramEnvParameterdvARB)(GLenum,GLuint,GLdouble*); void (WINE_GLAPI *p_glGetProgramEnvParameterfvARB)(GLenum,GLuint,GLfloat*); - void (WINE_GLAPI *p_glGetProgramInfoLog)(GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetProgramInfoLog)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetProgramInterfaceiv)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetProgramLocalParameterIivNV)(GLenum,GLuint,GLint*); void (WINE_GLAPI *p_glGetProgramLocalParameterIuivNV)(GLenum,GLuint,GLuint*); @@ -1038,12 +1038,12 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetProgramNamedParameterfvNV)(GLuint,GLsizei,const GLubyte*,GLfloat*); void (WINE_GLAPI *p_glGetProgramParameterdvNV)(GLenum,GLuint,GLenum,GLdouble*); void (WINE_GLAPI *p_glGetProgramParameterfvNV)(GLenum,GLuint,GLenum,GLfloat*); - void (WINE_GLAPI *p_glGetProgramPipelineInfoLog)(GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetProgramPipelineInfoLog)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetProgramPipelineiv)(GLuint,GLenum,GLint*); - GLuint (WINE_GLAPI *p_glGetProgramResourceIndex)(GLuint,GLenum,const char*); - GLint (WINE_GLAPI *p_glGetProgramResourceLocation)(GLuint,GLenum,const char*); - GLint (WINE_GLAPI *p_glGetProgramResourceLocationIndex)(GLuint,GLenum,const char*); - void (WINE_GLAPI *p_glGetProgramResourceName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,char*); + GLuint (WINE_GLAPI *p_glGetProgramResourceIndex)(GLuint,GLenum,const GLchar*); + GLint (WINE_GLAPI *p_glGetProgramResourceLocation)(GLuint,GLenum,const GLchar*); + GLint (WINE_GLAPI *p_glGetProgramResourceLocationIndex)(GLuint,GLenum,const GLchar*); + void (WINE_GLAPI *p_glGetProgramResourceName)(GLuint,GLenum,GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetProgramResourceiv)(GLuint,GLenum,GLuint,GLsizei,const GLenum*,GLsizei,GLsizei*,GLint*); void (WINE_GLAPI *p_glGetProgramStageiv)(GLuint,GLenum,GLenum,GLint*); void (WINE_GLAPI *p_glGetProgramStringARB)(GLenum,GLenum,GLvoid*); @@ -1071,15 +1071,15 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetSamplerParameteriv)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetSeparableFilter)(GLenum,GLenum,GLenum,GLvoid*,GLvoid*,GLvoid*); void (WINE_GLAPI *p_glGetSeparableFilterEXT)(GLenum,GLenum,GLenum,GLvoid*,GLvoid*,GLvoid*); - void (WINE_GLAPI *p_glGetShaderInfoLog)(GLuint,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetShaderInfoLog)(GLuint,GLsizei,GLsizei*,GLchar*); void (WINE_GLAPI *p_glGetShaderPrecisionFormat)(GLenum,GLenum,GLint*,GLint*); - void (WINE_GLAPI *p_glGetShaderSource)(GLuint,GLsizei,GLsizei*,char*); - void (WINE_GLAPI *p_glGetShaderSourceARB)(unsigned int,GLsizei,GLsizei*,char*); + void (WINE_GLAPI *p_glGetShaderSource)(GLuint,GLsizei,GLsizei*,GLchar*); + void (WINE_GLAPI *p_glGetShaderSourceARB)(GLhandleARB,GLsizei,GLsizei*,GLcharARB*); void (WINE_GLAPI *p_glGetShaderiv)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetSharpenTexFuncSGIS)(GLenum,GLfloat*); const GLubyte * (WINE_GLAPI *p_glGetStringi)(GLenum,GLuint); - GLuint (WINE_GLAPI *p_glGetSubroutineIndex)(GLuint,GLenum,const char*); - GLint (WINE_GLAPI *p_glGetSubroutineUniformLocation)(GLuint,GLenum,const char*); + GLuint (WINE_GLAPI *p_glGetSubroutineIndex)(GLuint,GLenum,const GLchar*); + GLint (WINE_GLAPI *p_glGetSubroutineUniformLocation)(GLuint,GLenum,const GLchar*); void (WINE_GLAPI *p_glGetSynciv)(GLvoid*,GLenum,GLsizei,GLsizei*,GLint*); void (WINE_GLAPI *p_glGetTexBumpParameterfvATI)(GLenum,GLfloat*); void (WINE_GLAPI *p_glGetTexBumpParameterivATI)(GLenum,GLint*); @@ -1099,22 +1099,22 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetTextureParameterivEXT)(GLuint,GLenum,GLenum,GLint*); UINT64 (WINE_GLAPI *p_glGetTextureSamplerHandleNV)(GLuint,GLuint); void (WINE_GLAPI *p_glGetTrackMatrixivNV)(GLenum,GLuint,GLenum,GLint*); - void (WINE_GLAPI *p_glGetTransformFeedbackVarying)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,char*); - void (WINE_GLAPI *p_glGetTransformFeedbackVaryingEXT)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,char*); + void (WINE_GLAPI *p_glGetTransformFeedbackVarying)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*); + void (WINE_GLAPI *p_glGetTransformFeedbackVaryingEXT)(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*); void (WINE_GLAPI *p_glGetTransformFeedbackVaryingNV)(GLuint,GLuint,GLint*); - GLuint (WINE_GLAPI *p_glGetUniformBlockIndex)(GLuint,const char*); + GLuint (WINE_GLAPI *p_glGetUniformBlockIndex)(GLuint,const GLchar*); GLint (WINE_GLAPI *p_glGetUniformBufferSizeEXT)(GLuint,GLint); - void (WINE_GLAPI *p_glGetUniformIndices)(GLuint,GLsizei,const char* const*,GLuint*); - GLint (WINE_GLAPI *p_glGetUniformLocation)(GLuint,const char*); - GLint (WINE_GLAPI *p_glGetUniformLocationARB)(unsigned int,const char*); - INT_PTR (WINE_GLAPI *p_glGetUniformOffsetEXT)(GLuint,GLint); + void (WINE_GLAPI *p_glGetUniformIndices)(GLuint,GLsizei,const GLchar* const*,GLuint*); + GLint (WINE_GLAPI *p_glGetUniformLocation)(GLuint,const GLchar*); + GLint (WINE_GLAPI *p_glGetUniformLocationARB)(GLhandleARB,const GLcharARB*); + GLintptr (WINE_GLAPI *p_glGetUniformOffsetEXT)(GLuint,GLint); void (WINE_GLAPI *p_glGetUniformSubroutineuiv)(GLenum,GLint,GLuint*); void (WINE_GLAPI *p_glGetUniformdv)(GLuint,GLint,GLdouble*); void (WINE_GLAPI *p_glGetUniformfv)(GLuint,GLint,GLfloat*); - void (WINE_GLAPI *p_glGetUniformfvARB)(unsigned int,GLint,GLfloat*); + void (WINE_GLAPI *p_glGetUniformfvARB)(GLhandleARB,GLint,GLfloat*); void (WINE_GLAPI *p_glGetUniformi64vNV)(GLuint,GLint,INT64*); void (WINE_GLAPI *p_glGetUniformiv)(GLuint,GLint,GLint*); - void (WINE_GLAPI *p_glGetUniformivARB)(unsigned int,GLint,GLint*); + void (WINE_GLAPI *p_glGetUniformivARB)(GLhandleARB,GLint,GLint*); void (WINE_GLAPI *p_glGetUniformui64vNV)(GLuint,GLint,UINT64*); void (WINE_GLAPI *p_glGetUniformuiv)(GLuint,GLint,GLuint*); void (WINE_GLAPI *p_glGetUniformuivEXT)(GLuint,GLint,GLuint*); @@ -1124,7 +1124,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glGetVariantFloatvEXT)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetVariantIntegervEXT)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetVariantPointervEXT)(GLuint,GLenum,GLvoid**); - GLint (WINE_GLAPI *p_glGetVaryingLocationNV)(GLuint,const char*); + GLint (WINE_GLAPI *p_glGetVaryingLocationNV)(GLuint,const GLchar*); void (WINE_GLAPI *p_glGetVertexAttribArrayObjectfvATI)(GLuint,GLenum,GLfloat*); void (WINE_GLAPI *p_glGetVertexAttribArrayObjectivATI)(GLuint,GLenum,GLint*); void (WINE_GLAPI *p_glGetVertexAttribIiv)(GLuint,GLenum,GLint*); @@ -1189,7 +1189,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glImageTransformParameterfvHP)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glImageTransformParameteriHP)(GLenum,GLenum,GLint); void (WINE_GLAPI *p_glImageTransformParameterivHP)(GLenum,GLenum,const GLint*); - GLvoid* (WINE_GLAPI *p_glImportSyncEXT)(GLenum,INT_PTR,GLbitfield); + GLvoid* (WINE_GLAPI *p_glImportSyncEXT)(GLenum,GLintptr,GLbitfield); void (WINE_GLAPI *p_glIndexFormatNV)(GLenum,GLsizei); void (WINE_GLAPI *p_glIndexFuncEXT)(GLenum,GLclampf); void (WINE_GLAPI *p_glIndexMaterialEXT)(GLenum,GLenum); @@ -1199,7 +1199,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glInstrumentsBufferSGIX)(GLsizei,GLint*); void (WINE_GLAPI *p_glInterpolatePathsNV)(GLuint,GLuint,GLuint,GLfloat); void (WINE_GLAPI *p_glInvalidateBufferData)(GLuint); - void (WINE_GLAPI *p_glInvalidateBufferSubData)(GLuint,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glInvalidateBufferSubData)(GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glInvalidateFramebuffer)(GLenum,GLsizei,const GLenum*); void (WINE_GLAPI *p_glInvalidateSubFramebuffer)(GLenum,GLsizei,const GLenum*,GLint,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glInvalidateTexImage)(GLuint,GLint); @@ -1217,7 +1217,7 @@ struct opengl_funcs GLboolean (WINE_GLAPI *p_glIsImageHandleResidentNV)(UINT64); GLboolean (WINE_GLAPI *p_glIsNameAMD)(GLenum,GLuint); GLboolean (WINE_GLAPI *p_glIsNamedBufferResidentNV)(GLuint); - GLboolean (WINE_GLAPI *p_glIsNamedStringARB)(GLint,const char*); + GLboolean (WINE_GLAPI *p_glIsNamedStringARB)(GLint,const GLchar*); GLboolean (WINE_GLAPI *p_glIsObjectBufferATI)(GLuint); GLboolean (WINE_GLAPI *p_glIsOcclusionQueryNV)(GLuint); GLboolean (WINE_GLAPI *p_glIsPathNV)(GLuint); @@ -1244,7 +1244,7 @@ struct opengl_funcs GLboolean (WINE_GLAPI *p_glIsVertexAttribEnabledAPPLE)(GLuint,GLenum); void (WINE_GLAPI *p_glLightEnviSGIX)(GLenum,GLint); void (WINE_GLAPI *p_glLinkProgram)(GLuint); - void (WINE_GLAPI *p_glLinkProgramARB)(unsigned int); + void (WINE_GLAPI *p_glLinkProgramARB)(GLhandleARB); void (WINE_GLAPI *p_glListParameterfSGIX)(GLuint,GLenum,GLfloat); void (WINE_GLAPI *p_glListParameterfvSGIX)(GLuint,GLenum,const GLfloat*); void (WINE_GLAPI *p_glListParameteriSGIX)(GLuint,GLenum,GLint); @@ -1268,10 +1268,10 @@ struct opengl_funcs void (WINE_GLAPI *p_glMakeTextureHandleResidentNV)(UINT64); GLvoid* (WINE_GLAPI *p_glMapBuffer)(GLenum,GLenum); GLvoid* (WINE_GLAPI *p_glMapBufferARB)(GLenum,GLenum); - GLvoid* (WINE_GLAPI *p_glMapBufferRange)(GLenum,INT_PTR,INT_PTR,GLbitfield); + GLvoid* (WINE_GLAPI *p_glMapBufferRange)(GLenum,GLintptr,GLsizeiptr,GLbitfield); void (WINE_GLAPI *p_glMapControlPointsNV)(GLenum,GLuint,GLenum,GLsizei,GLsizei,GLint,GLint,GLboolean,const GLvoid*); GLvoid* (WINE_GLAPI *p_glMapNamedBufferEXT)(GLuint,GLenum); - GLvoid* (WINE_GLAPI *p_glMapNamedBufferRangeEXT)(GLuint,INT_PTR,INT_PTR,GLbitfield); + GLvoid* (WINE_GLAPI *p_glMapNamedBufferRangeEXT)(GLuint,GLintptr,GLsizeiptr,GLbitfield); GLvoid* (WINE_GLAPI *p_glMapObjectBufferATI)(GLuint); void (WINE_GLAPI *p_glMapParameterfvNV)(GLenum,GLenum,const GLfloat*); void (WINE_GLAPI *p_glMapParameterivNV)(GLenum,GLenum,const GLint*); @@ -1338,8 +1338,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glMultiTexCoord1fv)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord1fvARB)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord1fvSGIS)(GLenum,const GLfloat *); - void (WINE_GLAPI *p_glMultiTexCoord1hNV)(GLenum,unsigned short); - void (WINE_GLAPI *p_glMultiTexCoord1hvNV)(GLenum,const unsigned short*); + void (WINE_GLAPI *p_glMultiTexCoord1hNV)(GLenum,GLhalfNV); + void (WINE_GLAPI *p_glMultiTexCoord1hvNV)(GLenum,const GLhalfNV*); void (WINE_GLAPI *p_glMultiTexCoord1i)(GLenum,GLint); void (WINE_GLAPI *p_glMultiTexCoord1iARB)(GLenum,GLint); void (WINE_GLAPI *p_glMultiTexCoord1iSGIS)(GLenum,GLint); @@ -1364,8 +1364,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glMultiTexCoord2fv)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord2fvARB)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord2fvSGIS)(GLenum,GLfloat *); - void (WINE_GLAPI *p_glMultiTexCoord2hNV)(GLenum,unsigned short,unsigned short); - void (WINE_GLAPI *p_glMultiTexCoord2hvNV)(GLenum,const unsigned short*); + void (WINE_GLAPI *p_glMultiTexCoord2hNV)(GLenum,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glMultiTexCoord2hvNV)(GLenum,const GLhalfNV*); void (WINE_GLAPI *p_glMultiTexCoord2i)(GLenum,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord2iARB)(GLenum,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord2iSGIS)(GLenum,GLint,GLint); @@ -1390,8 +1390,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glMultiTexCoord3fv)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord3fvARB)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord3fvSGIS)(GLenum,GLfloat *); - void (WINE_GLAPI *p_glMultiTexCoord3hNV)(GLenum,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glMultiTexCoord3hvNV)(GLenum,const unsigned short*); + void (WINE_GLAPI *p_glMultiTexCoord3hNV)(GLenum,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glMultiTexCoord3hvNV)(GLenum,const GLhalfNV*); void (WINE_GLAPI *p_glMultiTexCoord3i)(GLenum,GLint,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord3iARB)(GLenum,GLint,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord3iSGIS)(GLenum,GLint,GLint,GLint); @@ -1416,8 +1416,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glMultiTexCoord4fv)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord4fvARB)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glMultiTexCoord4fvSGIS)(GLenum,GLfloat *); - void (WINE_GLAPI *p_glMultiTexCoord4hNV)(GLenum,unsigned short,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glMultiTexCoord4hvNV)(GLenum,const unsigned short*); + void (WINE_GLAPI *p_glMultiTexCoord4hNV)(GLenum,GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glMultiTexCoord4hvNV)(GLenum,const GLhalfNV*); void (WINE_GLAPI *p_glMultiTexCoord4i)(GLenum,GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord4iARB)(GLenum,GLint,GLint,GLint,GLint); void (WINE_GLAPI *p_glMultiTexCoord4iSGIS)(GLenum,GLint,GLint,GLint,GLint); @@ -1463,9 +1463,9 @@ struct opengl_funcs void (WINE_GLAPI *p_glMultiTexSubImage1DEXT)(GLenum,GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); void (WINE_GLAPI *p_glMultiTexSubImage2DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); void (WINE_GLAPI *p_glMultiTexSubImage3DEXT)(GLenum,GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); - void (WINE_GLAPI *p_glNamedBufferDataEXT)(GLuint,INT_PTR,const GLvoid*,GLenum); - void (WINE_GLAPI *p_glNamedBufferSubDataEXT)(GLuint,INT_PTR,INT_PTR,const GLvoid*); - void (WINE_GLAPI *p_glNamedCopyBufferSubDataEXT)(GLuint,GLuint,INT_PTR,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glNamedBufferDataEXT)(GLuint,GLsizeiptr,const GLvoid*,GLenum); + void (WINE_GLAPI *p_glNamedBufferSubDataEXT)(GLuint,GLintptr,GLsizeiptr,const GLvoid*); + void (WINE_GLAPI *p_glNamedCopyBufferSubDataEXT)(GLuint,GLuint,GLintptr,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glNamedFramebufferParameteriEXT)(GLuint,GLenum,GLint); void (WINE_GLAPI *p_glNamedFramebufferRenderbufferEXT)(GLuint,GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glNamedFramebufferTexture1DEXT)(GLuint,GLenum,GLenum,GLuint,GLint); @@ -1489,13 +1489,13 @@ struct opengl_funcs void (WINE_GLAPI *p_glNamedRenderbufferStorageEXT)(GLuint,GLenum,GLsizei,GLsizei); void (WINE_GLAPI *p_glNamedRenderbufferStorageMultisampleCoverageEXT)(GLuint,GLsizei,GLsizei,GLenum,GLsizei,GLsizei); void (WINE_GLAPI *p_glNamedRenderbufferStorageMultisampleEXT)(GLuint,GLsizei,GLenum,GLsizei,GLsizei); - void (WINE_GLAPI *p_glNamedStringARB)(GLenum,GLint,const char*,GLint,const char*); + void (WINE_GLAPI *p_glNamedStringARB)(GLenum,GLint,const GLchar*,GLint,const GLchar*); GLuint (WINE_GLAPI *p_glNewBufferRegion)(GLenum); GLuint (WINE_GLAPI *p_glNewObjectBufferATI)(GLsizei,const GLvoid*,GLenum); void (WINE_GLAPI *p_glNormal3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glNormal3fVertex3fvSUN)(const GLfloat*,const GLfloat*); - void (WINE_GLAPI *p_glNormal3hNV)(unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glNormal3hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glNormal3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glNormal3hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glNormalFormatNV)(GLenum,GLsizei); void (WINE_GLAPI *p_glNormalP3ui)(GLenum,GLuint); void (WINE_GLAPI *p_glNormalP3uiv)(GLenum,const GLuint*); @@ -1512,8 +1512,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glNormalStream3ivATI)(GLenum,const GLint*); void (WINE_GLAPI *p_glNormalStream3sATI)(GLenum,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glNormalStream3svATI)(GLenum,const GLshort*); - void (WINE_GLAPI *p_glObjectLabel)(GLenum,GLuint,GLsizei,const char*); - void (WINE_GLAPI *p_glObjectPtrLabel)(const void*,GLsizei,const char*); + void (WINE_GLAPI *p_glObjectLabel)(GLenum,GLuint,GLsizei,const GLchar*); + void (WINE_GLAPI *p_glObjectPtrLabel)(const void*,GLsizei,const GLchar*); GLenum (WINE_GLAPI *p_glObjectPurgeableAPPLE)(GLenum,GLuint,GLenum); GLenum (WINE_GLAPI *p_glObjectUnpurgeableAPPLE)(GLenum,GLuint,GLenum); void (WINE_GLAPI *p_glPNTrianglesfATI)(GLenum,GLfloat); @@ -1739,7 +1739,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glProvokingVertex)(GLenum); void (WINE_GLAPI *p_glProvokingVertexEXT)(GLenum); void (WINE_GLAPI *p_glPushClientAttribDefaultEXT)(GLbitfield); - void (WINE_GLAPI *p_glPushDebugGroup)(GLenum,GLuint,GLsizei,const char*); + void (WINE_GLAPI *p_glPushDebugGroup)(GLenum,GLuint,GLsizei,const GLchar*); void (WINE_GLAPI *p_glQueryCounter)(GLuint,GLenum); void (WINE_GLAPI *p_glReadBufferRegion)(GLenum,GLint,GLint,GLsizei,GLsizei); void (WINE_GLAPI *p_glReadInstrumentsSGIX)(GLint); @@ -1812,8 +1812,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glSecondaryColor3fEXT)(GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glSecondaryColor3fv)(const GLfloat*); void (WINE_GLAPI *p_glSecondaryColor3fvEXT)(const GLfloat*); - void (WINE_GLAPI *p_glSecondaryColor3hNV)(unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glSecondaryColor3hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glSecondaryColor3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glSecondaryColor3hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glSecondaryColor3i)(GLint,GLint,GLint); void (WINE_GLAPI *p_glSecondaryColor3iEXT)(GLint,GLint,GLint); void (WINE_GLAPI *p_glSecondaryColor3iv)(const GLint*); @@ -1855,8 +1855,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glShaderOp1EXT)(GLenum,GLuint,GLuint); void (WINE_GLAPI *p_glShaderOp2EXT)(GLenum,GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glShaderOp3EXT)(GLenum,GLuint,GLuint,GLuint,GLuint); - void (WINE_GLAPI *p_glShaderSource)(GLuint,GLsizei,const char* const*,const GLint*); - void (WINE_GLAPI *p_glShaderSourceARB)(unsigned int,GLsizei,const char**,const GLint*); + void (WINE_GLAPI *p_glShaderSource)(GLuint,GLsizei,const GLchar* const*,const GLint*); + void (WINE_GLAPI *p_glShaderSourceARB)(GLhandleARB,GLsizei,const GLcharARB**,const GLint*); void (WINE_GLAPI *p_glShaderStorageBlockBinding)(GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glSharpenTexFuncSGIS)(GLenum,GLsizei,const GLfloat*); void (WINE_GLAPI *p_glSpriteParameterfSGIX)(GLenum,GLfloat); @@ -1899,11 +1899,11 @@ struct opengl_funcs void (WINE_GLAPI *p_glTexBuffer)(GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glTexBufferARB)(GLenum,GLenum,GLuint); void (WINE_GLAPI *p_glTexBufferEXT)(GLenum,GLenum,GLuint); - void (WINE_GLAPI *p_glTexBufferRange)(GLenum,GLenum,GLuint,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glTexBufferRange)(GLenum,GLenum,GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glTexBumpParameterfvATI)(GLenum,const GLfloat*); void (WINE_GLAPI *p_glTexBumpParameterivATI)(GLenum,const GLint*); - void (WINE_GLAPI *p_glTexCoord1hNV)(unsigned short); - void (WINE_GLAPI *p_glTexCoord1hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glTexCoord1hNV)(GLhalfNV); + void (WINE_GLAPI *p_glTexCoord1hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glTexCoord2fColor3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord2fColor3fVertex3fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*); void (WINE_GLAPI *p_glTexCoord2fColor4fNormal3fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); @@ -1914,16 +1914,16 @@ struct opengl_funcs void (WINE_GLAPI *p_glTexCoord2fNormal3fVertex3fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*); void (WINE_GLAPI *p_glTexCoord2fVertex3fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord2fVertex3fvSUN)(const GLfloat*,const GLfloat*); - void (WINE_GLAPI *p_glTexCoord2hNV)(unsigned short,unsigned short); - void (WINE_GLAPI *p_glTexCoord2hvNV)(const unsigned short*); - void (WINE_GLAPI *p_glTexCoord3hNV)(unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glTexCoord3hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glTexCoord2hNV)(GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glTexCoord2hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glTexCoord3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glTexCoord3hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glTexCoord4fColor4fNormal3fVertex4fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord4fColor4fNormal3fVertex4fvSUN)(const GLfloat*,const GLfloat*,const GLfloat*,const GLfloat*); void (WINE_GLAPI *p_glTexCoord4fVertex4fSUN)(GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat,GLfloat); void (WINE_GLAPI *p_glTexCoord4fVertex4fvSUN)(const GLfloat*,const GLfloat*); - void (WINE_GLAPI *p_glTexCoord4hNV)(unsigned short,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glTexCoord4hvNV)(const unsigned short*); + void (WINE_GLAPI *p_glTexCoord4hNV)(GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glTexCoord4hvNV)(const GLhalfNV*); void (WINE_GLAPI *p_glTexCoordFormatNV)(GLint,GLenum,GLsizei); void (WINE_GLAPI *p_glTexCoordP1ui)(GLenum,GLuint); void (WINE_GLAPI *p_glTexCoordP1uiv)(GLenum,const GLuint*); @@ -1962,7 +1962,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glTexSubImage4DSGIS)(GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); void (WINE_GLAPI *p_glTextureBarrierNV)(void); void (WINE_GLAPI *p_glTextureBufferEXT)(GLuint,GLenum,GLenum,GLuint); - void (WINE_GLAPI *p_glTextureBufferRangeEXT)(GLuint,GLenum,GLenum,GLuint,INT_PTR,INT_PTR); + void (WINE_GLAPI *p_glTextureBufferRangeEXT)(GLuint,GLenum,GLenum,GLuint,GLintptr,GLsizeiptr); void (WINE_GLAPI *p_glTextureColorMaskSGIS)(GLboolean,GLboolean,GLboolean,GLboolean); void (WINE_GLAPI *p_glTextureImage1DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLint,GLenum,GLenum,const GLvoid*); void (WINE_GLAPI *p_glTextureImage2DEXT)(GLuint,GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); @@ -1995,8 +1995,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glTrackMatrixNV)(GLenum,GLuint,GLenum,GLenum); void (WINE_GLAPI *p_glTransformFeedbackAttribsNV)(GLuint,const GLint*,GLenum); void (WINE_GLAPI *p_glTransformFeedbackStreamAttribsNV)(GLsizei,const GLint*,GLsizei,const GLint*,GLenum); - void (WINE_GLAPI *p_glTransformFeedbackVaryings)(GLuint,GLsizei,const char* const*,GLenum); - void (WINE_GLAPI *p_glTransformFeedbackVaryingsEXT)(GLuint,GLsizei,const char**,GLenum); + void (WINE_GLAPI *p_glTransformFeedbackVaryings)(GLuint,GLsizei,const GLchar* const*,GLenum); + void (WINE_GLAPI *p_glTransformFeedbackVaryingsEXT)(GLuint,GLsizei,const GLchar**,GLenum); void (WINE_GLAPI *p_glTransformFeedbackVaryingsNV)(GLuint,GLsizei,const GLint*,GLenum); void (WINE_GLAPI *p_glTransformPathNV)(GLuint,GLuint,GLenum,const GLfloat*); void (WINE_GLAPI *p_glUniform1d)(GLint,GLdouble); @@ -2106,21 +2106,21 @@ struct opengl_funcs void (WINE_GLAPI *p_glUnmapObjectBufferATI)(GLuint); void (WINE_GLAPI *p_glUpdateObjectBufferATI)(GLuint,GLuint,GLsizei,const GLvoid*,GLenum); void (WINE_GLAPI *p_glUseProgram)(GLuint); - void (WINE_GLAPI *p_glUseProgramObjectARB)(unsigned int); + void (WINE_GLAPI *p_glUseProgramObjectARB)(GLhandleARB); void (WINE_GLAPI *p_glUseProgramStages)(GLuint,GLbitfield,GLuint); void (WINE_GLAPI *p_glUseShaderProgramEXT)(GLenum,GLuint); void (WINE_GLAPI *p_glVDPAUFiniNV)(void); - void (WINE_GLAPI *p_glVDPAUGetSurfaceivNV)(INT_PTR,GLenum,GLsizei,GLsizei*,GLint*); + void (WINE_GLAPI *p_glVDPAUGetSurfaceivNV)(GLvdpauSurfaceNV,GLenum,GLsizei,GLsizei*,GLint*); void (WINE_GLAPI *p_glVDPAUInitNV)(const GLvoid*,const GLvoid*); - void (WINE_GLAPI *p_glVDPAUIsSurfaceNV)(INT_PTR); - void (WINE_GLAPI *p_glVDPAUMapSurfacesNV)(GLsizei,const INT_PTR*); - INT_PTR (WINE_GLAPI *p_glVDPAURegisterOutputSurfaceNV)(GLvoid*,GLenum,GLsizei,const GLuint*); - INT_PTR (WINE_GLAPI *p_glVDPAURegisterVideoSurfaceNV)(const GLvoid*,GLenum,GLsizei,const GLuint*); - void (WINE_GLAPI *p_glVDPAUSurfaceAccessNV)(INT_PTR,GLenum); - void (WINE_GLAPI *p_glVDPAUUnmapSurfacesNV)(GLsizei,const INT_PTR*); - void (WINE_GLAPI *p_glVDPAUUnregisterSurfaceNV)(INT_PTR); + void (WINE_GLAPI *p_glVDPAUIsSurfaceNV)(GLvdpauSurfaceNV); + void (WINE_GLAPI *p_glVDPAUMapSurfacesNV)(GLsizei,const GLvdpauSurfaceNV*); + GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterOutputSurfaceNV)(GLvoid*,GLenum,GLsizei,const GLuint*); + GLvdpauSurfaceNV (WINE_GLAPI *p_glVDPAURegisterVideoSurfaceNV)(const GLvoid*,GLenum,GLsizei,const GLuint*); + void (WINE_GLAPI *p_glVDPAUSurfaceAccessNV)(GLvdpauSurfaceNV,GLenum); + void (WINE_GLAPI *p_glVDPAUUnmapSurfacesNV)(GLsizei,const GLvdpauSurfaceNV*); + void (WINE_GLAPI *p_glVDPAUUnregisterSurfaceNV)(GLvdpauSurfaceNV); void (WINE_GLAPI *p_glValidateProgram)(GLuint); - void (WINE_GLAPI *p_glValidateProgramARB)(unsigned int); + void (WINE_GLAPI *p_glValidateProgramARB)(GLhandleARB); void (WINE_GLAPI *p_glValidateProgramPipeline)(GLuint); void (WINE_GLAPI *p_glVariantArrayObjectATI)(GLuint,GLenum,GLsizei,GLuint,GLuint); void (WINE_GLAPI *p_glVariantPointerEXT)(GLuint,GLenum,GLuint,const GLvoid*); @@ -2132,13 +2132,13 @@ struct opengl_funcs void (WINE_GLAPI *p_glVariantubvEXT)(GLuint,const GLubyte*); void (WINE_GLAPI *p_glVariantuivEXT)(GLuint,const GLuint*); void (WINE_GLAPI *p_glVariantusvEXT)(GLuint,const GLushort*); - void (WINE_GLAPI *p_glVertex2hNV)(unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertex2hvNV)(const unsigned short*); - void (WINE_GLAPI *p_glVertex3hNV)(unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertex3hvNV)(const unsigned short*); - void (WINE_GLAPI *p_glVertex4hNV)(unsigned short,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertex4hvNV)(const unsigned short*); - void (WINE_GLAPI *p_glVertexArrayBindVertexBufferEXT)(GLuint,GLuint,GLuint,INT_PTR,GLsizei); + void (WINE_GLAPI *p_glVertex2hNV)(GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertex2hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertex3hNV)(GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertex3hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertex4hNV)(GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertex4hvNV)(const GLhalfNV*); + void (WINE_GLAPI *p_glVertexArrayBindVertexBufferEXT)(GLuint,GLuint,GLuint,GLintptr,GLsizei); void (WINE_GLAPI *p_glVertexArrayParameteriAPPLE)(GLenum,GLint); void (WINE_GLAPI *p_glVertexArrayRangeAPPLE)(GLsizei,GLvoid*); void (WINE_GLAPI *p_glVertexArrayRangeNV)(GLsizei,const GLvoid*); @@ -2146,7 +2146,7 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexArrayVertexAttribFormatEXT)(GLuint,GLuint,GLint,GLenum,GLboolean,GLuint); void (WINE_GLAPI *p_glVertexArrayVertexAttribIFormatEXT)(GLuint,GLuint,GLint,GLenum,GLuint); void (WINE_GLAPI *p_glVertexArrayVertexAttribLFormatEXT)(GLuint,GLuint,GLint,GLenum,GLuint); - void (WINE_GLAPI *p_glVertexArrayVertexAttribLOffsetEXT)(GLuint,GLuint,GLuint,GLint,GLenum,GLsizei,INT_PTR); + void (WINE_GLAPI *p_glVertexArrayVertexAttribLOffsetEXT)(GLuint,GLuint,GLuint,GLint,GLenum,GLsizei,GLintptr); void (WINE_GLAPI *p_glVertexArrayVertexBindingDivisorEXT)(GLuint,GLuint,GLuint); void (WINE_GLAPI *p_glVertexAttrib1d)(GLuint,GLdouble); void (WINE_GLAPI *p_glVertexAttrib1dARB)(GLuint,GLdouble); @@ -2160,8 +2160,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexAttrib1fv)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib1fvARB)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib1fvNV)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttrib1hNV)(GLuint,unsigned short); - void (WINE_GLAPI *p_glVertexAttrib1hvNV)(GLuint,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttrib1hNV)(GLuint,GLhalfNV); + void (WINE_GLAPI *p_glVertexAttrib1hvNV)(GLuint,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttrib1s)(GLuint,GLshort); void (WINE_GLAPI *p_glVertexAttrib1sARB)(GLuint,GLshort); void (WINE_GLAPI *p_glVertexAttrib1sNV)(GLuint,GLshort); @@ -2180,8 +2180,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexAttrib2fv)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib2fvARB)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib2fvNV)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttrib2hNV)(GLuint,unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertexAttrib2hvNV)(GLuint,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttrib2hNV)(GLuint,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertexAttrib2hvNV)(GLuint,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttrib2s)(GLuint,GLshort,GLshort); void (WINE_GLAPI *p_glVertexAttrib2sARB)(GLuint,GLshort,GLshort); void (WINE_GLAPI *p_glVertexAttrib2sNV)(GLuint,GLshort,GLshort); @@ -2200,8 +2200,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexAttrib3fv)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib3fvARB)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib3fvNV)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttrib3hNV)(GLuint,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertexAttrib3hvNV)(GLuint,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttrib3hNV)(GLuint,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertexAttrib3hvNV)(GLuint,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttrib3s)(GLuint,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glVertexAttrib3sARB)(GLuint,GLshort,GLshort,GLshort); void (WINE_GLAPI *p_glVertexAttrib3sNV)(GLuint,GLshort,GLshort,GLshort); @@ -2236,8 +2236,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexAttrib4fv)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib4fvARB)(GLuint,const GLfloat*); void (WINE_GLAPI *p_glVertexAttrib4fvNV)(GLuint,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttrib4hNV)(GLuint,unsigned short,unsigned short,unsigned short,unsigned short); - void (WINE_GLAPI *p_glVertexAttrib4hvNV)(GLuint,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttrib4hNV)(GLuint,GLhalfNV,GLhalfNV,GLhalfNV,GLhalfNV); + void (WINE_GLAPI *p_glVertexAttrib4hvNV)(GLuint,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttrib4iv)(GLuint,const GLint*); void (WINE_GLAPI *p_glVertexAttrib4ivARB)(GLuint,const GLint*); void (WINE_GLAPI *p_glVertexAttrib4s)(GLuint,GLshort,GLshort,GLshort,GLshort); @@ -2353,19 +2353,19 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexAttribPointerNV)(GLuint,GLint,GLenum,GLsizei,const GLvoid*); void (WINE_GLAPI *p_glVertexAttribs1dvNV)(GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribs1fvNV)(GLuint,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttribs1hvNV)(GLuint,GLsizei,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttribs1hvNV)(GLuint,GLsizei,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttribs1svNV)(GLuint,GLsizei,const GLshort*); void (WINE_GLAPI *p_glVertexAttribs2dvNV)(GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribs2fvNV)(GLuint,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttribs2hvNV)(GLuint,GLsizei,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttribs2hvNV)(GLuint,GLsizei,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttribs2svNV)(GLuint,GLsizei,const GLshort*); void (WINE_GLAPI *p_glVertexAttribs3dvNV)(GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribs3fvNV)(GLuint,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttribs3hvNV)(GLuint,GLsizei,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttribs3hvNV)(GLuint,GLsizei,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttribs3svNV)(GLuint,GLsizei,const GLshort*); void (WINE_GLAPI *p_glVertexAttribs4dvNV)(GLuint,GLsizei,const GLdouble*); void (WINE_GLAPI *p_glVertexAttribs4fvNV)(GLuint,GLsizei,const GLfloat*); - void (WINE_GLAPI *p_glVertexAttribs4hvNV)(GLuint,GLsizei,const unsigned short*); + void (WINE_GLAPI *p_glVertexAttribs4hvNV)(GLuint,GLsizei,const GLhalfNV*); void (WINE_GLAPI *p_glVertexAttribs4svNV)(GLuint,GLsizei,const GLshort*); void (WINE_GLAPI *p_glVertexAttribs4ubvNV)(GLuint,GLsizei,const GLubyte*); void (WINE_GLAPI *p_glVertexBindingDivisor)(GLuint,GLuint); @@ -2417,8 +2417,8 @@ struct opengl_funcs void (WINE_GLAPI *p_glVertexWeightPointerEXT)(GLint,GLenum,GLsizei,const GLvoid*); void (WINE_GLAPI *p_glVertexWeightfEXT)(GLfloat); void (WINE_GLAPI *p_glVertexWeightfvEXT)(const GLfloat*); - void (WINE_GLAPI *p_glVertexWeighthNV)(unsigned short); - void (WINE_GLAPI *p_glVertexWeighthvNV)(const unsigned short*); + void (WINE_GLAPI *p_glVertexWeighthNV)(GLhalfNV); + void (WINE_GLAPI *p_glVertexWeighthvNV)(const GLhalfNV*); GLenum (WINE_GLAPI *p_glVideoCaptureNV)(GLuint,GLuint*,UINT64*); void (WINE_GLAPI *p_glVideoCaptureStreamParameterdvNV)(GLuint,GLuint,GLenum,const GLdouble*); void (WINE_GLAPI *p_glVideoCaptureStreamParameterfvNV)(GLuint,GLuint,GLenum,const GLfloat*);