From 16809ca0db22854b7e044bd3a355a9fff740c0cd Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 29 Mar 2009 15:35:58 +0000 Subject: [PATCH] Updated tokens for APPLE_flush_buffer_range (issue http://www.opentk.com/node/598). --- Source/Bind/Specifications/GL2/enumext.spec | 6 ++++++ Source/Bind/Specifications/GL2/gl.spec | 6 +++--- Source/OpenTK/Graphics/GL/GL.cs | 8 ++++---- Source/OpenTK/Graphics/GL/GLDelegates.cs | 4 ++-- Source/OpenTK/Graphics/GL/GLEnums.cs | 6 ++++++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 79be9e01..6834d3a2 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -6483,4 +6483,10 @@ GetPName enum: IndexedStringName enum: use StringName EXTENSIONS # Used in GetStringi +# Non-core changes: +# APPLE_flush_buffer_range +Buffer_Parameter_Apple enum: + use APPLE_flush_buffer_range BUFFER_SERIALIZED_MODIFY_APPLE + use APPLE_flush_buffer_range BUFFER_FLUSHING_UNMAP_APPLE + # End (don't remove, or the last token may be missed!) diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec index 069184ac..e47f86db 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -22050,8 +22050,8 @@ ProgramLocalParameters4fvEXT(target, index, count, params) BufferParameteriAPPLE(target, pname, param) return void - param target GLenum in value - param pname GLenum in value + param target BufferTarget in value # GLenum in value + param pname BufferParameterApple in value # GLenum in value param param Int32 in value category APPLE_flush_buffer_range version 1.5 @@ -22063,7 +22063,7 @@ BufferParameteriAPPLE(target, pname, param) FlushMappedBufferRangeAPPLE(target, offset, size) return void - param target GLenum in value + param target BufferTarget in value # GLenum in value param offset BufferOffset in value param size BufferSize in value category APPLE_flush_buffer_range diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index 80390325..b836d4a6 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -143757,13 +143757,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "AppleFlushBufferRange", Version = "1.5", EntryPoint = "glBufferParameteriAPPLE")] public static - void BufferParameter(OpenTK.Graphics.AppleFlushBufferRange target, OpenTK.Graphics.AppleFlushBufferRange pname, Int32 param) + void BufferParameter(OpenTK.Graphics.BufferTarget target, OpenTK.Graphics.BufferParameterApple pname, Int32 param) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBufferParameteriAPPLE((OpenTK.Graphics.AppleFlushBufferRange)target, (OpenTK.Graphics.AppleFlushBufferRange)pname, (Int32)param); + Delegates.glBufferParameteriAPPLE((OpenTK.Graphics.BufferTarget)target, (OpenTK.Graphics.BufferParameterApple)pname, (Int32)param); #if DEBUG } #endif @@ -143771,13 +143771,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "AppleFlushBufferRange", Version = "1.5", EntryPoint = "glFlushMappedBufferRangeAPPLE")] public static - void FlushMappedBufferRange(OpenTK.Graphics.AppleFlushBufferRange target, IntPtr offset, IntPtr size) + void FlushMappedBufferRange(OpenTK.Graphics.BufferTarget target, IntPtr offset, IntPtr size) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glFlushMappedBufferRangeAPPLE((OpenTK.Graphics.AppleFlushBufferRange)target, (IntPtr)offset, (IntPtr)size); + Delegates.glFlushMappedBufferRangeAPPLE((OpenTK.Graphics.BufferTarget)target, (IntPtr)offset, (IntPtr)size); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index 89157ee1..93a4268d 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -4643,10 +4643,10 @@ namespace OpenTK.Graphics internal unsafe delegate void ProgramLocalParameters4fvEXT(OpenTK.Graphics.ExtGpuProgramParameters target, UInt32 index, Int32 count, Single* @params); internal unsafe static ProgramLocalParameters4fvEXT glProgramLocalParameters4fvEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BufferParameteriAPPLE(OpenTK.Graphics.AppleFlushBufferRange target, OpenTK.Graphics.AppleFlushBufferRange pname, Int32 param); + internal delegate void BufferParameteriAPPLE(OpenTK.Graphics.BufferTarget target, OpenTK.Graphics.BufferParameterApple pname, Int32 param); internal static BufferParameteriAPPLE glBufferParameteriAPPLE; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void FlushMappedBufferRangeAPPLE(OpenTK.Graphics.AppleFlushBufferRange target, IntPtr offset, IntPtr size); + internal delegate void FlushMappedBufferRangeAPPLE(OpenTK.Graphics.BufferTarget target, IntPtr offset, IntPtr size); internal static FlushMappedBufferRangeAPPLE glFlushMappedBufferRangeAPPLE; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void ProgramLocalParameterI4iNV(OpenTK.Graphics.NvGpuProgram4 target, UInt32 index, Int32 x, Int32 y, Int32 z, Int32 w); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index fb095d0e..9887a174 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -9865,4 +9865,10 @@ namespace OpenTK.Graphics Extensions = ((int)0X1f03), } + public enum BufferParameterApple + { + BufferSerializedModifyApple = ((int)0X8a12), + BufferFlushingUnmapApple = ((int)0X8a13), + } + }