diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ce5f68915c0..61e02e87b4d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -167,7 +167,7 @@ sub ConvertType { "GLcharARB" => "char", "GLhalfNV" => "unsigned short" ); - foreach $org (keys %hash) { + foreach $org (reverse(sort(keys %hash))) { if ($type =~ /$org/) { ($before, $after) = ($type =~ /^(.*)$org(.*)$/); return "$before$hash{$org}$after"; @@ -476,7 +476,8 @@ $pseudo_to_opengl{"IglooParameterSGIX"} = "GLint"; [ "GLfloat", "readfreq" ], [ "GLfloat", "writefreq"], [ "GLfloat", "priority" ] ], "glXAllocateMemoryNV" ], - "wglFreeMemoryNV" => [ "wglFreeMemoryNV", "void", [ [ "GLvoid *", "pointer" ] ], "glXFreeMemoryNV" ] + "wglFreeMemoryNV" => [ "wglFreeMemoryNV", "void", [ [ "GLvoid *", "pointer" ] ], "glXFreeMemoryNV" ], + "glDeleteObjectBufferATI" => [ "glDeleteObjectBufferATI", "void", [ [ "GLuint", "buffer" ] ], "glDeleteObjectBufferATI" ] ); diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index d6e6890a8ea..a23bb9f8ec2 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -138,6 +138,7 @@ void (*func_glDeleteFencesAPPLE)( GLsizei, GLuint* ) = (void *) 0xdeadbeef; void (*func_glDeleteFencesNV)( GLsizei, GLuint* ) = (void *) 0xdeadbeef; void (*func_glDeleteFragmentShaderATI)( GLuint ) = (void *) 0xdeadbeef; void (*func_glDeleteObjectARB)( unsigned int ) = (void *) 0xdeadbeef; +void (*func_glDeleteObjectBufferATI)( GLuint ) = (void *) 0xdeadbeef; void (*func_glDeleteOcclusionQueriesNV)( GLsizei, GLuint* ) = (void *) 0xdeadbeef; void (*func_glDeleteProgramsARB)( GLsizei, GLuint* ) = (void *) 0xdeadbeef; void (*func_glDeleteProgramsNV)( GLsizei, GLuint* ) = (void *) 0xdeadbeef; @@ -1120,6 +1121,7 @@ void WINAPI wine_glDeleteFencesAPPLE( GLsizei, GLuint* ); void WINAPI wine_glDeleteFencesNV( GLsizei, GLuint* ); void WINAPI wine_glDeleteFragmentShaderATI( GLuint ); void WINAPI wine_glDeleteObjectARB( unsigned int ); +void WINAPI wine_glDeleteObjectBufferATI( GLuint ); void WINAPI wine_glDeleteOcclusionQueriesNV( GLsizei, GLuint* ); void WINAPI wine_glDeleteProgramsARB( GLsizei, GLuint* ); void WINAPI wine_glDeleteProgramsNV( GLsizei, GLuint* ); @@ -1971,8 +1973,8 @@ void WINAPI wine_wglFreeMemoryNV( GLvoid * ); /* The table giving the correspondance between names and functions */ -int extension_registry_size = 979; -OpenGL_extension extension_registry[979] = { +int extension_registry_size = 980; +OpenGL_extension extension_registry[980] = { { "glActiveStencilFaceEXT", "glActiveStencilFaceEXT", (void *) wine_glActiveStencilFaceEXT, (void **) (&func_glActiveStencilFaceEXT) }, { "glActiveTexture", "glActiveTexture", (void *) wine_glActiveTexture, (void **) (&func_glActiveTexture) }, { "glActiveTextureARB", "glActiveTextureARB", (void *) wine_glActiveTextureARB, (void **) (&func_glActiveTextureARB) }, @@ -2104,6 +2106,7 @@ OpenGL_extension extension_registry[979] = { { "glDeleteFencesNV", "glDeleteFencesNV", (void *) wine_glDeleteFencesNV, (void **) (&func_glDeleteFencesNV) }, { "glDeleteFragmentShaderATI", "glDeleteFragmentShaderATI", (void *) wine_glDeleteFragmentShaderATI, (void **) (&func_glDeleteFragmentShaderATI) }, { "glDeleteObjectARB", "glDeleteObjectARB", (void *) wine_glDeleteObjectARB, (void **) (&func_glDeleteObjectARB) }, + { "glDeleteObjectBufferATI", "glDeleteObjectBufferATI", (void *) wine_glDeleteObjectBufferATI, (void **) (&func_glDeleteObjectBufferATI) }, { "glDeleteOcclusionQueriesNV", "glDeleteOcclusionQueriesNV", (void *) wine_glDeleteOcclusionQueriesNV, (void **) (&func_glDeleteOcclusionQueriesNV) }, { "glDeleteProgramsARB", "glDeleteProgramsARB", (void *) wine_glDeleteProgramsARB, (void **) (&func_glDeleteProgramsARB) }, { "glDeleteProgramsNV", "glDeleteProgramsNV", (void *) wine_glDeleteProgramsNV, (void **) (&func_glDeleteProgramsNV) }, @@ -3892,6 +3895,13 @@ void WINAPI wine_glDeleteObjectARB( unsigned int obj ) { LEAVE_GL(); } +void WINAPI wine_glDeleteObjectBufferATI( GLuint buffer ) { + TRACE("(%d)\n", buffer ); + ENTER_GL(); + func_glDeleteObjectBufferATI( buffer ); + LEAVE_GL(); +} + void WINAPI wine_glDeleteOcclusionQueriesNV( GLsizei n, GLuint* ids ) { TRACE("(%d, %p)\n", n, ids ); ENTER_GL();