From a8fc40aaf54c6e24ab66c8b2ad27713338c786bb Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 23 Jul 2019 08:28:23 -0700 Subject: [PATCH] panfrost: Stub out compute CSO Doesn't do anything, just gets the functions there. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/meson.build | 1 + src/gallium/drivers/panfrost/pan_compute.c | 62 ++++++++++++++++++++++ src/gallium/drivers/panfrost/pan_context.c | 1 + src/gallium/drivers/panfrost/pan_context.h | 4 ++ 4 files changed, 68 insertions(+) create mode 100644 src/gallium/drivers/panfrost/pan_compute.c diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index a050a286d5e..1efe11f4962 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -43,6 +43,7 @@ files_panfrost = files( 'pan_blending.c', 'pan_blend_shaders.c', 'pan_blend_cso.c', + 'pan_compute.c', 'pan_fragment.c', 'pan_invocation.c', 'pan_instancing.c', diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c new file mode 100644 index 00000000000..14fc27eae70 --- /dev/null +++ b/src/gallium/drivers/panfrost/pan_compute.c @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2019 Collabora, Ltd. + * + * 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, sublicense, + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Authors (Collabora): + * Alyssa Rosenzweig + * + */ + +#include "pan_context.h" +#include "util/u_memory.h" + +static void * +panfrost_create_compute_state( + struct pipe_context *pctx, + const struct pipe_compute_state *cso) +{ + return mem_dup(cso, sizeof(*cso)); +} + +static void +panfrost_bind_compute_state(struct pipe_context *pipe, void *cso) +{ + struct pipe_compute_state *state = (struct pipe_compute_state *) cso; + + printf("Binding compute %p\n", state); + /* Stub */ +} + +static void +panfrost_delete_compute_state(struct pipe_context *pipe, void *cso) +{ + free(cso); +} + +void +panfrost_compute_context_init(struct pipe_context *pctx) +{ + pctx->create_compute_state = panfrost_create_compute_state; + pctx->bind_compute_state = panfrost_bind_compute_state; + pctx->delete_compute_state = panfrost_delete_compute_state; +} + + diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 9447c1690b5..ab422ec6912 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -2774,6 +2774,7 @@ panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags) panfrost_resource_context_init(gallium); panfrost_blend_context_init(gallium); + panfrost_compute_context_init(gallium); panfrost_drm_init_context(ctx); diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h index e6d6ec48cc2..fd8c817216a 100644 --- a/src/gallium/drivers/panfrost/pan_context.h +++ b/src/gallium/drivers/panfrost/pan_context.h @@ -352,5 +352,9 @@ panfrost_padded_vertex_count( unsigned pan_expand_shift_odd(struct pan_shift_odd o); +/* Compute */ + +void +panfrost_compute_context_init(struct pipe_context *pctx); #endif -- 2.30.2