From e959a99d95f942ebe53829ff69c24d6a4578ddf6 Mon Sep 17 00:00:00 2001
From: thefiddler <stapostol@gmail.com>
Date: Thu, 14 Aug 2014 08:11:11 +0200
Subject: [PATCH] [GL][ES] Implemented ARB_ES_3_1_compatibility

MemoryBarrier and MemoryBarrierByRegion now use the same enum name.
---
 Source/Bind/Generator.Bind.csproj                  |  4 ++
 .../GL2/ES/3.1/KHR_shader_image_load_store.xml     |  8 ++--
 .../GL2/GL/4.5/ARB_ES3_1_compatibility.xml         | 46 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 Source/Bind/Specifications/GL2/GL/4.5/ARB_ES3_1_compatibility.xml

diff --git a/Source/Bind/Generator.Bind.csproj b/Source/Bind/Generator.Bind.csproj
index aea7fdf..777138c 100644
--- a/Source/Bind/Generator.Bind.csproj
+++ b/Source/Bind/Generator.Bind.csproj
@@ -256,6 +256,10 @@
     <None Include="Specifications\GL2\ES\3.1\KHR_texture_gather.xml" />
     <None Include="Specifications\GL2\ES\3.1\KHR_texture_storage_multisample.xml" />
     <None Include="Specifications\GL2\ES\3.1\KHR_vertex_attrib_binding.xml" />
+    <Compile Include="ES\ES31Generator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="Specifications\GL2\GL\4.5\ARB_ES3_1_compatibility.xml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Specifications\GL2\signatures.xml">
diff --git a/Source/Bind/Specifications/GL2/ES/3.1/KHR_shader_image_load_store.xml b/Source/Bind/Specifications/GL2/ES/3.1/KHR_shader_image_load_store.xml
index 475ec74..e3fca8d 100644
--- a/Source/Bind/Specifications/GL2/ES/3.1/KHR_shader_image_load_store.xml
+++ b/Source/Bind/Specifications/GL2/ES/3.1/KHR_shader_image_load_store.xml
@@ -10,10 +10,10 @@
       <param name="target"><type>GetIndexedPName</type></param>
     </function>
     <function name="MemoryBarrier">
-      <param name="barriers"><type>MemoryBarrierMask</type></param>
+      <param name="barriers"><type>MemoryBarrierFlags</type></param>
     </function>
     <function name="MemoryBarrierByRegion">
-      <param name="barriers"><type>MemoryBarrierRegionMask</type></param>
+      <param name="barriers"><type>MemoryBarrierRegionFlags</type></param>
     </function>
   </replace>
 
@@ -47,7 +47,7 @@
     <enum name="GetTextureParameterName">
       <use token="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
     </enum>
-    <enum name="MemoryBarrierMask">
+    <enum name="MemoryBarrierFlags">
       <use token="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
       <use token="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
       <use token="GL_UNIFORM_BARRIER_BIT"/>
@@ -62,7 +62,7 @@
       <use token="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
       <use token="GL_ALL_BARRIER_BITS"/>
     </enum>
-    <enum name="MemoryBarrierRegionMask">
+    <enum name="MemoryBarrierRegionFlags">
       <use token="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
       <use token="GL_FRAMEBUFFER_BARRIER_BIT"/>
       <use token="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
diff --git a/Source/Bind/Specifications/GL2/GL/4.5/ARB_ES3_1_compatibility.xml b/Source/Bind/Specifications/GL2/GL/4.5/ARB_ES3_1_compatibility.xml
new file mode 100644
index 0000000..31337d7
--- /dev/null
+++ b/Source/Bind/Specifications/GL2/GL/4.5/ARB_ES3_1_compatibility.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<signatures version="2">
+
+  <replace name="gl|glcore" version="4.5">
+    <function name="BindImageTexture">
+      <param name="access"><type>TextureAccess</type></param>
+      <param name="format"><type>SizedInternalFormat</type></param>
+    </function>
+    <function name="GetBooleani_v">
+      <param name="target"><type>GetIndexedPName</type></param>
+    </function>
+    <function name="MemoryBarrier">
+      <param name="barriers"><type>MemoryBarrierMask</type></param>
+    </function>
+    <function name="MemoryBarrierByRegion">
+      <param name="barriers"><type>MemoryBarrierRegionMask</type></param>
+    </function>
+  </replace>
+
+  <add name="gl|glcore" version="4.5">
+    <enum name="MemoryBarrierMask">
+      <use token="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
+      <use token="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
+      <use token="GL_UNIFORM_BARRIER_BIT"/>
+      <use token="GL_TEXTURE_FETCH_BARRIER_BIT"/>
+      <use token="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
+      <use token="GL_COMMAND_BARRIER_BIT"/>
+      <use token="GL_PIXEL_BUFFER_BARRIER_BIT"/>
+      <use token="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
+      <use token="GL_BUFFER_UPDATE_BARRIER_BIT"/>
+      <use token="GL_FRAMEBUFFER_BARRIER_BIT"/>
+      <use token="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
+      <use token="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
+      <use token="GL_ALL_BARRIER_BITS"/>
+    </enum>
+    <enum name="MemoryBarrierRegionMask">
+      <use token="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
+      <use token="GL_FRAMEBUFFER_BARRIER_BIT"/>
+      <use token="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
+      <use token="GL_TEXTURE_FETCH_BARRIER_BIT"/>
+      <use token="GL_UNIFORM_BARRIER_BIT"/>
+      <use token="GL_ALL_BARRIER_BITS"/>
+    </enum>
+  </add>
+
+</signatures>
-- 
2.7.4