diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml
index ed02c4bf..5ea79a66 100644
--- a/Source/Bind/Specifications/GL2/gloverrides.xml
+++ b/Source/Bind/Specifications/GL2/gloverrides.xml
@@ -811,7 +811,7 @@
     <!-- also found Arb and Ext flavors -->
     <function name="ProgramParameteri" extension="Core">
       <param name="pname">
-        <type>AssemblyProgramParameterArb</type>
+        <type>ProgramParameterPName</type>
       </param>
     </function>
 
@@ -848,6 +848,20 @@
       </param>
     </function>
     
+    <!-- Version 4.2 -->
+    
+    <function name="GetActiveAtomicCounterBuffer" extension="Core">
+      <param name="pname">
+        <type>AtomicCounterBufferParameter</type>
+      </param>
+    </function>
+    
+    <function name="MemoryBarrier" extension="Core">
+      <param name="barriers">
+        <type>MemoryBarrierFlags</type>
+      </param>
+    </function>
+    
     <!-- Version 4.3 -->
 
     <function name="ClearBufferData" extension="Core">
@@ -873,6 +887,48 @@
         <type>PixelFormat</type>
       </param>
     </function>
+    
+    <function name="GetProgramInterfaceiv" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+      <param name="pname">
+        <type>ProgramInterfaceParameter</type>
+      </param>
+    </function>
+    
+    <function name="GetProgramResourceIndex" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+    </function>
+
+    <function name="GetProgramResourceName" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+    </function>
+    
+    <function name="GetProgramResourceiv" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+      <param name="props">
+        <type>ProgramProperty</type>
+      </param>
+    </function>
+    
+    <function name="GetProgramResourceLocation" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+    </function>
+    
+    <function name="GetProgramResourceLocationIndex" extension="Core">
+      <param name="programInterface">
+        <type>ProgramInterface</type>
+      </param>
+    </function>
 
     <!-- Arb -->
 
@@ -1036,7 +1092,7 @@
         <type>AssemblyProgramParameterArb</type>
       </param>
     </function>
-
+    
     <function name="TangentPointer" extension="Ext">
       <param name="type">
         <type>NormalPointerType</type>
@@ -1300,106 +1356,134 @@
       <use enum="VERSION_4_0" token="UNIFORM_NAME_LENGTH" />
     </enum>
     <enum name="ActiveUniformBlockParameter">
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_BINDING" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_DATA_SIZE" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_NAME_LENGTH" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_ACTIVE_UNIFORMS" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_BINDING" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_DATA_SIZE" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_NAME_LENGTH" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_ACTIVE_UNIFORMS" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" />
       <use enum="VERSION_4_0" token="UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER" />
       <use enum="VERSION_4_0" token="UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER" />
+      <use enum="VERSION_4_3" token="UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER" />
     </enum>
     <enum name="ActiveUniformParameter">
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_TYPE" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_SIZE" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_NAME_LENGTH" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_BLOCK_INDEX" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_OFFSET" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_ARRAY_STRIDE" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_MATRIX_STRIDE" />
-      <use enum="ARB_uniform_buffer_object" token="UNIFORM_IS_ROW_MAJOR" />
+      <use enum="VERSION_3_1" token="UNIFORM_TYPE" />
+      <use enum="VERSION_3_1" token="UNIFORM_SIZE" />
+      <use enum="VERSION_3_1" token="UNIFORM_NAME_LENGTH" />
+      <use enum="VERSION_3_1" token="UNIFORM_BLOCK_INDEX" />
+      <use enum="VERSION_3_1" token="UNIFORM_OFFSET" />
+      <use enum="VERSION_3_1" token="UNIFORM_ARRAY_STRIDE" />
+      <use enum="VERSION_3_1" token="UNIFORM_MATRIX_STRIDE" />
+      <use enum="VERSION_3_1" token="UNIFORM_IS_ROW_MAJOR" />
+      <use enum="VERSION_4_2" token="UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX" />
     </enum>
     <enum name="ActiveUniformType">
-      <use enum="DataType" token="FLOAT" />
-      <use enum="DataType" token="INT" />
-      <token name="BOOL" value="0x8B56" />
-      <token name="BOOL_VEC2" value="0x8B57" />
-      <token name="BOOL_VEC3" value="0x8B58" />
-      <token name="BOOL_VEC4" value="0x8B59" />
-      <token name="FLOAT_MAT2" value="0x8B5A" />
-      <token name="FLOAT_MAT2x3" value="0x8B65" />
-      <token name="FLOAT_MAT2x4" value="0x8B66" />
-      <token name="FLOAT_MAT3" value="0x8B5B" />
-      <token name="FLOAT_MAT3x2" value="0x8B67" />
-      <token name="FLOAT_MAT3x4" value="0x8B68" />
-      <token name="FLOAT_MAT4" value="0x8B5C" />
-      <token name="FLOAT_MAT4x2" value="0x8B69" />
-      <token name="FLOAT_MAT4x3" value="0x8B6A" />
-      <token name="FLOAT_VEC2" value="0x8B50" />
-      <token name="FLOAT_VEC3" value="0x8B51" />
-      <token name="FLOAT_VEC4" value="0x8B52" />
-      <token name="INT_SAMPLER_1D" value="0x8DC9" />
-      <token name="INT_SAMPLER_1D_ARRAY" value="0x8DCE" />
-      <token name="INT_SAMPLER_2D" value="0x8DCA" />
-      <token name="INT_SAMPLER_2D_ARRAY" value="0x8DCF" />
-      <token name="INT_SAMPLER_2D_MULTISAMPLE" value="0x9109" />
-      <token name="INT_SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910C" />
-      <token name="INT_SAMPLER_2D_RECT" value="0x8DCD" />
-      <token name="INT_SAMPLER_3D" value="0x8DCB" />
-      <token name="INT_SAMPLER_BUFFER" value="0x8DD0" />
-      <token name="INT_SAMPLER_CUBE" value="0x8DCC" />
-      <token name="INT_VEC2" value="0x8B53" />
-      <token name="INT_VEC3" value="0x8B54" />
-      <token name="INT_VEC4" value="0x8B55" />
-      <token name="SAMPLER_1D" value="0x8B5D" />
-      <token name="SAMPLER_1D_ARRAY" value="0x8DC0" />
-      <token name="SAMPLER_1D_ARRAY_SHADOW" value="0x8DC3" />
-      <token name="SAMPLER_1D_SHADOW" value="0x8B61" />
-      <token name="SAMPLER_2D" value="0x8B5E" />
-      <token name="SAMPLER_2D_ARRAY" value="0x8DC1" />
-      <token name="SAMPLER_2D_ARRAY_SHADOW" value="0x8DC4" />
-      <token name="SAMPLER_2D_MULTISAMPLE" value="0x9108" />
-      <token name="SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910B" />
-      <token name="SAMPLER_2D_RECT" value="0x8B63" />
-      <token name="SAMPLER_2D_RECT_SHADOW" value="0x8B64" />
-      <token name="SAMPLER_2D_SHADOW" value="0x8B62" />
-      <token name="SAMPLER_3D" value="0x8B5F" />
-      <token name="SAMPLER_BUFFER" value="0x8DC2" />
-      <token name="SAMPLER_CUBE" value="0x8B60" />
-      <token name="SAMPLER_CUBE_SHADOW" value="0x8DC5" />
-      <use enum="DataType" token="UNSIGNED_INT" />
-      <token name="UNSIGNED_INT_SAMPLER_1D" value="0x8DD1" />
-      <token name="UNSIGNED_INT_SAMPLER_1D_ARRAY" value="0x8DD6" />
-      <token name="UNSIGNED_INT_SAMPLER_2D" value="0x8DD2" />
-      <token name="UNSIGNED_INT_SAMPLER_2D_ARRAY" value="0x8DD7" />
-      <token name="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE" value="0x910A" />
-      <token name="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910D" />
-      <token name="UNSIGNED_INT_SAMPLER_2D_RECT" value="0x8DD5" />
-      <token name="UNSIGNED_INT_SAMPLER_3D" value="0x8DD3" />
-      <token name="UNSIGNED_INT_SAMPLER_BUFFER" value="0x8DD8" />
-      <token name="UNSIGNED_INT_SAMPLER_CUBE" value="0x8DD4" />
-      <token name="UNSIGNED_INT_VEC2" value="0x8DC6" />
-      <token name="UNSIGNED_INT_VEC3" value="0x8DC7" />
-      <token name="UNSIGNED_INT_VEC4" value="0x8DC8" />
-      <use enum="VERSION_4_0" token="DOUBLE" />
+      <use enum="VERSION_1_1" token="FLOAT" />
+      <use enum="VERSION_2_0" token="FLOAT_VEC2" />
+      <use enum="VERSION_2_0" token="FLOAT_VEC3" />
+      <use enum="VERSION_2_0" token="FLOAT_VEC4" />
+      <use enum="VERSION_1_1" token="DOUBLE" />
       <use enum="VERSION_4_0" token="DOUBLE_VEC2" />
       <use enum="VERSION_4_0" token="DOUBLE_VEC3" />
       <use enum="VERSION_4_0" token="DOUBLE_VEC4" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT2" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT3" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT4" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT2x3" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT2x4" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT3x2" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT3x4" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT4x2" />
-      <use enum="VERSION_4_0" token="DOUBLE_MAT4x3" />
+      <use enum="VERSION_1_1" token="INT" />
+      <use enum="VERSION_2_0" token="INT_VEC2" />
+      <use enum="VERSION_2_0" token="INT_VEC3" />
+      <use enum="VERSION_2_0" token="INT_VEC4" />
+      <use enum="VERSION_1_1" token="UNSIGNED_INT" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_VEC2" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_VEC3" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_VEC4" />
+      <use enum="VERSION_1_1" token="BOOL" />
+      <use enum="VERSION_2_0" token="BOOL_VEC2" />
+      <use enum="VERSION_2_0" token="BOOL_VEC3" />
+      <use enum="VERSION_2_0" token="BOOL_VEC4" />
+      <use enum="VERSION_2_0" token="FLOAT_MAT2" />
+      <use enum="VERSION_2_0" token="FLOAT_MAT3" />
+      <use enum="VERSION_2_0" token="FLOAT_MAT4" />
+      <use enum="VERSION_2_1" token="FLOAT_MAT2x3" />
+      <use enum="VERSION_2_1" token="FLOAT_MAT2x4" />
+      <use enum="VERSION_2_1" token="FLOAT_MAT3x4" />
+      <use enum="VERSION_2_1" token="FLOAT_MAT4x2" />
+      <use enum="VERSION_2_1" token="FLOAT_MAT4x3" />
+      <use enum="VERSION_2_0" token="SAMPLER_1D" />
+      <use enum="VERSION_2_0" token="SAMPLER_2D" />
+      <use enum="VERSION_2_0" token="SAMPLER_3D" />
+      <use enum="VERSION_2_0" token="SAMPLER_CUBE" />
+      <use enum="VERSION_2_0" token="SAMPLER_1D_SHADOW" />
+      <use enum="VERSION_2_0" token="SAMPLER_2D_SHADOW" />
+      <use enum="VERSION_3_0" token="SAMPLER_1D_ARRAY" />
+      <use enum="VERSION_3_0" token="SAMPLER_2D_ARRAY" />
       <use enum="VERSION_4_0" token="SAMPLER_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_3_0" token="SAMPLER_1D_ARRAY_SHADOW" />
+      <use enum="VERSION_3_0" token="SAMPLER_2D_ARRAY_SHADOW" />
+      <use enum="VERSION_3_2" token="SAMPLER_2D_MULTISAMPLE" />
+      <use enum="VERSION_3_2" token="SAMPLER_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_3_0" token="SAMPLER_CUBE_SHADOW" />
       <use enum="VERSION_4_0" token="SAMPLER_CUBE_MAP_ARRAY_SHADOW" />
+      <use enum="VERSION_3_1" token="SAMPLER_BUFFER" />
+      <use enum="VERSION_3_1" token="SAMPLER_2D_RECT" />
+      <use enum="VERSION_3_1" token="SAMPLER_2D_RECT_SHADOW" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_1D" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_2D" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_3D" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_CUBE" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_1D_ARRAY" />
+      <use enum="VERSION_3_0" token="INT_SAMPLER_2D_ARRAY" />
       <use enum="VERSION_4_0" token="INT_SAMPLER_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_3_2" token="INT_SAMPLER_2D_MULTISAMPLE" />
+      <use enum="VERSION_3_2" token="INT_SAMPLER_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_3_1" token="INT_SAMPLER_BUFFER" />
+      <use enum="VERSION_3_1" token="INT_SAMPLER_2D_RECT" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_1D" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_2D" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_3D" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_CUBE" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_1D_ARRAY" />
+      <use enum="VERSION_3_0" token="UNSIGNED_INT_SAMPLER_2D_ARRAY" />
       <use enum="VERSION_4_0" token="UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_3_2" token="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE" />
+      <use enum="VERSION_3_2" token="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_3_1" token="UNSIGNED_INT_SAMPLER_BUFFER" />
+      <use enum="VERSION_3_1" token="UNSIGNED_INT_SAMPLER_2D_RECT" />
+      <use enum="VERSION_4_2" token="IMAGE_1D" />
+      <use enum="VERSION_4_2" token="IMAGE_2D" />
+      <use enum="VERSION_4_2" token="IMAGE_3D" />
+      <use enum="VERSION_4_2" token="IMAGE_2D_RECT" />
+      <use enum="VERSION_4_2" token="IMAGE_CUBE" />
+      <use enum="VERSION_4_2" token="IMAGE_BUFFER" />
+      <use enum="VERSION_4_2" token="IMAGE_1D_ARRAY" />
+      <use enum="VERSION_4_2" token="IMAGE_2D_ARRAY" />
+      <use enum="VERSION_4_2" token="IMAGE_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_4_2" token="IMAGE_2D_MULTISAMPLE" />
+      <use enum="VERSION_4_2" token="IMAGE_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_1D" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_2D" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_3D" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_2D_RECT" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_CUBE" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_BUFFER" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_1D_ARRAY" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_2D_ARRAY" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_2D_MULTISAMPLE" />
+      <use enum="VERSION_4_2" token="INT_IMAGE_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_1D" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_2D" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_3D" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_2D_RECT" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_CUBE" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_BUFFER" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_1D_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_2D_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_2D_MULTISAMPLE" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY" />
+      <use enum="VERSION_4_2" token="UNSIGNED_INT_ATOMIC_COUNTER" />
     </enum>
     <enum name="ArrayCap">
       <use enum="GetPName" token="VERTEX_ARRAY" />
@@ -1467,6 +1551,18 @@
       <token name="FRAGMENT_PROGRAM" value="0x8804" />
       <token name="VERTEX_PROGRAM" value="0x8620" />
     </enum>
+    <enum name="AtomicCounterBufferParameter">
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_BINDING" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_DATA_SIZE" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER" />
+      <use enum="VERSION_4_3" token="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER" />
+    </enum>
     <enum name="AttribMask">
       <token name="MULTISAMPLE_BIT" value="0x20000000" />
     </enum>
@@ -2286,6 +2382,24 @@
       <token name="MATRIX8" value="0x88C8" />
       <token name="MATRIX9" value="0x88C9" />
     </enum>
+    <enum name="MemoryBarrierFlags">
+      <use enum="VERSION_4_2" token="ALL_BARRIER_BITS" />
+      <use enum="VERSION_4_2" token="VERTEX_ATTRIB_ARRAY_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="ELEMENT_ARRAY_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="UNIFORM_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="TEXTURE_FETCH_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="BUFFER_UPDATE_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="SHADER_IMAGE_ACCESS_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="COMMAND_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="PIXEL_BUFFER_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="TEXTURE_UPDATE_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="FRAMEBUFFER_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="TRANSFORM_FEEDBACK_BARRIER_BIT" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BARRIER_BIT" />
+      <use enum="VERSION_4_3" token="SHADER_STORAGE_BARRIER_BIT" />
+      <use enum="VERSION_4_4" token="CLIENT_MAPPED_BUFFER_BARRIER_BIT" />
+      <use enum="VERSION_4_4" token="QUERY_BUFFER_BARRIER_BIT" />
+    </enum>
     <enum name="MinmaxTarget">
       <token name="MINMAX" value="0x802E" />
     </enum>
@@ -2468,25 +2582,54 @@
       <token name="LOWER_LEFT" value="0x8CA1" />
       <token name="UPPER_LEFT" value="0x8CA2" />
     </enum>
+    <enum name="ProgramInterface">
+      <use enum="VERSION_3_0" token="TRANSFORM_FEEDBACK_BUFFER" />
+      <use enum="VERSION_4_2" token="ATOMIC_COUNTER_BUFFER" />
+      <use enum="VERSION_4_3" token="BUFFER_VARIABLE" />
+      <use enum="VERSION_4_3" token="UNIFORM" />
+      <use enum="VERSION_4_3" token="UNIFORM_BLOCK" />
+      <use enum="VERSION_4_3" token="PROGRAM_INPUT" />
+      <use enum="VERSION_4_3" token="PROGRAM_OUTPUT" />
+      <use enum="VERSION_4_3" token="SHADER_STORAGE_BLOCK" />
+      <use enum="VERSION_4_3" token="GEOMETRY_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="VERTEX_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="TESS_CONTROL_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="TESS_EVALUATION_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="FRAGMENT_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="COMPUTE_SUBROUTINE" />
+      <use enum="VERSION_4_3" token="TESS_CONTROL_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="TESS_EVALUATION_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="GEOMETRY_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="VERTEX_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="FRAGMENT_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="COMPUTE_SUBROUTINE_UNIFORM" />
+      <use enum="VERSION_4_3" token="TRANSFORM_FEEDBACK_VARYING" />
+    </enum>
+    <enum name="ProgramInterfaceParameter">
+      <use enum="VERSION_4_3" token="ACTIVE_RESOURCES" />
+      <use enum="VERSION_4_3" token="MAX_NAME_LENGTH" />
+      <use enum="VERSION_4_3" token="MAX_NUM_ACTIVE_VARIABLES" />
+      <use enum="VERSION_4_3" token="MAX_NUM_COMPATIBLE_SUBROUTINES" />
+    </enum>
     <enum name="ProgramParameter">
-      <use enum="ARB_uniform_buffer_object" token="ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" />
-      <use enum="ARB_uniform_buffer_object" token="ACTIVE_UNIFORM_BLOCKS" />
-      <token name="ACTIVE_ATTRIBUTE_MAX_LENGTH" value="0x8B8A" />
-      <token name="ACTIVE_ATTRIBUTES" value="0x8B89" />
-      <token name="ACTIVE_UNIFORM_MAX_LENGTH" value="0x8B87" />
-      <token name="ACTIVE_UNIFORMS" value="0x8B86" />
-      <token name="ATTACHED_SHADERS" value="0x8B85" />
-      <token name="DELETE_STATUS" value="0x8B80" />
-      <token name="GEOMETRY_INPUT_TYPE" value="0x8DDB" />
-      <token name="GEOMETRY_OUTPUT_TYPE" value="0x8DDC" />
-      <token name="GEOMETRY_VERTICES_OUT" value="0x8DDA" />
-      <token name="INFO_LOG_LENGTH" value="0x8B84" />
-      <token name="LINK_STATUS" value="0x8B82" />
-      <token name="TRANSFORM_FEEDBACK_BUFFER_MODE" value="0x8C7F" />
-      <token name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH" value="0x8C76" />
-      <token name="TRANSFORM_FEEDBACK_VARYINGS" value="0x8C83" />
-      <token name="VALIDATE_STATUS" value="0x8B83" />
-      <use enum="VERSION_4_0" token="GEOMETRY_SHADER_INVOCATIONS" />
+      <use enum="VERSION_2_0" token="DELETE_STATUS" />
+      <use enum="VERSION_2_0" token="LINK_STATUS" />
+      <use enum="VERSION_2_0" token="VALIDATE_STATUS" />
+      <use enum="VERSION_2_0" token="INFO_LOG_LENGTH" />
+      <use enum="VERSION_2_0" token="ATTACHED_SHADERS" />
+      <use enum="VERSION_2_0" token="ACTIVE_ATTRIBUTES" />
+      <use enum="VERSION_2_0" token="ACTIVE_ATTRIBUTE_MAX_LENGTH" />
+      <use enum="VERSION_2_0" token="ACTIVE_UNIFORMS" />
+      <use enum="VERSION_2_0" token="ACTIVE_UNIFORM_MAX_LENGTH" />
+      <use enum="VERSION_3_0" token="TRANSFORM_FEEDBACK_BUFFER_MODE" />
+      <use enum="VERSION_3_0" token="TRANSFORM_FEEDBACK_VARYINGS" />
+      <use enum="VERSION_3_0" token="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH" />
+      <use enum="VERSION_3_1" token="ACTIVE_UNIFORM_BLOCKS" />
+      <use enum="VERSION_3_1" token="ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" />
+      <use enum="VERSION_3_2" token="GEOMETRY_VERTICES_OUT" />
+      <use enum="VERSION_3_2" token="GEOMETRY_INPUT_TYPE" />
+      <use enum="VERSION_3_2" token="GEOMETRY_OUTPUT_TYPE" />
+      <use enum="VERSION_3_2" token="GEOMETRY_SHADER_INVOCATIONS" />
       <use enum="VERSION_4_0" token="TESS_CONTROL_OUTPUT_VERTICES" />
       <use enum="VERSION_4_0" token="TESS_GEN_MODE" />
       <use enum="VERSION_4_0" token="TESS_GEN_SPACING" />
@@ -2494,18 +2637,62 @@
       <use enum="VERSION_4_0" token="TESS_GEN_POINT_MODE" />
       <use enum="VERSION_4_1" token="PROGRAM_SEPARABLE" />
       <use enum="VERSION_4_1" token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
-      <use enum="VERSION_4_1" token="PROGRAM_BINARY_LENGTH" />
+      <use enum="VERSION_4_2" token="ACTIVE_ATOMIC_COUNTER_BUFFERS" />
+      <use enum="VERSION_4_3" token="MAX_COMPUTE_WORK_GROUP_SIZE" />
+    </enum>
+    <enum name="ProgramParameterPName">
+      <use enum="VERSION_4_1" token="PROGRAM_SEPARABLE" />
+      <use enum="VERSION_4_1" token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
     </enum>
     <enum name="ProgramPipelineParameter">
       <use enum="VERSION_4_1" token="ACTIVE_PROGRAM" />
+      <use enum="VERSION_2_0" token="VALIDATE_STATUS" />
+      <use enum="VERSION_2_0" token="VERTEX_SHADER" />
+      <use enum="VERSION_2_0" token="FRAGMENT_SHADER" />
+      <use enum="VERSION_3_2" token="GEOMETRY_SHADER" />
+      <use enum="VERSION_4_2" token="TESS_CONTROL_SHADER" />
+      <use enum="VERSION_4_2" token="TESS_EVALUATION_SHADER" />
+      <use enum="VERSION_2_0" token="INFO_LOG_LENGTH" />
+      <use enum="VERSION_4_3" token="COMPUTE_SHADER" />
+    </enum>
+    <enum name="ProgramProperty">
+      <use enum="VERSION_4_3" token="ACTIVE_VARIABLES" />
+      <use enum="VERSION_4_3" token="BUFFER_BINDING" />
+      <use enum="VERSION_4_3" token="NUM_ACTIVE_VARIABLES" />
+      <use enum="VERSION_4_3" token="ARRAY_SIZE" />
+      <use enum="VERSION_4_3" token="ARRAY_STRIDE" />
+      <use enum="VERSION_4_3" token="BLOCK_INDEX" />
+      <use enum="VERSION_4_3" token="IS_ROW_MAJOR" />
+      <use enum="VERSION_4_3" token="MATRIX_STRIDE" />
+      <use enum="VERSION_4_3" token="ATOMIC_COUNTER_BUFFER_INDEX" />
+      <use enum="VERSION_4_3" token="BUFFER_DATA_SIZE" />
+      <use enum="VERSION_4_3" token="NUM_COMPATIBLE_SUBROUTINES" />
+      <use enum="VERSION_4_3" token="COMPATIBLE_SUBROUTINES" />
+      <use enum="VERSION_4_3" token="IS_PER_PATCH" />
+      <use enum="VERSION_4_3" token="LOCATION" />
+      <use enum="VERSION_4_4" token="LOCATION_COMPONENT" />
+      <use enum="VERSION_4_3" token="LOCATION_INDEX" />
+      <use enum="VERSION_4_3" token="NAME_LENGTH" />
+      <use enum="VERSION_4_3" token="OFFSET" />
+      <use enum="VERSION_4_3" token="REFERENCED_BY_VERTEX_SHADER" />
+      <use enum="VERSION_4_3" token="REFERENCED_BY_TESS_CONTROL_SHADER" />
+      <use enum="VERSION_4_3" token="REFERENCED_BY_TESS_EVALUATION_SHADER" />
+      <use enum="VERSION_4_3" token="REFERENCED_BY_GEOMETRY_SHADER" />
+      <use enum="VERSION_4_3" token="REFERENCED_BY_FRAGMENT_SHADER" />
+      <use enum="VERSION_4_4" token="TRANSFORM_FEEDBACK_BUFFER_INDEX" />
+      <use enum="VERSION_4_4" token="TRANSFORM_FEEDBACK_BUFFER_STRIDE" />
+      <use enum="VERSION_4_3" token="TOP_LEVEL_ARRAY_SIZE" />
+      <use enum="VERSION_4_3" token="TOP_LEVEL_ARRAY_STRIDE" />
+      <use enum="VERSION_4_3" token="TYPE" />
     </enum>
     <enum name="ProgramStageMask">
+      <use enum="VERSION_4_1" token="ALL_SHADER_BITS" />
       <use enum="VERSION_4_1" token="VERTEX_SHADER_BIT" />
       <use enum="VERSION_4_1" token="FRAGMENT_SHADER_BIT" />
       <use enum="VERSION_4_1" token="GEOMETRY_SHADER_BIT" />
       <use enum="VERSION_4_1" token="TESS_CONTROL_SHADER_BIT" />
       <use enum="VERSION_4_1" token="TESS_EVALUATION_SHADER_BIT" />
-      <use enum="VERSION_4_1" token="ALL_SHADER_BITS" />
+      <use enum="VERSION_4_4" token="COMPUTE_SHADER_BIT" />
     </enum>
     <enum name="ProgramStageParameter">
       <use enum="VERSION_4_0" token="ACTIVE_SUBROUTINES" />
@@ -2684,12 +2871,14 @@
       <use enum="VERSION_4_1" token="HIGH_INT" />
     </enum>
     <enum name="ShaderType">
-      <token name="FRAGMENT_SHADER" value="0x8B30" />
-      <token name="GEOMETRY_SHADER" value="0x8DD9" />
-      <token name="GEOMETRY_SHADER_EXT" value="0x8DD9" />
-      <token name="VERTEX_SHADER" value="0x8B31" />
+      <use enum="VERSION_2_0" token="FRAGMENT_SHADER" />
+      <use enum="VERSION_2_0" token="VERTEX_SHADER" />
+      <use enum="VERSION_3_2" token="GEOMETRY_SHADER" />
+      <use enum="EXT_geometry_shader4" token="GEOMETRY_SHADER_EXT" /> <!-- for back compat -->
       <use enum="VERSION_4_0" token="TESS_EVALUATION_SHADER" />
-      <use enum="VERSION_4_0" token="TESS_CONTROL_SHADER" />    </enum>
+      <use enum="VERSION_4_0" token="TESS_CONTROL_SHADER" />
+      <use enum="VERSION_4_3" token="COMPUTE_SHADER" />
+    </enum>
     <enum name="SizedInternalFormat">
       <use enum="PixelInternalFormat" token="R8" />
       <use enum="PixelInternalFormat" token="R16" />
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 66e7ffeb..9874cf89 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -52872,7 +52872,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.2 and ARB_shader_atomic_counters]</summary>
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32[] @params)
+        void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52882,7 +52882,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -52893,7 +52893,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.2 and ARB_shader_atomic_counters]</summary>
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] out Int32 @params)
+        void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52903,7 +52903,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -52916,13 +52916,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        unsafe void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveAtomicCounterBuffer(Int32 program, Int32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params);
+            Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -52932,7 +52932,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32[] @params)
+        void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52942,7 +52942,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -52954,7 +52954,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] out Int32 @params)
+        void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52964,7 +52964,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -52977,13 +52977,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_shader_atomic_counters", Version = "4.2", EntryPoint = "glGetActiveAtomicCounterBufferiv")]
         public static 
-        unsafe void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveAtomicCounterBuffer(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters)pname, (Int32*)@params);
+            Delegates.glGetActiveAtomicCounterBufferiv((UInt32)program, (UInt32)bufferIndex, (OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -63183,7 +63183,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32[] @params)
+        void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63193,7 +63193,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -63204,7 +63204,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] out Int32 @params)
+        void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63214,7 +63214,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -63227,13 +63227,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        unsafe void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgramInterface(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params);
+            Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -63243,7 +63243,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32[] @params)
+        void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63253,7 +63253,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -63265,7 +63265,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] out Int32 @params)
+        void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63275,7 +63275,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -63288,13 +63288,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramInterfaceiv")]
         public static 
-        unsafe void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgramInterface(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)pname, (Int32*)@params);
+            Delegates.glGetProgramInterfaceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (OpenTK.Graphics.OpenGL.ProgramInterfaceParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -63928,13 +63928,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceIndex")]
         public static 
-        Int32 GetProgramResourceIndex(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceIndex(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -63944,13 +63944,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceIndex")]
         public static 
-        Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -63959,7 +63959,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery[] props, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] @params)
+        void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty[] props, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63967,11 +63967,11 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props_ptr = props)
+                fixed (OpenTK.Graphics.OpenGL.ProgramProperty* props_ptr = props)
                 fixed (Int32* length_ptr = length)
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
+                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -63982,7 +63982,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 propCount, ref OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery props, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 @params)
+        void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, ref OpenTK.Graphics.OpenGL.ProgramProperty props, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -63990,11 +63990,11 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props_ptr = &props)
+                fixed (OpenTK.Graphics.OpenGL.ProgramProperty* props_ptr = &props)
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
+                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
                     length = *length_ptr;
                     @params = *@params_ptr;
                 }
@@ -64008,13 +64008,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params)
+        unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props, (Int32)bufSize, (Int32*)length, (Int32*)@params);
+            Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props, (Int32)bufSize, (Int32*)length, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -64024,7 +64024,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery[] props, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] @params)
+        void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty[] props, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64032,11 +64032,11 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props_ptr = props)
+                fixed (OpenTK.Graphics.OpenGL.ProgramProperty* props_ptr = props)
                 fixed (Int32* length_ptr = length)
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
+                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -64048,7 +64048,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 propCount, ref OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery props, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 @params)
+        void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, ref OpenTK.Graphics.OpenGL.ProgramProperty props, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64056,11 +64056,11 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props_ptr = &props)
+                fixed (OpenTK.Graphics.OpenGL.ProgramProperty* props_ptr = &props)
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
+                    Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props_ptr, (Int32)bufSize, (Int32*)length_ptr, (Int32*)@params_ptr);
                     length = *length_ptr;
                     @params = *@params_ptr;
                 }
@@ -64074,13 +64074,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceiv")]
         public static 
-        unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params)
+        unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery*)props, (Int32)bufSize, (Int32*)length, (Int32*)@params);
+            Delegates.glGetProgramResourceiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)propCount, (OpenTK.Graphics.OpenGL.ProgramProperty*)props, (Int32)bufSize, (Int32*)length, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -64089,13 +64089,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceLocation")]
         public static 
-        Int32 GetProgramResourceLocation(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceLocation(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceLocation((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceLocation((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -64105,13 +64105,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceLocation")]
         public static 
-        Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceLocation((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceLocation((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -64120,13 +64120,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceLocationIndex")]
         public static 
-        Int32 GetProgramResourceLocationIndex(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceLocationIndex(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceLocationIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceLocationIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -64136,13 +64136,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceLocationIndex")]
         public static 
-        Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name)
+        Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetProgramResourceLocationIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (String)name);
+            return Delegates.glGetProgramResourceLocationIndex((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (String)name);
             #if DEBUG
             }
             #endif
@@ -64151,7 +64151,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder name)
+        void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64161,7 +64161,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
+                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
                 }
             }
             #if DEBUG
@@ -64172,7 +64172,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_program_interface_query]</summary>
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder name)
+        void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64182,7 +64182,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
+                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
                     length = *length_ptr;
                 }
             }
@@ -64195,13 +64195,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        unsafe void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name)
+        unsafe void GetProgramResourceName(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length, (StringBuilder)name);
+            Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -64211,7 +64211,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder name)
+        void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64221,7 +64221,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
+                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
                 }
             }
             #if DEBUG
@@ -64233,7 +64233,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder name)
+        void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -64243,7 +64243,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
+                    Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)name);
                     length = *length_ptr;
                 }
             }
@@ -64256,13 +64256,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_program_interface_query", Version = "4.3", EntryPoint = "glGetProgramResourceName")]
         public static 
-        unsafe void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name)
+        unsafe void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length, (StringBuilder)name);
+            Delegates.glGetProgramResourceName((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramInterface)programInterface, (UInt32)index, (Int32)bufSize, (Int32*)length, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -76155,29 +76155,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.2 and ARB_shader_image_load_store]</summary>
         [AutoGenerated(Category = "ARB_shader_image_load_store", Version = "4.2", EntryPoint = "glMemoryBarrier")]
         public static 
-        void MemoryBarrier(Int32 barriers)
+        void MemoryBarrier(OpenTK.Graphics.OpenGL.MemoryBarrierFlags barriers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMemoryBarrier((UInt32)barriers);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        /// <summary>[requires: v4.2 and ARB_shader_image_load_store]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ARB_shader_image_load_store", Version = "4.2", EntryPoint = "glMemoryBarrier")]
-        public static 
-        void MemoryBarrier(UInt32 barriers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMemoryBarrier((UInt32)barriers);
+            Delegates.glMemoryBarrier((OpenTK.Graphics.OpenGL.MemoryBarrierFlags)barriers);
             #if DEBUG
             }
             #endif
@@ -83961,13 +83945,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_get_program_binary", Version = "3.0", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value)
+        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterPName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -83995,13 +83979,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_get_program_binary", Version = "3.0", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value)
+        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterPName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -132319,7 +132303,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <summary>[requires: EXT_direct_state_access]</summary>
             [AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] out Int32 @params)
+            void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -132329,7 +132313,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params_ptr);
+                        Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ProgramProperty)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -132342,13 +132326,13 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            unsafe void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ProgramProperty)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -132358,7 +132342,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] out Int32 @params)
+            void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -132368,7 +132352,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params_ptr);
+                        Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ProgramProperty)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -132381,13 +132365,13 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            unsafe void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ProgramProperty)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index 4f0b05a6..75621bb1 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -1841,7 +1841,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static Int32 GenVertexShadersEXT(UInt32 range);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetActiveAtomicCounterBufferiv", ExactSpelling = true)]
-            internal extern static unsafe void GetActiveAtomicCounterBufferiv(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetActiveAtomicCounterBufferiv(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetActiveAttrib", ExactSpelling = true)]
             internal extern static unsafe void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name);
@@ -2312,7 +2312,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetNamedFramebufferParameterivEXT(UInt32 framebuffer, OpenTK.Graphics.OpenGL.ArbFramebufferNoAttachments pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetNamedProgramivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetNamedProgramivEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetNamedProgramivEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetNamedProgramLocalParameterdvEXT", ExactSpelling = true)]
             internal extern static unsafe void GetNamedProgramLocalParameterdvEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* @params);
@@ -2531,7 +2531,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramInterfaceiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
             internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params);
@@ -2573,19 +2573,19 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetProgramPipelineiv(UInt32 pipeline, OpenTK.Graphics.OpenGL.ProgramPipelineParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramResourceIndex", ExactSpelling = true)]
-            internal extern static Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal extern static Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramResourceiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramResourceiv(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramResourceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramResourceLocation", ExactSpelling = true)]
-            internal extern static Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal extern static Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramResourceLocationIndex", ExactSpelling = true)]
-            internal extern static Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal extern static Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramResourceName", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name);
+            internal extern static unsafe void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramStageiv", ExactSpelling = true)]
             internal extern static unsafe void GetProgramStageiv(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ProgramStageParameter pname, [OutAttribute] Int32* values);
@@ -3524,7 +3524,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void MatrixTranslatefEXT(OpenTK.Graphics.OpenGL.MatrixMode mode, Single x, Single y, Single z);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMemoryBarrier", ExactSpelling = true)]
-            internal extern static void MemoryBarrier(UInt32 barriers);
+            internal extern static void MemoryBarrier(OpenTK.Graphics.OpenGL.MemoryBarrierFlags barriers);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMemoryBarrierEXT", ExactSpelling = true)]
             internal extern static void MemoryBarrierEXT(UInt32 barriers);
@@ -4532,7 +4532,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void ProgramParameter4fvNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single* v);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteri", ExactSpelling = true)]
-            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
+            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteriARB", ExactSpelling = true)]
             internal extern static void ProgramParameteriARB(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index e846840c..c69e12a8 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -1839,7 +1839,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate Int32 GenVertexShadersEXT(UInt32 range);
             internal static GenVertexShadersEXT glGenVertexShadersEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetActiveAtomicCounterBufferiv(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.ArbShaderAtomicCounters pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetActiveAtomicCounterBufferiv(UInt32 program, UInt32 bufferIndex, OpenTK.Graphics.OpenGL.AtomicCounterBufferParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetActiveAtomicCounterBufferiv glGetActiveAtomicCounterBufferiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name);
@@ -2310,7 +2310,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetNamedFramebufferParameterivEXT(UInt32 framebuffer, OpenTK.Graphics.OpenGL.ArbFramebufferNoAttachments pname, [OutAttribute] Int32* @params);
             internal unsafe static GetNamedFramebufferParameterivEXT glGetNamedFramebufferParameterivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetNamedProgramivEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetNamedProgramivEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ProgramProperty pname, [OutAttribute] Int32* @params);
             internal unsafe static GetNamedProgramivEXT glGetNamedProgramivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetNamedProgramLocalParameterdvEXT(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* @params);
@@ -2529,7 +2529,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             internal unsafe static GetProgramInfoLog glGetProgramInfoLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramInterfaceiv glGetProgramInterfaceiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params);
@@ -2571,19 +2571,19 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetProgramPipelineiv(UInt32 pipeline, OpenTK.Graphics.OpenGL.ProgramPipelineParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramPipelineiv glGetProgramPipelineiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal delegate Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             internal static GetProgramResourceIndex glGetProgramResourceIndex;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramResourceiv(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramResourceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramResourceiv glGetProgramResourceiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal delegate Int32 GetProgramResourceLocation(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             internal static GetProgramResourceLocation glGetProgramResourceLocation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, String name);
+            internal delegate Int32 GetProgramResourceLocationIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, String name);
             internal static GetProgramResourceLocationIndex glGetProgramResourceLocationIndex;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ArbProgramInterfaceQuery programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name);
+            internal unsafe delegate void GetProgramResourceName(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder name);
             internal unsafe static GetProgramResourceName glGetProgramResourceName;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramStageiv(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ProgramStageParameter pname, [OutAttribute] Int32* values);
@@ -3522,7 +3522,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void MatrixTranslatefEXT(OpenTK.Graphics.OpenGL.MatrixMode mode, Single x, Single y, Single z);
             internal static MatrixTranslatefEXT glMatrixTranslatefEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void MemoryBarrier(UInt32 barriers);
+            internal delegate void MemoryBarrier(OpenTK.Graphics.OpenGL.MemoryBarrierFlags barriers);
             internal static MemoryBarrier glMemoryBarrier;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void MemoryBarrierEXT(UInt32 barriers);
@@ -4530,7 +4530,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void ProgramParameter4fvNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single* v);
             internal unsafe static ProgramParameter4fvNV glProgramParameter4fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
+            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value);
             internal static ProgramParameteri glProgramParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramParameteriARB(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index a1625895..a26821c7 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -243,6 +243,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46
         /// </summary>
         UniformBlockReferencedByFragmentShader = ((int)0x8A46)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC
+        /// </summary>
+        UniformBlockReferencedByComputeShader = ((int)0x90EC)        ,
     }
 
     /// <summary>
@@ -282,6 +286,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E
         /// </summary>
         UniformIsRowMajor = ((int)0x8A3E)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA
+        /// </summary>
+        UniformAtomicCounterBufferIndex = ((int)0x92DA)        ,
     }
 
     /// <summary>
@@ -398,10 +406,6 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         FloatMat2x4 = ((int)0x8B66)        ,
         /// <summary>
-        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
-        /// </summary>
-        FloatMat3x2 = ((int)0x8B67)        ,
-        /// <summary>
         /// Original was GL_FLOAT_MAT3x4 = 0x8B68
         /// </summary>
         FloatMat3x4 = ((int)0x8B68)        ,
@@ -514,42 +518,6 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         UnsignedIntSamplerBuffer = ((int)0x8DD8)        ,
         /// <summary>
-        /// Original was GL_DOUBLE_MAT2 = 0x8F46
-        /// </summary>
-        DoubleMat2 = ((int)0x8F46)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT3 = 0x8F47
-        /// </summary>
-        DoubleMat3 = ((int)0x8F47)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT4 = 0x8F48
-        /// </summary>
-        DoubleMat4 = ((int)0x8F48)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT2x3 = 0x8F49
-        /// </summary>
-        DoubleMat2x3 = ((int)0x8F49)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT2x4 = 0x8F4A
-        /// </summary>
-        DoubleMat2x4 = ((int)0x8F4A)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT3x2 = 0x8F4B
-        /// </summary>
-        DoubleMat3x2 = ((int)0x8F4B)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT3x4 = 0x8F4C
-        /// </summary>
-        DoubleMat3x4 = ((int)0x8F4C)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT4x2 = 0x8F4D
-        /// </summary>
-        DoubleMat4x2 = ((int)0x8F4D)        ,
-        /// <summary>
-        /// Original was GL_DOUBLE_MAT4x3 = 0x8F4E
-        /// </summary>
-        DoubleMat4x3 = ((int)0x8F4E)        ,
-        /// <summary>
         /// Original was GL_DOUBLE_VEC2 = 0x8FFC
         /// </summary>
         DoubleVec2 = ((int)0x8FFC)        ,
@@ -578,6 +546,138 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         UnsignedIntSamplerCubeMapArray = ((int)0x900F)        ,
         /// <summary>
+        /// Original was GL_IMAGE_1D = 0x904C
+        /// </summary>
+        Image1D = ((int)0x904C)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_2D = 0x904D
+        /// </summary>
+        Image2D = ((int)0x904D)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_3D = 0x904E
+        /// </summary>
+        Image3D = ((int)0x904E)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_2D_RECT = 0x904F
+        /// </summary>
+        Image2DRect = ((int)0x904F)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_CUBE = 0x9050
+        /// </summary>
+        ImageCube = ((int)0x9050)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_BUFFER = 0x9051
+        /// </summary>
+        ImageBuffer = ((int)0x9051)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_1D_ARRAY = 0x9052
+        /// </summary>
+        Image1DArray = ((int)0x9052)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_2D_ARRAY = 0x9053
+        /// </summary>
+        Image2DArray = ((int)0x9053)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_CUBE_MAP_ARRAY = 0x9054
+        /// </summary>
+        ImageCubeMapArray = ((int)0x9054)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_2D_MULTISAMPLE = 0x9055
+        /// </summary>
+        Image2DMultisample = ((int)0x9055)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056
+        /// </summary>
+        Image2DMultisampleArray = ((int)0x9056)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_1D = 0x9057
+        /// </summary>
+        IntImage1D = ((int)0x9057)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_2D = 0x9058
+        /// </summary>
+        IntImage2D = ((int)0x9058)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_3D = 0x9059
+        /// </summary>
+        IntImage3D = ((int)0x9059)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_2D_RECT = 0x905A
+        /// </summary>
+        IntImage2DRect = ((int)0x905A)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_CUBE = 0x905B
+        /// </summary>
+        IntImageCube = ((int)0x905B)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_BUFFER = 0x905C
+        /// </summary>
+        IntImageBuffer = ((int)0x905C)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_1D_ARRAY = 0x905D
+        /// </summary>
+        IntImage1DArray = ((int)0x905D)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_2D_ARRAY = 0x905E
+        /// </summary>
+        IntImage2DArray = ((int)0x905E)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_CUBE_MAP_ARRAY = 0x905F
+        /// </summary>
+        IntImageCubeMapArray = ((int)0x905F)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_2D_MULTISAMPLE = 0x9060
+        /// </summary>
+        IntImage2DMultisample = ((int)0x9060)        ,
+        /// <summary>
+        /// Original was GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061
+        /// </summary>
+        IntImage2DMultisampleArray = ((int)0x9061)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_1D = 0x9062
+        /// </summary>
+        UnsignedIntImage1D = ((int)0x9062)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_2D = 0x9063
+        /// </summary>
+        UnsignedIntImage2D = ((int)0x9063)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_3D = 0x9064
+        /// </summary>
+        UnsignedIntImage3D = ((int)0x9064)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_2D_RECT = 0x9065
+        /// </summary>
+        UnsignedIntImage2DRect = ((int)0x9065)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_CUBE = 0x9066
+        /// </summary>
+        UnsignedIntImageCube = ((int)0x9066)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_BUFFER = 0x9067
+        /// </summary>
+        UnsignedIntImageBuffer = ((int)0x9067)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068
+        /// </summary>
+        UnsignedIntImage1DArray = ((int)0x9068)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069
+        /// </summary>
+        UnsignedIntImage2DArray = ((int)0x9069)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A
+        /// </summary>
+        UnsignedIntImageCubeMapArray = ((int)0x906A)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B
+        /// </summary>
+        UnsignedIntImage2DMultisample = ((int)0x906B)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C
+        /// </summary>
+        UnsignedIntImage2DMultisampleArray = ((int)0x906C)        ,
+        /// <summary>
         /// Original was GL_SAMPLER_2D_MULTISAMPLE = 0x9108
         /// </summary>
         Sampler2DMultisample = ((int)0x9108)        ,
@@ -601,6 +701,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D
         /// </summary>
         UnsignedIntSampler2DMultisampleArray = ((int)0x910D)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB
+        /// </summary>
+        UnsignedIntAtomicCounter = ((int)0x92DB)        ,
     }
 
     /// <summary>
@@ -23861,7 +23965,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetProgramInterface, GL.GetProgramResourceIndex, GL.GetProgramResource, GL.GetProgramResourceLocation, GL.GetProgramResourceLocationIndex, GL.GetProgramResourceName
+    /// Not used directly.
     /// </summary>
     public enum ArbProgramInterfaceQuery : int
     {
@@ -24224,7 +24328,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetActiveAtomicCounterBuffer
+    /// Not used directly.
     /// </summary>
     public enum ArbShaderAtomicCounters : int
     {
@@ -27240,7 +27344,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.GetProgram, GL.Arb.GetProgramString, GL.Arb.ProgramParameter, GL.ProgramParameter, GL.Ext.ProgramParameter, GL.NV.GetProgramParameter, GL.NV.GetTrackMatrix
+    /// Used in GL.Arb.GetProgram, GL.Arb.GetProgramString, GL.Arb.ProgramParameter, GL.Ext.ProgramParameter, GL.NV.GetProgramParameter, GL.NV.GetTrackMatrix
     /// </summary>
     public enum AssemblyProgramParameterArb : int
     {
@@ -28304,6 +28408,53 @@ namespace OpenTK.Graphics.OpenGL
         VertexSourceAti = ((int)0x8774)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetActiveAtomicCounterBuffer
+    /// </summary>
+    public enum AtomicCounterBufferParameter : int
+    {
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED
+        /// </summary>
+        AtomicCounterBufferReferencedByComputeShader = ((int)0x90ED)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1
+        /// </summary>
+        AtomicCounterBufferBinding = ((int)0x92C1)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4
+        /// </summary>
+        AtomicCounterBufferDataSize = ((int)0x92C4)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5
+        /// </summary>
+        AtomicCounterBufferActiveAtomicCounters = ((int)0x92C5)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6
+        /// </summary>
+        AtomicCounterBufferActiveAtomicCounterIndices = ((int)0x92C6)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7
+        /// </summary>
+        AtomicCounterBufferReferencedByVertexShader = ((int)0x92C7)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8
+        /// </summary>
+        AtomicCounterBufferReferencedByTessControlShader = ((int)0x92C8)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9
+        /// </summary>
+        AtomicCounterBufferReferencedByTessEvaluationShader = ((int)0x92C9)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA
+        /// </summary>
+        AtomicCounterBufferReferencedByGeometryShader = ((int)0x92CA)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB
+        /// </summary>
+        AtomicCounterBufferReferencedByFragmentShader = ((int)0x92CB)        ,
+    }
+
     /// <summary>
     /// Used in GL.PushAttrib
     /// </summary>
@@ -40674,6 +40825,69 @@ namespace OpenTK.Graphics.OpenGL
         Matrix31 = ((int)0x88DF)        ,
     }
 
+    /// <summary>
+    /// Used in GL.MemoryBarrier
+    /// </summary>
+    public enum MemoryBarrierFlags : int
+    {
+        /// <summary>
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001
+        /// </summary>
+        VertexAttribArrayBarrierBit = ((int)0x00000001)        ,
+        /// <summary>
+        /// Original was GL_ELEMENT_ARRAY_BARRIER_BIT = 0x00000002
+        /// </summary>
+        ElementArrayBarrierBit = ((int)0x00000002)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BARRIER_BIT = 0x00000004
+        /// </summary>
+        UniformBarrierBit = ((int)0x00000004)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_FETCH_BARRIER_BIT = 0x00000008
+        /// </summary>
+        TextureFetchBarrierBit = ((int)0x00000008)        ,
+        /// <summary>
+        /// Original was GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020
+        /// </summary>
+        ShaderImageAccessBarrierBit = ((int)0x00000020)        ,
+        /// <summary>
+        /// Original was GL_COMMAND_BARRIER_BIT = 0x00000040
+        /// </summary>
+        CommandBarrierBit = ((int)0x00000040)        ,
+        /// <summary>
+        /// Original was GL_PIXEL_BUFFER_BARRIER_BIT = 0x00000080
+        /// </summary>
+        PixelBufferBarrierBit = ((int)0x00000080)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_UPDATE_BARRIER_BIT = 0x00000100
+        /// </summary>
+        TextureUpdateBarrierBit = ((int)0x00000100)        ,
+        /// <summary>
+        /// Original was GL_BUFFER_UPDATE_BARRIER_BIT = 0x00000200
+        /// </summary>
+        BufferUpdateBarrierBit = ((int)0x00000200)        ,
+        /// <summary>
+        /// Original was GL_FRAMEBUFFER_BARRIER_BIT = 0x00000400
+        /// </summary>
+        FramebufferBarrierBit = ((int)0x00000400)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800
+        /// </summary>
+        TransformFeedbackBarrierBit = ((int)0x00000800)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BARRIER_BIT = 0x00001000
+        /// </summary>
+        AtomicCounterBarrierBit = ((int)0x00001000)        ,
+        /// <summary>
+        /// Original was GL_SHADER_STORAGE_BARRIER_BIT = 0x00002000
+        /// </summary>
+        ShaderStorageBarrierBit = ((int)0x00002000)        ,
+        /// <summary>
+        /// Original was GL_ALL_BARRIER_BITS = 0xFFFFFFFF
+        /// </summary>
+        AllBarrierBits = unchecked((int)0xFFFFFFFF)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -47714,6 +47928,120 @@ namespace OpenTK.Graphics.OpenGL
         Polygon = ((int)0x0009)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetProgramInterface, GL.GetProgramResourceIndex, GL.GetProgramResource, GL.GetProgramResourceLocation, GL.GetProgramResourceLocationIndex, GL.GetProgramResourceName
+    /// </summary>
+    public enum ProgramInterface : int
+    {
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_BUFFER = 0x8C8E
+        /// </summary>
+        TransformFeedbackBuffer = ((int)0x8C8E)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER = 0x92C0
+        /// </summary>
+        AtomicCounterBuffer = ((int)0x92C0)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM = 0x92E1
+        /// </summary>
+        Uniform = ((int)0x92E1)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK = 0x92E2
+        /// </summary>
+        UniformBlock = ((int)0x92E2)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_INPUT = 0x92E3
+        /// </summary>
+        ProgramInput = ((int)0x92E3)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_OUTPUT = 0x92E4
+        /// </summary>
+        ProgramOutput = ((int)0x92E4)        ,
+        /// <summary>
+        /// Original was GL_BUFFER_VARIABLE = 0x92E5
+        /// </summary>
+        BufferVariable = ((int)0x92E5)        ,
+        /// <summary>
+        /// Original was GL_SHADER_STORAGE_BLOCK = 0x92E6
+        /// </summary>
+        ShaderStorageBlock = ((int)0x92E6)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_SUBROUTINE = 0x92E8
+        /// </summary>
+        VertexSubroutine = ((int)0x92E8)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_SUBROUTINE = 0x92E9
+        /// </summary>
+        TessControlSubroutine = ((int)0x92E9)        ,
+        /// <summary>
+        /// Original was GL_TESS_EVALUATION_SUBROUTINE = 0x92EA
+        /// </summary>
+        TessEvaluationSubroutine = ((int)0x92EA)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_SUBROUTINE = 0x92EB
+        /// </summary>
+        GeometrySubroutine = ((int)0x92EB)        ,
+        /// <summary>
+        /// Original was GL_FRAGMENT_SUBROUTINE = 0x92EC
+        /// </summary>
+        FragmentSubroutine = ((int)0x92EC)        ,
+        /// <summary>
+        /// Original was GL_COMPUTE_SUBROUTINE = 0x92ED
+        /// </summary>
+        ComputeSubroutine = ((int)0x92ED)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_SUBROUTINE_UNIFORM = 0x92EE
+        /// </summary>
+        VertexSubroutineUniform = ((int)0x92EE)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF
+        /// </summary>
+        TessControlSubroutineUniform = ((int)0x92EF)        ,
+        /// <summary>
+        /// Original was GL_TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0
+        /// </summary>
+        TessEvaluationSubroutineUniform = ((int)0x92F0)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1
+        /// </summary>
+        GeometrySubroutineUniform = ((int)0x92F1)        ,
+        /// <summary>
+        /// Original was GL_FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2
+        /// </summary>
+        FragmentSubroutineUniform = ((int)0x92F2)        ,
+        /// <summary>
+        /// Original was GL_COMPUTE_SUBROUTINE_UNIFORM = 0x92F3
+        /// </summary>
+        ComputeSubroutineUniform = ((int)0x92F3)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYING = 0x92F4
+        /// </summary>
+        TransformFeedbackVarying = ((int)0x92F4)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.GetProgramInterface
+    /// </summary>
+    public enum ProgramInterfaceParameter : int
+    {
+        /// <summary>
+        /// Original was GL_ACTIVE_RESOURCES = 0x92F5
+        /// </summary>
+        ActiveResources = ((int)0x92F5)        ,
+        /// <summary>
+        /// Original was GL_MAX_NAME_LENGTH = 0x92F6
+        /// </summary>
+        MaxNameLength = ((int)0x92F6)        ,
+        /// <summary>
+        /// Original was GL_MAX_NUM_ACTIVE_VARIABLES = 0x92F7
+        /// </summary>
+        MaxNumActiveVariables = ((int)0x92F7)        ,
+        /// <summary>
+        /// Original was GL_MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8
+        /// </summary>
+        MaxNumCompatibleSubroutines = ((int)0x92F8)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetProgram
     /// </summary>
@@ -47728,14 +48056,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         ProgramSeparable = ((int)0x8258)        ,
         /// <summary>
-        /// Original was GL_PROGRAM_BINARY_LENGTH = 0x8741
-        /// </summary>
-        ProgramBinaryLength = ((int)0x8741)        ,
-        /// <summary>
         /// Original was GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F
         /// </summary>
         GeometryShaderInvocations = ((int)0x887F)        ,
         /// <summary>
+        /// Original was GL_GEOMETRY_VERTICES_OUT = 0x8916
+        /// </summary>
+        GeometryVerticesOut = ((int)0x8916)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_INPUT_TYPE = 0x8917
+        /// </summary>
+        GeometryInputType = ((int)0x8917)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_OUTPUT_TYPE = 0x8918
+        /// </summary>
+        GeometryOutputType = ((int)0x8918)        ,
+        /// <summary>
         /// Original was GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35
         /// </summary>
         ActiveUniformBlockMaxNameLength = ((int)0x8A35)        ,
@@ -47792,18 +48128,6 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         TransformFeedbackVaryings = ((int)0x8C83)        ,
         /// <summary>
-        /// Original was GL_GEOMETRY_VERTICES_OUT = 0x8DDA
-        /// </summary>
-        GeometryVerticesOut = ((int)0x8DDA)        ,
-        /// <summary>
-        /// Original was GL_GEOMETRY_INPUT_TYPE = 0x8DDB
-        /// </summary>
-        GeometryInputType = ((int)0x8DDB)        ,
-        /// <summary>
-        /// Original was GL_GEOMETRY_OUTPUT_TYPE = 0x8DDC
-        /// </summary>
-        GeometryOutputType = ((int)0x8DDC)        ,
-        /// <summary>
         /// Original was GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75
         /// </summary>
         TessControlOutputVertices = ((int)0x8E75)        ,
@@ -47823,6 +48147,29 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_TESS_GEN_POINT_MODE = 0x8E79
         /// </summary>
         TessGenPointMode = ((int)0x8E79)        ,
+        /// <summary>
+        /// Original was GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF
+        /// </summary>
+        MaxComputeWorkGroupSize = ((int)0x91BF)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9
+        /// </summary>
+        ActiveAtomicCounterBuffers = ((int)0x92D9)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.ProgramParameter
+    /// </summary>
+    public enum ProgramParameterPName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_SEPARABLE = 0x8258
+        /// </summary>
+        ProgramSeparable = ((int)0x8258)        ,
     }
 
     /// <summary>
@@ -47834,6 +48181,145 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_ACTIVE_PROGRAM = 0x8259
         /// </summary>
         ActiveProgram = ((int)0x8259)        ,
+        /// <summary>
+        /// Original was GL_FRAGMENT_SHADER = 0x8B30
+        /// </summary>
+        FragmentShader = ((int)0x8B30)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_SHADER = 0x8B31
+        /// </summary>
+        VertexShader = ((int)0x8B31)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_SHADER = 0x8DD9
+        /// </summary>
+        GeometryShader = ((int)0x8DD9)        ,
+        /// <summary>
+        /// Original was GL_TESS_EVALUATION_SHADER = 0x8E87
+        /// </summary>
+        TessEvaluationShader = ((int)0x8E87)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_SHADER = 0x8E88
+        /// </summary>
+        TessControlShader = ((int)0x8E88)        ,
+        /// <summary>
+        /// Original was GL_COMPUTE_SHADER = 0x91B9
+        /// </summary>
+        ComputeShader = ((int)0x91B9)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.GetProgramResource, GL.Ext.GetNamedProgram
+    /// </summary>
+    public enum ProgramProperty : int
+    {
+        /// <summary>
+        /// Original was GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A
+        /// </summary>
+        NumCompatibleSubroutines = ((int)0x8E4A)        ,
+        /// <summary>
+        /// Original was GL_COMPATIBLE_SUBROUTINES = 0x8E4B
+        /// </summary>
+        CompatibleSubroutines = ((int)0x8E4B)        ,
+        /// <summary>
+        /// Original was GL_IS_PER_PATCH = 0x92E7
+        /// </summary>
+        IsPerPatch = ((int)0x92E7)        ,
+        /// <summary>
+        /// Original was GL_NAME_LENGTH = 0x92F9
+        /// </summary>
+        NameLength = ((int)0x92F9)        ,
+        /// <summary>
+        /// Original was GL_TYPE = 0x92FA
+        /// </summary>
+        Type = ((int)0x92FA)        ,
+        /// <summary>
+        /// Original was GL_ARRAY_SIZE = 0x92FB
+        /// </summary>
+        ArraySize = ((int)0x92FB)        ,
+        /// <summary>
+        /// Original was GL_OFFSET = 0x92FC
+        /// </summary>
+        Offset = ((int)0x92FC)        ,
+        /// <summary>
+        /// Original was GL_BLOCK_INDEX = 0x92FD
+        /// </summary>
+        BlockIndex = ((int)0x92FD)        ,
+        /// <summary>
+        /// Original was GL_ARRAY_STRIDE = 0x92FE
+        /// </summary>
+        ArrayStride = ((int)0x92FE)        ,
+        /// <summary>
+        /// Original was GL_MATRIX_STRIDE = 0x92FF
+        /// </summary>
+        MatrixStride = ((int)0x92FF)        ,
+        /// <summary>
+        /// Original was GL_IS_ROW_MAJOR = 0x9300
+        /// </summary>
+        IsRowMajor = ((int)0x9300)        ,
+        /// <summary>
+        /// Original was GL_ATOMIC_COUNTER_BUFFER_INDEX = 0x9301
+        /// </summary>
+        AtomicCounterBufferIndex = ((int)0x9301)        ,
+        /// <summary>
+        /// Original was GL_BUFFER_BINDING = 0x9302
+        /// </summary>
+        BufferBinding = ((int)0x9302)        ,
+        /// <summary>
+        /// Original was GL_BUFFER_DATA_SIZE = 0x9303
+        /// </summary>
+        BufferDataSize = ((int)0x9303)        ,
+        /// <summary>
+        /// Original was GL_NUM_ACTIVE_VARIABLES = 0x9304
+        /// </summary>
+        NumActiveVariables = ((int)0x9304)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_VARIABLES = 0x9305
+        /// </summary>
+        ActiveVariables = ((int)0x9305)        ,
+        /// <summary>
+        /// Original was GL_REFERENCED_BY_VERTEX_SHADER = 0x9306
+        /// </summary>
+        ReferencedByVertexShader = ((int)0x9306)        ,
+        /// <summary>
+        /// Original was GL_REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307
+        /// </summary>
+        ReferencedByTessControlShader = ((int)0x9307)        ,
+        /// <summary>
+        /// Original was GL_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308
+        /// </summary>
+        ReferencedByTessEvaluationShader = ((int)0x9308)        ,
+        /// <summary>
+        /// Original was GL_REFERENCED_BY_GEOMETRY_SHADER = 0x9309
+        /// </summary>
+        ReferencedByGeometryShader = ((int)0x9309)        ,
+        /// <summary>
+        /// Original was GL_REFERENCED_BY_FRAGMENT_SHADER = 0x930A
+        /// </summary>
+        ReferencedByFragmentShader = ((int)0x930A)        ,
+        /// <summary>
+        /// Original was GL_TOP_LEVEL_ARRAY_SIZE = 0x930C
+        /// </summary>
+        TopLevelArraySize = ((int)0x930C)        ,
+        /// <summary>
+        /// Original was GL_TOP_LEVEL_ARRAY_STRIDE = 0x930D
+        /// </summary>
+        TopLevelArrayStride = ((int)0x930D)        ,
+        /// <summary>
+        /// Original was GL_LOCATION = 0x930E
+        /// </summary>
+        Location = ((int)0x930E)        ,
+        /// <summary>
+        /// Original was GL_LOCATION_INDEX = 0x930F
+        /// </summary>
+        LocationIndex = ((int)0x930F)        ,
     }
 
     /// <summary>
@@ -47863,6 +48349,10 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         TessEvaluationShaderBit = ((int)0x00000010)        ,
         /// <summary>
+        /// Original was GL_COMPUTE_SHADER_BIT = 0x00000020
+        /// </summary>
+        ComputeShaderBit = ((int)0x00000020)        ,
+        /// <summary>
         /// Original was GL_ALL_SHADER_BITS = 0xFFFFFFFF
         /// </summary>
         AllShaderBits = unchecked((int)0xFFFFFFFF)        ,
@@ -50309,6 +50799,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_TESS_CONTROL_SHADER = 0x8E88
         /// </summary>
         TessControlShader = ((int)0x8E88)        ,
+        /// <summary>
+        /// Original was GL_COMPUTE_SHADER = 0x91B9
+        /// </summary>
+        ComputeShader = ((int)0x91B9)        ,
     }
 
     /// <summary>