[Mesa-dev] [RFC PATCH 01/26] glapi: add ARB_texture_multisample

[Matt Turner]

On Sat, Dec 29, 2012 at 4:35 AM, Chris Forbes <chrisf at ijw.co.nz> wrote:
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
>  src/mapi/glapi/gen/ARB_texture_multisample.xml | 69 ++++++++++++++++++++++++++
>  src/mapi/glapi/gen/gl_API.xml                  |  3 ++
>  2 files changed, 72 insertions(+)
>  create mode 100644 src/mapi/glapi/gen/ARB_texture_multisample.xml
>
> diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mapi/glapi/gen/ARB_texture_multisample.xml
> new file mode 100644
> index 0000000..e21e31a
> --- /dev/null
> +++ b/src/mapi/glapi/gen/ARB_texture_multisample.xml
> @@ -0,0 +1,69 @@
> +<?xml version="1.0"?>
> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
> +
> +<!-- Note: no GLX protocol info yet. -->
> +
> +<OpenGLAPI>
> +
> +<category name="GL_ARB_texture_multisample" number="67">
> +
> +   <enum name="SAMPLE_POSITION" value="0x8E50"/>
> +   <enum name="SAMPLE_MASK" value="0x8E51"/>
> +   <enum name="SAMPLE_MASK_VALUE" value="0x8E52"/>
> +
> +   <enum name="TEXTURE_2D_MULTISAMPLE" value="0x9100"/>
> +   <enum name="PROXY_TEXTURE_2D_MULTISAMPLE" value="0x9101"/>
> +   <enum name="TEXTURE_2D_MULTISAMPLE_ARRAY" value="0x9102"/>
> +   <enum name="PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY" value="0x9103"/>
> +
> +   <enum name="MAX_SAMPLE_MASK_WORDS" value="0x8E59"/>
> +   <enum name="MAX_COLOR_TEXTURE_SAMPLES" value="0x910E"/>
> +   <enum name="MAX_DEPTH_TEXTURE_SAMPLES" value="0x910F"/>
> +   <enum name="MAX_INTEGER_SAMPLES" value="0x9110"/>
> +
> +   <enum name="TEXTURE_BINDING_2D_MULTISAMPLE" value="0x9104"/>
> +   <enum name="TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY" value="0x9105"/>
> +
> +   <enum name="TEXTURE_SAMPLES" value="0x9106"/>
> +   <enum name="TEXTURE_FIXED_SAMPLE_LOCATIONS" value="0x9107"/>
> +
> +   <enum name="SAMPLER_2D_MULTISAMPLE" value="0x9108"/>
> +   <enum name="INT_SAMPLER_2D_MULTISAMPLE" value="0x9109"/>
> +   <enum name="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE" value="0x910A"/>
> +   <enum name="SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910B"/>
> +   <enum name="INT_SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910C"/>
> +   <enum name="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY" value="0x910D"/>
> +
> +   <function name="TexImage2DMultisample" offset="assign" exec="mesa">
> +      <param name="target" type="GLenum"/>
> +      <param name="samples" type="GLsizei"/>
> +      <param name="internalformat" type="GLint"/>
> +      <param name="width" type="GLsizei"/>
> +      <param name="height" type="GLsizei"/>
> +      <param name="fixedsamplelocations" type="GLboolean"/>
> +   </function>
> +
> +   <function name="TexImage3DMultisample" offset="assign" exec="mesa">
> +      <param name="target" type="GLenum"/>
> +      <param name="samples" type="GLsizei"/>
> +      <param name="internalformat" type="GLint"/>
> +      <param name="width" type="GLsizei"/>
> +      <param name="height" type="GLsizei"/>
> +      <param name="depth" type="GLsizei"/>
> +      <param name="fixedsamplelocations" type="GLboolean"/>
> +   </function>
> +
> +   <function name="GetMultisamplefv" offset="assign" exec="mesa">
> +      <param name="pname" type="GLenum"/>
> +      <param name="index" type="GLuint"/>
> +      <param name="val" type="GLfloat *"/>
> +   </function>
> +
> +   <function name="SampleMaski" offset="assign" exec="mesa">
> +      <param name="index" type="GLuint"/>
> +      <param name="mask" type="GLbitfield"/>
> +   </function>
> +
> +</category>
> +
> +</OpenGLAPI>
> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
> index a47316a..de5546d 100644
> --- a/src/mapi/glapi/gen/gl_API.xml
> +++ b/src/mapi/glapi/gen/gl_API.xml
> @@ -8180,6 +8180,9 @@
>  <xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
>
>  <!-- 67. GL_ARB_texture_multisample -->

Remove the #67 placeholder.

The XML definitions look good except for exec="mesa" which I'm not
sure about (as you say in 00/26). With those two things fixed, have a

Reviewed-by: Matt Turner <mattst88 at gmail.com>

> +
> +<xi:include href="ARB_texture_multisample.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
> +
>  <!-- 68. GL_ARB_vertex_array_bgra -->
>
>  <xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
> --