diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index dd643840d98..15dca48fbc0 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -1330,14 +1330,6 @@ nv50_set_shader_images(struct pipe_context *pipe, nv50_context(pipe)->dirty_cp |= NV50_NEW_CP_SURFACES; } -static void -nv50_set_compute_resources(struct pipe_context *pipe, - unsigned start, unsigned nr, - struct pipe_surface **resources) -{ - /* TODO: bind surfaces */ -} - static bool nv50_bind_buffers_range(struct nv50_context *nv50, unsigned start, unsigned nr, @@ -1523,7 +1515,6 @@ nv50_init_state_functions(struct nv50_context *nv50) pipe->set_stream_output_targets = nv50_set_stream_output_targets; pipe->set_global_binding = nv50_set_global_bindings; - pipe->set_compute_resources = nv50_set_compute_resources; pipe->set_shader_images = nv50_set_shader_images; pipe->set_shader_buffers = nv50_set_shader_buffers; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index 8b124a9d6b4..0be07ec11e6 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -1208,16 +1208,6 @@ nvc0_bind_surfaces_range(struct nvc0_context *nvc0, const unsigned t, nouveau_bufctx_reset(nvc0->bufctx_cp, NVC0_BIND_CP_SUF); } -static void -nvc0_set_compute_resources(struct pipe_context *pipe, - unsigned start, unsigned nr, - struct pipe_surface **resources) -{ - nvc0_bind_surfaces_range(nvc0_context(pipe), 1, start, nr, resources); - - nvc0_context(pipe)->dirty_cp |= NVC0_NEW_CP_SURFACES; -} - static bool nvc0_bind_images_range(struct nvc0_context *nvc0, const unsigned s, unsigned start, unsigned nr, @@ -1524,7 +1514,6 @@ nvc0_init_state_functions(struct nvc0_context *nvc0) pipe->set_stream_output_targets = nvc0_set_transform_feedback_targets; pipe->set_global_binding = nvc0_set_global_bindings; - pipe->set_compute_resources = nvc0_set_compute_resources; pipe->set_shader_images = nvc0_set_shader_images; pipe->set_shader_buffers = nvc0_set_shader_buffers; diff --git a/src/gallium/drivers/svga/svga_pipe_cs.c b/src/gallium/drivers/svga/svga_pipe_cs.c index ba58defcdb2..f3432cac0a4 100644 --- a/src/gallium/drivers/svga/svga_pipe_cs.c +++ b/src/gallium/drivers/svga/svga_pipe_cs.c @@ -114,21 +114,6 @@ svga_delete_compute_state(struct pipe_context *pipe, void *shader) } -/** - * Bind an array of shader resources that will be used by the - * compute program. Any resources that were previously bound to - * the specified range will be unbound after this call. - */ -static void -svga_set_compute_resources(struct pipe_context *pipe, - unsigned start, unsigned count, - struct pipe_surface **resources) -{ - //TODO - return; -} - - /** * Bind an array of buffers to be mapped into the address space of * the GLOBAL resource. Any buffers that were previously bound @@ -221,7 +206,6 @@ svga_init_cs_functions(struct svga_context *svga) svga->pipe.create_compute_state = svga_create_compute_state; svga->pipe.bind_compute_state = svga_bind_compute_state; svga->pipe.delete_compute_state = svga_delete_compute_state; - svga->pipe.set_compute_resources = svga_set_compute_resources; svga->pipe.set_global_binding = svga_set_global_binding; svga->pipe.launch_grid = svga_launch_grid; } diff --git a/src/gallium/drivers/tegra/tegra_context.c b/src/gallium/drivers/tegra/tegra_context.c index 884f848f217..467c3a12339 100644 --- a/src/gallium/drivers/tegra/tegra_context.c +++ b/src/gallium/drivers/tegra/tegra_context.c @@ -1068,18 +1068,6 @@ tegra_delete_compute_state(struct pipe_context *pcontext, void *so) context->gpu->delete_compute_state(context->gpu, so); } -static void -tegra_set_compute_resources(struct pipe_context *pcontext, - unsigned int start, unsigned int count, - struct pipe_surface **resources) -{ - struct tegra_context *context = to_tegra_context(pcontext); - - /* XXX unwrap resources */ - - context->gpu->set_compute_resources(context->gpu, start, count, resources); -} - static void tegra_set_global_binding(struct pipe_context *pcontext, unsigned int first, unsigned int count, struct pipe_resource **resources, @@ -1402,7 +1390,6 @@ tegra_screen_context_create(struct pipe_screen *pscreen, void *priv, context->base.create_compute_state = tegra_create_compute_state; context->base.bind_compute_state = tegra_bind_compute_state; context->base.delete_compute_state = tegra_delete_compute_state; - context->base.set_compute_resources = tegra_set_compute_resources; context->base.set_global_binding = tegra_set_global_binding; context->base.launch_grid = tegra_launch_grid; context->base.get_sample_position = tegra_get_sample_position;