[GL][ES] Implemented ARB_ES_3_1_compatibility

MemoryBarrier and MemoryBarrierByRegion now use the same enum name.
This commit is contained in:
thefiddler 2014-08-14 08:11:11 +02:00
parent 47e49c85b3
commit e959a99d95
3 changed files with 54 additions and 4 deletions

View file

@ -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">

View file

@ -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"/>

View file

@ -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>