From 93e6694f2cdc3a93d1f33d178639aadfa7edb431 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Sep 2013 10:21:07 -0600 Subject: clover: remove bind_compute_sampler_states() calls --- src/gallium/state_trackers/clover/core/kernel.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/gallium/state_trackers/clover/core/kernel.cpp b/src/gallium/state_trackers/clover/core/kernel.cpp index 6c166fbba54..53714b4283c 100644 --- a/src/gallium/state_trackers/clover/core/kernel.cpp +++ b/src/gallium/state_trackers/clover/core/kernel.cpp @@ -71,13 +71,10 @@ _cl_kernel::launch(clover::command_queue &q, exec.g_handles.begin(), exec.g_handles.end()); q.pipe->bind_compute_state(q.pipe, st); - if (q.pipe->bind_sampler_states) - q.pipe->bind_sampler_states(q.pipe, PIPE_SHADER_COMPUTE, - 0, exec.samplers.size(), - exec.samplers.data()); - else - q.pipe->bind_compute_sampler_states(q.pipe, 0, exec.samplers.size(), - exec.samplers.data()); + q.pipe->bind_sampler_states(q.pipe, PIPE_SHADER_COMPUTE, + 0, exec.samplers.size(), + exec.samplers.data()); + q.pipe->set_compute_sampler_views(q.pipe, 0, exec.sviews.size(), exec.sviews.data()); q.pipe->set_compute_resources(q.pipe, 0, exec.resources.size(), @@ -94,7 +91,8 @@ _cl_kernel::launch(clover::command_queue &q, q.pipe->set_global_binding(q.pipe, 0, exec.g_buffers.size(), NULL, NULL); q.pipe->set_compute_resources(q.pipe, 0, exec.resources.size(), NULL); q.pipe->set_compute_sampler_views(q.pipe, 0, exec.sviews.size(), NULL); - q.pipe->bind_compute_sampler_states(q.pipe, 0, exec.samplers.size(), NULL); + q.pipe->bind_sampler_states(q.pipe, PIPE_SHADER_COMPUTE, 0, + exec.samplers.size(), NULL); exec.unbind(); } -- cgit v1.2.3