[Mesa-dev] [PATCH] glapi: Fix DispatchSanity

Discussion:

[Mesa-dev] [PATCH] glapi: Fix DispatchSanity_test

Kristian H. Kristensen

2018-12-07 23:48:33 UTC

---
src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml | 2 +-
src/mapi/glapi/gen/es_EXT.xml | 2 ++
src/mapi/glapi/gen/gl_API.xml | 2 --
src/mesa/main/tests/dispatch_sanity.cpp | 3 +++
4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml b/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
index 555b008bd33..d76ecd47d0e 100644
--- a/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
+++ b/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
@@ -20,7 +20,7 @@
</function>
-->

- <function name="FramebufferTexture2DMultisampleEXT" es2="2.0">
+ <function name="FramebufferTexture2DMultisampleEXT" es2="2.0" desktop="false">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index bbc4a1a1118..917fed62f98 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -810,6 +810,8 @@
<enum name="RG8_EXT" value="0x822B"/>
</category>

+<xi:include href="EXT_multisampled_render_to_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+

<category name="GL_ANGLE_texture_compression_dxt" number="111">
<enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index f1def8090de..f4d0808f13b 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8175,8 +8175,6 @@

<xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

-<xi:include href="EXT_multisampled_render_to_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

<category name="GL_ARB_transform_feedback_instanced" number="109">
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index fb2acfbdeea..04dd89328f4 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2236,6 +2236,9 @@ const struct function gles2_functions_possible[] = {
/* GL_NV_conservative_raster_pre_snap_triangles */
{ "glConservativeRasterParameteriNV", 20, -1 },

+ /* GL_EXT_multisampled_render_to_texture */
+ { "glFramebufferTexture2DMultisampleEXT", 20, -1 },
+
{ NULL, 0, -1 }
};

--
2.20.0.rc2.403.gdbc3b29805-goog

Vinson Lee

2018-12-08 06:15:35 UTC

Permalink

On Fri, Dec 7, 2018 at 3:48 PM Kristian H. Kristensen

Post by Kristian H. Kristensen
---
src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml | 2 +-
src/mapi/glapi/gen/es_EXT.xml | 2 ++
src/mapi/glapi/gen/gl_API.xml | 2 --
src/mesa/main/tests/dispatch_sanity.cpp | 3 +++
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml b/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
index 555b008bd33..d76ecd47d0e 100644
--- a/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
+++ b/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml
@@ -20,7 +20,7 @@
</function>
-->
- <function name="FramebufferTexture2DMultisampleEXT" es2="2.0">
+ <function name="FramebufferTexture2DMultisampleEXT" es2="2.0" desktop="false">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index bbc4a1a1118..917fed62f98 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -810,6 +810,8 @@
<enum name="RG8_EXT" value="0x822B"/>
</category>
+<xi:include href="EXT_multisampled_render_to_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+

<category name="GL_ANGLE_texture_compression_dxt" number="111">
<enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index f1def8090de..f4d0808f13b 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8175,8 +8175,6 @@
<xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="EXT_multisampled_render_to_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<category name="GL_ARB_transform_feedback_instanced" number="109">
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index fb2acfbdeea..04dd89328f4 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2236,6 +2236,9 @@ const struct function gles2_functions_possible[] = {
/* GL_NV_conservative_raster_pre_snap_triangles */
{ "glConservativeRasterParameteriNV", 20, -1 },
+ /* GL_EXT_multisampled_render_to_texture */
+ { "glFramebufferTexture2DMultisampleEXT", 20, -1 },
+
{ NULL, 0, -1 }
};
--
2.20.0.rc2.403.gdbc3b29805-goog
_______________________________________________
mesa-dev mailing list
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Tested-by: Vinson Lee <***@freedesktop.org>

Kristian Høgsberg

2018-12-10 18:56:41 UTC

Permalink

There's a bit more to it. I'm testing something up and will send a
patch shortly.

You could also just review this patch and tell me what's missing.
Either way, we need to fix the test suite, so let's close this soon.
I'll commit this end of today if I don't hear from you.

Kristian

-Emil