[Mesa-dev] [PATCH 7/9] mesa: Add dispatch and extension XML for GL_ARB_internalformat_query

Ian Romanick idr at freedesktop.org
Wed Dec 19 15:58:41 PST 2012


From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mapi/glapi/gen/ARB_internalformat_query.xml | 21 +++++++++++++++++++++
 src/mapi/glapi/gen/gl_API.xml                   |  6 +++---
 src/mapi/glapi/gen/gl_genexec.py                |  1 +
 src/mesa/main/tests/dispatch_sanity.cpp         |  6 ++++--
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/mapi/glapi/gen/ARB_internalformat_query.xml

diff --git a/src/mapi/glapi/gen/ARB_internalformat_query.xml b/src/mapi/glapi/gen/ARB_internalformat_query.xml
new file mode 100644
index 0000000..70a2a31
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_internalformat_query.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_internalformat_query" number="112">
+    <!-- Other existing enums are reused for this extension. -->
+
+    <enum name="NUM_SAMPLE_COUNTS"                        value="0x9380"/>
+
+    <function name="GetInternalformativ" offset="assign" static_dispatch="false"
+              es2="3.0">
+        <param name="target" type="GLenum"/>
+        <param name="internalformat" type="GLenum"/>
+        <param name="pname" type="GLenum"/>
+        <param name="bufSize" type="GLsizei"/>
+        <param name="params" type="GLint *"/>
+    </function>
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a47316a..5d87210 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8296,14 +8296,14 @@
   </function>
 </category>
 
-<!-- ARB extensions #110...#112 -->
+<!-- ARB extensions #110...#116 -->
+
+<xi:include href="ARB_internalformat_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <category name="GL_ARB_map_buffer_alignment" number="113">
   <enum name="MIN_MAP_BUFFER_ALIGNMENT" value="0x90BC" />
 </category>
 
-<!-- ARB extensions #114...#116 -->
-
 <xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index da9ae71..a85b447 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -108,6 +108,7 @@ header = """/**
 #include "main/shaderapi.h"
 #include "main/uniforms.h"
 #include "main/syncobj.h"
+#include "main/formatquery.h"
 #include "main/dispatch.h"
 
 
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index a285559..39e08c8 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -895,6 +895,9 @@ const struct function gl_core_functions_possible[] = {
 // { "glTextureStorage2DMultisampleEXT", 43, -1 },      // XXX: Add to xml
 // { "glTextureStorage3DMultisampleEXT", 43, -1 },      // XXX: Add to xml
 
+   /* GL_ARB_internalformat_query */
+   { "glGetInternalformativ", 30, -1 },
+
    { NULL, 0, -1 }
 };
 
@@ -1314,8 +1317,7 @@ const struct function gles3_functions_possible[] = {
    // { "glGetInteger64i_v", 30, -1 },
    { "glGetInteger64v", 30, -1 },
    { "glGetIntegeri_v", 30, -1 },
-   // XXX: Missing implementation of ARB_internalformat_query
-   // { "glGetInternalformativ", 30, -1 },
+   { "glGetInternalformativ", 30, -1 },
    // XXX: Missing implementation of ARB_get_program_binary
    /// { "glGetProgramBinary", 30, -1 },
    { "glGetQueryiv", 30, -1 },
-- 
1.7.11.7



More information about the mesa-dev mailing list