From 4e04838148f556d4bbd53c7c40c5662b73d37ed9 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Mon, 16 Nov 2009 16:14:32 +0000 Subject: [PATCH] Added new OpenGL 3.1 tokens for ARB_texture_rectangle, ARB_shader_objects and EXT_gpu_shader4. Fixes issue [#1355]: "TextureRectangle tokens for ActiveUniformType". --- Source/Bind/Specifications/GL2/enumext.spec | 18 ++++++++++++++++++ Source/OpenTK/Graphics/OpenGL/GLEnums.cs | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index acc73255..d9dc5837 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -7556,6 +7556,24 @@ SizedInternalFormat enum: use PixelInternalFormat RGBA8UI use PixelInternalFormat RGBA16UI use PixelInternalFormat RGBA32UI + +TextureTarget enum: + TEXTURE_RECTANGLE = 0x84F5 # ARB_texture_rectangle + PROXY_TEXTURE_RECTANGLE = 0x84F7 # ARB_texture_rectangle + +GetPName enum: + TEXTURE_BINDING_RECTANGLE = 0x84F6 # ARB_texture_rectangle + MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8 # ARB_texture_rectangle + +ActiveUniformType enum: + SAMPLER_2D_RECT = 0x8B63 # ARB_shader_objects + ARB_texture_rectangle + SAMPLER_2D_RECT_SHADOW = 0x8B64 # ARB_shader_objects + ARB_texture_rectangle + SAMPLER_BUFFER = 0x8DC2 # EXT_gpu_shader4 + ARB_texture_buffer_object + INT_SAMPLER_2D_RECT = 0x8DCD # EXT_gpu_shader4 + ARB_texture_rectangle + INT_SAMPLER_BUFFER = 0x8DD0 # EXT_gpu_shader4 + ARB_texture_buffer_object + UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5 # EXT_gpu_shader4 + ARB_texture_rectangle + UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8 # EXT_gpu_shader4 + ARB_texture_buffer_object + # Non-core diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index 79d48f6c..a1411370 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -74,6 +74,8 @@ namespace OpenTK.Graphics.OpenGL SamplerCube = ((int)0x8B60), Sampler1DShadow = ((int)0x8B61), Sampler2DShadow = ((int)0x8B62), + Sampler2DRect = ((int)0x8B63), + Sampler2DRectShadow = ((int)0x8B64), FloatMat2x3 = ((int)0x8B65), FloatMat2x4 = ((int)0x8B66), FloatMat3x2 = ((int)0x8B67), @@ -82,6 +84,7 @@ namespace OpenTK.Graphics.OpenGL FloatMat4x3 = ((int)0x8B6A), Sampler1DArray = ((int)0x8DC0), Sampler2DArray = ((int)0x8DC1), + SamplerBuffer = ((int)0x8DC2), Sampler1DArrayShadow = ((int)0x8DC3), Sampler2DArrayShadow = ((int)0x8DC4), SamplerCubeShadow = ((int)0x8DC5), @@ -92,14 +95,18 @@ namespace OpenTK.Graphics.OpenGL IntSampler2D = ((int)0x8DCA), IntSampler3D = ((int)0x8DCB), IntSamplerCube = ((int)0x8DCC), + IntSampler2DRect = ((int)0x8DCD), IntSampler1DArray = ((int)0x8DCE), IntSampler2DArray = ((int)0x8DCF), + IntSamplerBuffer = ((int)0x8DD0), UnsignedIntSampler1D = ((int)0x8DD1), UnsignedIntSampler2D = ((int)0x8DD2), UnsignedIntSampler3D = ((int)0x8DD3), UnsignedIntSamplerCube = ((int)0x8DD4), + UnsignedIntSampler2DRect = ((int)0x8DD5), UnsignedIntSampler1DArray = ((int)0x8DD6), UnsignedIntSampler2DArray = ((int)0x8DD7), + UnsignedIntSamplerBuffer = ((int)0x8DD8), Sampler2DMultisample = ((int)0x9108), IntSampler2DMultisample = ((int)0x9109), UnsignedIntSampler2DMultisample = ((int)0x910A), @@ -7569,6 +7576,8 @@ namespace OpenTK.Graphics.OpenGL MaxRenderbufferSize = ((int)0x84E8), MaxRenderbufferSizeExt = ((int)0x84E8), TextureCompressionHint = ((int)0x84EF), + TextureBindingRectangle = ((int)0x84F6), + MaxRectangleTextureSize = ((int)0x84F8), MaxTextureLodBias = ((int)0x84FD), TextureCubeMap = ((int)0x8513), TextureBindingCubeMap = ((int)0x8514), @@ -10443,8 +10452,10 @@ namespace OpenTK.Graphics.OpenGL TextureMaxLod = ((int)0x813B), TextureBaseLevel = ((int)0x813C), TextureMaxLevel = ((int)0x813D), + TextureRectangle = ((int)0x84F5), TextureRectangleArb = ((int)0x84F5), TextureRectangleNv = ((int)0x84F5), + ProxyTextureRectangle = ((int)0x84F7), TextureCubeMap = ((int)0x8513), TextureBindingCubeMap = ((int)0x8514), TextureCubeMapPositiveX = ((int)0x8515),