Mesa (13.0): glapi: Move PrimitiveBoundingBox and BlendBarrier definitions into ES3.2 category.
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Oct 24 11:24:43 UTC 2016
Module: Mesa
Branch: 13.0
Commit: 293e4585587b6e080ad637ec765260782630a872
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=293e4585587b6e080ad637ec765260782630a872
Author: Francisco Jerez <currojerez at riseup.net>
Date: Tue Oct 18 14:53:20 2016 -0700
glapi: Move PrimitiveBoundingBox and BlendBarrier definitions into ES3.2 category.
These two GLES 3.2 entry points were being defined in the category of
the ARB_ES3_2_compatibility and KHR_blend_equation_advanced extensions
respectively instead of in the ES3.2 category. Defining them in the
ES3.2 category makes sure that the gl_procs.py generator emits
declarations in the glprocs.h header file for the unsuffixed GLES-only
entry points that PrimitiveBoundingBoxARB and BlendBarrierKHR
respectively alias. This should avoid a compilation failure during
scons builds in combination with "mapi: export all GLES 3.2 functions
in libGLESv2.so".
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 15a084a03998c5c86206137fdaf6f43b5f98485a)
---
src/mapi/glapi/gen/gl_API.xml | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 5998ccf..00c9bb7 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8296,6 +8296,23 @@
<!-- ARB extension 171 -->
<xi:include href="ARB_pipeline_statistics_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<category name="es3.2">
+ <!-- This should be in es_EXT, but this file is included first and
+ the alias doesn't work otherwise. -->
+ <function name="PrimitiveBoundingBox" es2="3.2" desktop="false">
+ <param name="minX" type="GLfloat"/>
+ <param name="minY" type="GLfloat"/>
+ <param name="minZ" type="GLfloat"/>
+ <param name="minW" type="GLfloat"/>
+ <param name="maxX" type="GLfloat"/>
+ <param name="maxY" type="GLfloat"/>
+ <param name="maxZ" type="GLfloat"/>
+ <param name="maxW" type="GLfloat"/>
+ </function>
+
+ <function name="BlendBarrier" es2="3.2"/>
+</category>
+
<category name="KHR_blend_equation_advanced" number="174">
<enum name="BLEND_ADVANCED_COHERENT_KHR" value="0x9285"/>
@@ -8316,7 +8333,6 @@
<enum name="HSL_COLOR_KHR" value="0x92AF"/>
<enum name="HSL_LUMINOSITY_KHR" value="0x92B0"/>
- <function name="BlendBarrier" es2="3.2"/>
<function name="BlendBarrierKHR" alias="BlendBarrier" es2="2.0"/>
</category>
@@ -8332,18 +8348,6 @@
<size name="Get" mode="get"/>
</enum>
- <!-- This should be in es_EXT, but this file is included first and
- the alias doesn't work otherwise. -->
- <function name="PrimitiveBoundingBox" es2="3.2" desktop="false">
- <param name="minX" type="GLfloat"/>
- <param name="minY" type="GLfloat"/>
- <param name="minZ" type="GLfloat"/>
- <param name="minW" type="GLfloat"/>
- <param name="maxX" type="GLfloat"/>
- <param name="maxY" type="GLfloat"/>
- <param name="maxZ" type="GLfloat"/>
- <param name="maxW" type="GLfloat"/>
- </function>
<function name="PrimitiveBoundingBoxARB" alias="PrimitiveBoundingBox">
<param name="minX" type="GLfloat"/>
<param name="minY" type="GLfloat"/>
More information about the mesa-commit
mailing list