[Mesa-dev] [PATCH 9/9] st/mesa: add query buffer support
Nicolai Hähnle
nhaehnle at gmail.com
Mon Jan 11 10:58:04 PST 2016
On 10.01.2016 00:14, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
> src/mesa/state_tracker/st_cb_bufferobjects.c | 3 +
> src/mesa/state_tracker/st_cb_queryobj.c | 100 +++++++++++++++++++++++++-
> src/mesa/state_tracker/st_cb_texturebarrier.c | 3 +
> src/mesa/state_tracker/st_extensions.c | 1 +
> 4 files changed, 105 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
> index 8ca7e4c..86a09fe 100644
> --- a/src/mesa/state_tracker/st_cb_bufferobjects.c
> +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
> @@ -231,6 +231,9 @@ st_bufferobj_data(struct gl_context *ctx,
> case GL_PARAMETER_BUFFER_ARB:
> bind = PIPE_BIND_COMMAND_ARGS_BUFFER;
> break;
> + case GL_QUERY_BUFFER:
> + bind = PIPE_BIND_QUERY_BUFFER;
> + break;
> default:
> bind = 0;
> }
> diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
> index aafae16..e39341c 100644
> --- a/src/mesa/state_tracker/st_cb_queryobj.c
> +++ b/src/mesa/state_tracker/st_cb_queryobj.c
> @@ -39,9 +39,11 @@
> #include "pipe/p_context.h"
> #include "pipe/p_defines.h"
> #include "pipe/p_screen.h"
> +#include "util/u_inlines.h"
> #include "st_context.h"
> #include "st_cb_queryobj.h"
> #include "st_cb_bitmap.h"
> +#include "st_cb_bufferobjects.h"
>
>
> static struct gl_query_object *
> @@ -94,7 +96,8 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
> switch (q->Target) {
> case GL_ANY_SAMPLES_PASSED:
> case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
> - /* fall-through */
> + type = PIPE_QUERY_OCCLUSION_PREDICATE;
> + break;
> case GL_SAMPLES_PASSED_ARB:
> type = PIPE_QUERY_OCCLUSION_COUNTER;
> break;
This looks like a useful but unrelated change, could you separate it out?
Cheers,
Nicolai
> @@ -271,7 +274,7 @@ st_WaitQuery(struct gl_context *ctx, struct gl_query_object *q)
> {
> /* nothing */
> }
> -
> +
> q->Ready = GL_TRUE;
> }
>
> @@ -303,6 +306,98 @@ st_GetTimestamp(struct gl_context *ctx)
> }
> }
>
> +static void
> +st_StoreQueryResult(struct gl_context *ctx, struct gl_query_object *q,
> + struct gl_buffer_object *buf, intptr_t offset,
> + GLenum pname, GLenum ptype)
> +{
> + struct pipe_context *pipe = st_context(ctx)->pipe;
> + struct st_query_object *stq = st_query_object(q);
> + struct st_buffer_object *stObj = st_buffer_object(buf);
> + boolean wait = pname == GL_QUERY_RESULT;
> + unsigned result_type;
> + int index;
> +
> + /* GL_QUERY_TARGET is a bit of an extension since it has nothing to
> + * do with the GPU end of the query. Write it in "by hand".
> + */
> + if (pname == GL_QUERY_TARGET) {
> + /* Assume that the data must be LE. The endianness situation wrt CPU and
> + * GPU is incredibly confusing, but the vast majority of GPUs are
> + * LE. When a BE one comes along, this needs some form of resolution.
> + */
> + unsigned data[2] = { CPU_TO_LE32(q->Target), 0 };
> + pipe_buffer_write(pipe, stObj->buffer, offset,
> + (ptype == GL_INT64_ARB ||
> + ptype == GL_UNSIGNED_INT64_ARB) ? 8 : 4,
> + data);
> + return;
> + }
> +
> + switch (ptype) {
> + case GL_INT:
> + result_type = 0;
> + break;
> + case GL_UNSIGNED_INT:
> + result_type = 1;
> + break;
> + case GL_INT64_ARB:
> + result_type = 2;
> + break;
> + case GL_UNSIGNED_INT64_ARB:
> + result_type = 3;
> + break;
> + default:
> + unreachable("Unexpected result type");
> + }
> +
> + if (pname == GL_QUERY_RESULT_AVAILABLE) {
> + index = -1;
> + } else if (stq->type == PIPE_QUERY_PIPELINE_STATISTICS) {
> + switch (q->Target) {
> + case GL_VERTICES_SUBMITTED_ARB:
> + index = 0;
> + break;
> + case GL_PRIMITIVES_SUBMITTED_ARB:
> + index = 1;
> + break;
> + case GL_VERTEX_SHADER_INVOCATIONS_ARB:
> + index = 2;
> + break;
> + case GL_GEOMETRY_SHADER_INVOCATIONS:
> + index = 3;
> + break;
> + case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB:
> + index = 4;
> + break;
> + case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
> + index = 5;
> + break;
> + case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
> + index = 6;
> + break;
> + case GL_FRAGMENT_SHADER_INVOCATIONS_ARB:
> + index = 7;
> + break;
> + case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
> + index = 8;
> + break;
> + case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
> + index = 9;
> + break;
> + case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
> + index = 10;
> + break;
> + default:
> + unreachable("Unexpected target");
> + }
> + } else {
> + index = 0;
> + }
> +
> + pipe->get_query_result_resource(pipe, stq->pq, wait, result_type, index,
> + stObj->buffer, offset);
> +}
>
> void st_init_query_functions(struct dd_function_table *functions)
> {
> @@ -313,4 +408,5 @@ void st_init_query_functions(struct dd_function_table *functions)
> functions->WaitQuery = st_WaitQuery;
> functions->CheckQuery = st_CheckQuery;
> functions->GetTimestamp = st_GetTimestamp;
> + functions->StoreQueryResult = st_StoreQueryResult;
> }
> diff --git a/src/mesa/state_tracker/st_cb_texturebarrier.c b/src/mesa/state_tracker/st_cb_texturebarrier.c
> index dd4dde7..588a46c 100644
> --- a/src/mesa/state_tracker/st_cb_texturebarrier.c
> +++ b/src/mesa/state_tracker/st_cb_texturebarrier.c
> @@ -66,6 +66,9 @@ st_MemoryBarrier(struct gl_context *ctx, GLbitfield barriers)
> if (barriers & GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT)
> flags |= PIPE_BARRIER_MAPPED_BUFFER;
>
> + if (barriers & GL_QUERY_BUFFER_BARRIER_BIT)
> + flags |= PIPE_BARRIER_QUERY_BUFFER;
> +
> if (flags && pipe->memory_barrier)
> pipe->memory_barrier(pipe, flags);
> }
> diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
> index 2a3e523..de4d4f6 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -464,6 +464,7 @@ void st_init_extensions(struct pipe_screen *screen,
> { 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_query_buffer_object), PIPE_CAP_QUERY_BUFFER_OBJECT },
> { o(ARB_sample_shading), PIPE_CAP_SAMPLE_SHADING },
> { o(ARB_seamless_cube_map), PIPE_CAP_SEAMLESS_CUBE_MAP },
> { o(ARB_shader_draw_parameters), PIPE_CAP_DRAW_PARAMETERS },
>
More information about the mesa-dev
mailing list