Commit b7a85bee authored by Ilia Mirkin's avatar Ilia Mirkin

st/mesa: add ARB_pipeline_statistics_query support

Signed-off-by: Ilia Mirkin's avatarIlia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
parent e206785b
......@@ -45,7 +45,7 @@ Note: some of the new features are only available with certain drivers.
<ul>
<li>GL_AMD_pinned_memory on r600, radeonsi</li>
<li>GL_ARB_pipeline_statistics_query on i965</li>
<li>GL_ARB_pipeline_statistics_query on i965, nvc0, r600, radeonsi, softpipe</li>
</ul>
<h2>Bug fixes</h2>
......
......@@ -110,6 +110,19 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
else
type = PIPE_QUERY_TIMESTAMP;
break;
case GL_VERTICES_SUBMITTED_ARB:
case GL_PRIMITIVES_SUBMITTED_ARB:
case GL_VERTEX_SHADER_INVOCATIONS_ARB:
case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
case GL_GEOMETRY_SHADER_INVOCATIONS:
case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB:
case GL_FRAGMENT_SHADER_INVOCATIONS_ARB:
case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
type = PIPE_QUERY_PIPELINE_STATISTICS;
break;
default:
assert(0 && "unexpected query target in st_BeginQuery()");
return;
......@@ -178,6 +191,8 @@ get_query_result(struct pipe_context *pipe,
struct st_query_object *stq,
boolean wait)
{
union pipe_query_result data;
if (!stq->pq) {
/* Only needed in case we failed to allocate the gallium query earlier.
* Return TRUE so we don't spin on this forever.
......@@ -185,11 +200,46 @@ get_query_result(struct pipe_context *pipe,
return TRUE;
}
if (!pipe->get_query_result(pipe,
stq->pq,
wait,
(void *)&stq->base.Result)) {
if (!pipe->get_query_result(pipe, stq->pq, wait, &data))
return FALSE;
switch (stq->base.Target) {
case GL_VERTICES_SUBMITTED_ARB:
stq->base.Result = data.pipeline_statistics.ia_vertices;
break;
case GL_PRIMITIVES_SUBMITTED_ARB:
stq->base.Result = data.pipeline_statistics.ia_primitives;
break;
case GL_VERTEX_SHADER_INVOCATIONS_ARB:
stq->base.Result = data.pipeline_statistics.vs_invocations;
break;
case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
stq->base.Result = data.pipeline_statistics.hs_invocations;
break;
case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
stq->base.Result = data.pipeline_statistics.ds_invocations;
break;
case GL_GEOMETRY_SHADER_INVOCATIONS:
stq->base.Result = data.pipeline_statistics.gs_invocations;
break;
case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB:
stq->base.Result = data.pipeline_statistics.gs_primitives;
break;
case GL_FRAGMENT_SHADER_INVOCATIONS_ARB:
stq->base.Result = data.pipeline_statistics.ps_invocations;
break;
case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
stq->base.Result = data.pipeline_statistics.cs_invocations;
break;
case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
stq->base.Result = data.pipeline_statistics.c_invocations;
break;
case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
stq->base.Result = data.pipeline_statistics.c_primitives;
break;
default:
stq->base.Result = data.u64;
break;
}
if (stq->base.Target == GL_TIME_ELAPSED &&
......
......@@ -426,6 +426,7 @@ void st_init_extensions(struct pipe_screen *screen,
{ o(ARB_instanced_arrays), PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR },
{ o(ARB_occlusion_query), PIPE_CAP_OCCLUSION_QUERY },
{ o(ARB_occlusion_query2), PIPE_CAP_OCCLUSION_QUERY },
{ o(ARB_pipeline_statistics_query), PIPE_CAP_QUERY_PIPELINE_STATISTICS },
{ o(ARB_point_sprite), PIPE_CAP_POINT_SPRITE },
{ o(ARB_seamless_cube_map), PIPE_CAP_SEAMLESS_CUBE_MAP },
{ o(ARB_shader_stencil_export), PIPE_CAP_SHADER_STENCIL_EXPORT },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment