[Mesa-dev] [PATCH v3 17/19] st/mesa: add compute program dispatch callbacks
Samuel Pitoiset
samuel.pitoiset at gmail.com
Sat Feb 13 16:10:14 UTC 2016
On 02/13/2016 05:06 PM, Roland Scheidegger wrote:
> Am 13.02.2016 um 16:56 schrieb Samuel Pitoiset:
>>
>>
>> On 02/13/2016 04:52 PM, Roland Scheidegger wrote:
>>> Am 10.02.2016 um 19:10 schrieb Samuel Pitoiset:
>>>> This state tracker implements DispatchCompute() and
>>>> DispatchComputeIndirect().
>>>>
>>>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>>>> Reviewed-by: Marek Olšák <marek.olsak at amd.com>
>>>> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
>>>> ---
>>>> src/mesa/Makefile.sources | 2 +
>>>> src/mesa/state_tracker/st_cb_compute.c | 85
>>>> ++++++++++++++++++++++++++++++++++
>>>> src/mesa/state_tracker/st_cb_compute.h | 38 +++++++++++++++
>>>> src/mesa/state_tracker/st_context.c | 2 +
>>>> 4 files changed, 127 insertions(+)
>>>> create mode 100644 src/mesa/state_tracker/st_cb_compute.c
>>>> create mode 100644 src/mesa/state_tracker/st_cb_compute.h
>>>>
>>>> diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
>>>> index 6669f29..f93c782 100644
>>>> --- a/src/mesa/Makefile.sources
>>>> +++ b/src/mesa/Makefile.sources
>>>> @@ -427,6 +427,8 @@ STATETRACKER_FILES = \
>>>> state_tracker/st_cb_bufferobjects.h \
>>>> state_tracker/st_cb_clear.c \
>>>> state_tracker/st_cb_clear.h \
>>>> + state_tracker/st_cb_compute.c \
>>>> + state_tracker/st_cb_compute.h \
>>>> state_tracker/st_cb_condrender.c \
>>>> state_tracker/st_cb_condrender.h \
>>>> state_tracker/st_cb_copyimage.c \
>>>> diff --git a/src/mesa/state_tracker/st_cb_compute.c
>>>> b/src/mesa/state_tracker/st_cb_compute.c
>>>> new file mode 100644
>>>> index 0000000..79a616c
>>>> --- /dev/null
>>>> +++ b/src/mesa/state_tracker/st_cb_compute.c
>>>> @@ -0,0 +1,85 @@
>>>> +/**************************************************************************
>>>>
>>>> + *
>>>> + * Copyright 2016 Samuel Pitoiset
>>>> + * All Rights Reserved.
>>>> + *
>>>> + * Permission is hereby granted, free of charge, to any person
>>>> obtaining a
>>>> + * copy of this software and associated documentation files (the
>>>> + * "Software"), to deal in the Software without restriction, including
>>>> + * without limitation the rights to use, copy, modify, merge, publish,
>>>> + * distribute, sub license, and/or sell copies of the Software, and to
>>>> + * permit persons to whom the Software is furnished to do so,
>>>> subject to
>>>> + * the following conditions:
>>>> + *
>>>> + * The above copyright notice and this permission notice (including the
>>>> + * next paragraph) shall be included in all copies or substantial
>>>> portions
>>>> + * of the Software.
>>>> + *
>>>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>>>> EXPRESS
>>>> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>>>> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>>>> NON-INFRINGEMENT.
>>>> + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
>>>> + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
>>>> CONTRACT,
>>>> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>>>> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>>> + *
>>>> +
>>>> **************************************************************************/
>>>>
>>>> +
>>>> +#include "main/state.h"
>>>> +#include "st_atom.h"
>>>> +#include "st_context.h"
>>>> +#include "st_cb_bufferobjects.h"
>>>> +#include "st_cb_compute.h"
>>>> +
>>>> +#include "pipe/p_context.h"
>>>> +
>>>> +static void st_dispatch_compute_common(struct gl_context *ctx,
>>>> + const GLuint *num_groups,
>>>> + struct pipe_resource *indirect,
>>>> + GLintptr indirect_offset)
>>>> +{
>>>> + struct gl_shader_program *prog =
>>>> + ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE];
>>>> + struct st_context *st = st_context(ctx);
>>>> + struct pipe_context *pipe = st->pipe;
>>>> + struct pipe_grid_info info = {};
>>> new msvc or not, this doesn't compile - empty initializers aren't valid
>>> c (in any version).
>>> gcc can warn about this but unfortunately I don't think a separate
>>> warning is available (requires something like -std=c99 -pedantic).
>>
>> Oops, sorry.
>>
>> I'm going to fix it right now.
>
> No problem. I didn't just fix it because I hoped someone might have an
> idea if gcc could maybe somehow be convinced to emit a warning, despite
> that I didn't find anything specific ;-).
> clang actually could emit a warning by the looks of it
> (-Wgnu-empty-initializer).
Yes, it would be good to make GCC warn. :-)
Fix pushed, thanks!
>
> Roland
>
>>>
>>>
>>>
>>>> +
>>>> + if (ctx->NewState)
>>>> + _mesa_update_state(ctx);
>>>> +
>>>> + if (st->dirty_cp.st || ctx->NewDriverState)
>>>> + st_validate_state(st, ST_PIPELINE_COMPUTE);
>>>> +
>>>> + for (unsigned i = 0; i < 3; i++) {
>>>> + info.block[i] = prog->Comp.LocalSize[i];
>>>> + info.grid[i] = num_groups ? num_groups[i] : 0;
>>>> + }
>>>> +
>>>> + if (indirect) {
>>>> + info.indirect = indirect;
>>>> + info.indirect_offset = indirect_offset;
>>>> + }
>>>> +
>>>> + pipe->launch_grid(pipe, &info);
>>>> +}
>>>> +
>>>> +static void st_dispatch_compute(struct gl_context *ctx,
>>>> + const GLuint *num_groups)
>>>> +{
>>>> + st_dispatch_compute_common(ctx, num_groups, NULL, 0);
>>>> +}
>>>> +
>>>> +static void st_dispatch_compute_indirect(struct gl_context *ctx,
>>>> + GLintptr indirect_offset)
>>>> +{
>>>> + struct gl_buffer_object *indirect_buffer =
>>>> ctx->DispatchIndirectBuffer;
>>>> + struct pipe_resource *indirect =
>>>> st_buffer_object(indirect_buffer)->buffer;
>>>> +
>>>> + st_dispatch_compute_common(ctx, NULL, indirect, indirect_offset);
>>>> +}
>>>> +
>>>> +void st_init_compute_functions(struct dd_function_table *functions)
>>>> +{
>>>> + functions->DispatchCompute = st_dispatch_compute;
>>>> + functions->DispatchComputeIndirect = st_dispatch_compute_indirect;
>>>> +}
>>>> diff --git a/src/mesa/state_tracker/st_cb_compute.h
>>>> b/src/mesa/state_tracker/st_cb_compute.h
>>>> new file mode 100644
>>>> index 0000000..78ec756
>>>> --- /dev/null
>>>> +++ b/src/mesa/state_tracker/st_cb_compute.h
>>>> @@ -0,0 +1,38 @@
>>>> +/**************************************************************************
>>>>
>>>> + *
>>>> + * Copyright 2016 Samuel Pitoiset
>>>> + * All Rights Reserved.
>>>> + *
>>>> + * Permission is hereby granted, free of charge, to any person
>>>> obtaining a
>>>> + * copy of this software and associated documentation files (the
>>>> + * "Software"), to deal in the Software without restriction, including
>>>> + * without limitation the rights to use, copy, modify, merge, publish,
>>>> + * distribute, sub license, and/or sell copies of the Software, and to
>>>> + * permit persons to whom the Software is furnished to do so,
>>>> subject to
>>>> + * the following conditions:
>>>> + *
>>>> + * The above copyright notice and this permission notice (including the
>>>> + * next paragraph) shall be included in all copies or substantial
>>>> portions
>>>> + * of the Software.
>>>> + *
>>>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>>>> EXPRESS
>>>> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>>>> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>>>> NON-INFRINGEMENT.
>>>> + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
>>>> + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
>>>> CONTRACT,
>>>> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>>>> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>>> + *
>>>> +
>>>> **************************************************************************/
>>>>
>>>> +
>>>> +#ifndef ST_CB_COMPUTE_H
>>>> +#define ST_CB_COMPUTE_H
>>>> +
>>>> +#include "main/compiler.h"
>>>> +
>>>> +struct dd_function_table;
>>>> +
>>>> +extern void
>>>> +st_init_compute_functions(struct dd_function_table *functions);
>>>> +
>>>> +#endif /* ST_CB_COMPUTE_H */
>>>> diff --git a/src/mesa/state_tracker/st_context.c
>>>> b/src/mesa/state_tracker/st_context.c
>>>> index 287a4ea..e469763 100644
>>>> --- a/src/mesa/state_tracker/st_context.c
>>>> +++ b/src/mesa/state_tracker/st_context.c
>>>> @@ -43,6 +43,7 @@
>>>> #include "st_cb_blit.h"
>>>> #include "st_cb_bufferobjects.h"
>>>> #include "st_cb_clear.h"
>>>> +#include "st_cb_compute.h"
>>>> #include "st_cb_condrender.h"
>>>> #include "st_cb_copyimage.h"
>>>> #include "st_cb_drawpixels.h"
>>>> @@ -510,6 +511,7 @@ void st_init_driver_functions(struct pipe_screen
>>>> *screen,
>>>> st_init_flush_functions(screen, functions);
>>>> st_init_string_functions(functions);
>>>> st_init_viewport_functions(functions);
>>>> + st_init_compute_functions(functions);
>>>>
>>>> st_init_xformfb_functions(functions);
>>>> st_init_syncobj_functions(functions);
>>>>
>>>
>
More information about the mesa-dev
mailing list