This patch is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 08/28/2016 07:10 PM, Ilia Mirkin wrote:
> This requires a bit of rejiggering, since normally ES entrypoints alias
> core ones, not vice-versa.
>
> Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
> ---
> src/mapi/glapi/gen/es_EXT.xml | 19 -----------------
> src/mapi/glapi/gen/gl_API.xml | 37
> +++++++++++++++++++++++++++++++++
> src/mesa/main/tests/dispatch_sanity.cpp | 3 +++
> 3 files changed, 40 insertions(+), 19 deletions(-)
>
> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
> index b9fbec4..332dc5e 100644
> --- a/src/mapi/glapi/gen/es_EXT.xml
> +++ b/src/mapi/glapi/gen/es_EXT.xml
> @@ -1342,23 +1342,4 @@
>
> </category>
>
> -<category name="ES3.2">
> -
> - <!-- TODO: Move to GL 4.x when it is added to a GL version -->
> - <enum name="PRIMITIVE_BOUNDING_BOX_ARB" count="8" value="0x92BE">
> - <size name="Get" mode="get"/>
> - </enum>
> - <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>
> -
> -</category>
> -
> </OpenGLAPI>
> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
> index c39aa22..17c59db 100644
> --- a/src/mapi/glapi/gen/gl_API.xml
> +++ b/src/mapi/glapi/gen/gl_API.xml
> @@ -8318,6 +8318,43 @@
> <function name="BlendBarrierKHR" alias="BlendBarrier" es2="2.0"/>
> </category>
>
> +<category name="ARB_ES3_2_compatibility" number="177">
> +
> + <enum name="PRIMITIVE_BOUNDING_BOX_ARB" count="8" value="0x92BE">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="MULTISAMPLE_LINE_WIDTH_RANGE_ARB" count="2" value="0x9381">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB" value="0x9382">
> + <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"/>
> + <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>
> +
> +</category>
> +
> <!-- Non-ARB extensions sorted by extension number. -->
>
> <category name="GL_EXT_blend_color" number="2">
> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
> b/src/mesa/main/tests/dispatch_sanity.cpp
> index 42fe61a..c87b1dc 100644
> --- a/src/mesa/main/tests/dispatch_sanity.cpp
> +++ b/src/mesa/main/tests/dispatch_sanity.cpp
> @@ -1866,6 +1866,9 @@ const struct function gl_core_functions_possible[] = {
> { "glMultiDrawArraysIndirectCountARB", 31, -1 },
> { "glMultiDrawElementsIndirectCountARB", 31, -1 },
>
> + /* GL_ARB_ES3_2_compatibility */
> + { "glPrimitiveBoundingBoxARB", 45, -1 },
> +
> { NULL, 0, -1 }
> };
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
