diff options
| author | Ben Widawsky <[email protected]> | 2015-01-02 12:13:53 -0800 |
|---|---|---|
| committer | Ben Widawsky <[email protected]> | 2015-02-17 23:01:11 -0800 |
| commit | 86ffc36d3c971417e1c38b29c3b7863368b5c6d9 (patch) | |
| tree | 67f98409e5c1fbc33ff21f0736e348d13311e242 /src/mapi | |
| parent | 2cd2831500443dc9ff4ea0bf645713c1f9da57d0 (diff) | |
mesa: Add support for the ARB_pipeline_statistics_query extension
This was originally part of a single patch which added the extension, and
implemented it for i965 classic. For information about the evolution of the
patch, please see the subsequent commit.
One difference here as compared to the original mega patch is this does build
support for the compute shader query. Since it cannot be tested on any platform,
it will always return NULL for now. Jordan has already written a patch to
address this, and when that patch lands, this logic can be modified.
v2: Fix typo in subject (Brian Paul)
Add checks for desktop gl (Ilia)
Fail for any callers for now (Ilia)
Update QueryCounterBits for new tokens (Ilia)
Jordan: Use _mesa_has_compute_shaders
Signed-off-by: Ben Widawsky <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
v3: Rebased on patch which adds the proper information to unstub tessellation
shaders.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml | 24 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 3 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml b/src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml new file mode 100644 index 00000000000..5e85117839e --- /dev/null +++ b/src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<!-- Note: no GLX protocol info yet. --> + +<OpenGLAPI> + +<category name="GL_ARB_pipeline_statistics_query" number="171"> + + <enum name="VERTICES_SUBMITTED_ARB" value="0x82EE"/> + <enum name="PRIMITIVES_SUBMITTED_ARB" value="0x82EF"/> + <enum name="VERTEX_SHADER_INVOCATIONS_ARB" value="0x82F0"/> + <enum name="TESS_CONTROL_SHADER_PATCHES_ARB" value="0x82F1"/> + <enum name="TESS_EVALUATION_SHADER_INVOCATIONS_ARB" value="0x82F2"/> + <!-- <enum name="GEOMETRY_SHADER_INVOCATIONS" value="0x887F"/> --> + <enum name="GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB" value="0x82F3"/> + <enum name="FRAGMENT_SHADER_INVOCATIONS_ARB" value="0x82F4"/> + <enum name="COMPUTE_SHADER_INVOCATIONS_ARB" value="0x82F5"/> + <enum name="CLIPPING_INPUT_PRIMITIVES_ARB" value="0x82F6"/> + <enum name="CLIPPING_OUTPUT_PRIMITIVES_ARB" value="0x82F7"/> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 35d9d011f46..28973c49f1c 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -138,6 +138,7 @@ API_XML = \ ARB_invalidate_subdata.xml \ ARB_map_buffer_range.xml \ ARB_multi_bind.xml \ + ARB_pipeline_statistics_query.xml \ ARB_robustness.xml \ ARB_sample_shading.xml \ ARB_sampler_objects.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index cc8aaf34e8a..41b34014f1d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8389,6 +8389,9 @@ <xi:include href="KHR_context_flush_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extension 171 --> +<xi:include href="ARB_pipeline_statistics_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <!-- Non-ARB extensions sorted by extension number. --> <category name="GL_EXT_blend_color" number="2"> |