Merge pull request #233 from nwnk/glx-mesa-query-renderer-v9
Update GLX_MESA_query_renderer spec to v9
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index 8835b66..38f6c67 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -476,7 +476,6 @@
#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B
#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C
#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D
-#define GLX_RENDERER_ID_MESA 0x818E
typedef Bool ( *PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int *value);
typedef const char *( *PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute);
typedef Bool ( *PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display *dpy, int screen, int renderer, int attribute, unsigned int *value);
diff --git a/extensions/MESA/GLX_MESA_query_renderer.txt b/extensions/MESA/GLX_MESA_query_renderer.txt
index d8ed446..10f68ec 100644
--- a/extensions/MESA/GLX_MESA_query_renderer.txt
+++ b/extensions/MESA/GLX_MESA_query_renderer.txt
@@ -20,7 +20,7 @@
Version
- Version 8, 14-February-2014
+ Version 9, 09 November 2018
Number
@@ -32,9 +32,6 @@
GLX_ARB_create_context and GLX_ARB_create_context_profile are required.
- This extension interacts with GLX_EXT_create_context_es2_profile and
- GLX_EXT_create_context_es_profile.
-
Overview
In many situations, applications want to detect characteristics of a
@@ -95,18 +92,13 @@
GLX_RENDERER_VENDOR_ID_MESA
GLX_RENDERER_DEVICE_ID_MESA
- Accepted as an attribute name in <*attrib_list> in
- glXCreateContextAttribsARB:
-
- GLX_RENDERER_ID_MESA 0x818E
-
Additions to the OpenGL / WGL Specifications
None. This specification is written for GLX.
Additions to the GLX 1.4 Specification
- [Add the following to Section X.Y.Z of the GLX Specification]
+ [Add to Section 3.3.2 "GLX Versioning" of the GLX Specification]
To obtain information about the available renderers for a particular
display and screen,
@@ -206,29 +198,6 @@
format as the string that would be returned by glGetString of GL_RENDERER.
It may, however, have a different value.
-
- [Add to section section 3.3.7 "Rendering Contexts"]
-
- The attribute name GLX_RENDERER_ID_MESA specified the index of the render
- against which the context should be created. The default value of
- GLX_RENDERER_ID_MESA is 0.
-
-
- [Add to list of errors for glXCreateContextAttribsARB in section section
- 3.3.7 "Rendering Contexts"]
-
- * If the value of GLX_RENDERER_ID_MESA specifies a non-existent
- renderer, BadMatch is generated.
-
-Dependencies on GLX_EXT_create_context_es_profile and
-GLX_EXT_create_context_es2_profile
-
- If neither extension is supported, remove all mention of
- GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA from the spec.
-
- If GLX_EXT_create_context_es_profile is not supported, remove all mention of
- GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA from the spec.
-
Issues
1) How should the difference between on-card and GART memory be exposed?
@@ -408,3 +377,9 @@
read GLX_RENDERER_ID_MESA. The VENDOR/DEVICE_ID
example given in issue #17 should be 0x5143 and
0xFFFFFFFF respectively.
+
+ Version 9, 2018/11/09 - Remove GLX_RENDERER_ID_MESA, which has never been
+ implemented. Remove the unnecessary interactions
+ with the GLX GLES profile extensions. Note the
+ official GL extension number. Specify the section
+ of the GLX spec to modify.
diff --git a/xml/glx.xml b/xml/glx.xml
index f903576..810d55f 100644
--- a/xml/glx.xml
+++ b/xml/glx.xml
@@ -583,8 +583,7 @@
<enum value="0x818B" name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>
<enum value="0x818C" name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>
<enum value="0x818D" name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>
- <enum value="0x818E" name="GLX_RENDERER_ID_MESA"/>
- <unused start="0x818F"/>
+ <unused start="0x818E" end="0x818F"/>
</enums>
<!-- Please remember that new enumerant allocations must be obtained by
@@ -1898,7 +1897,6 @@
<enum name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>
<enum name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>
<enum name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>
- <enum name="GLX_RENDERER_ID_MESA"/>
<command name="glXQueryCurrentRendererIntegerMESA"/>
<command name="glXQueryCurrentRendererStringMESA"/>
<command name="glXQueryRendererIntegerMESA"/>
