diff options
author | Brian Paul <brianp@vmware.com> | 2013-09-16 10:21:07 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2013-09-16 10:21:56 -0600 |
commit | 932f9f3abcb0b86c5035bf15323c6cfbda092458 (patch) | |
tree | ce23fd06ebcf7974cc8f51e4b4201f6f69feb858 | |
parent | ce74369c073f1bfe22613a1878476da873212bbb (diff) |
clover: remove bind_compute_sampler_states() callsgallium-bind-sampler-states
NOTE: this patch should be move/rebased earlier in the series
before pushing to master.
-rw-r--r-- | src/gallium/state_trackers/clover/core/kernel.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/clover/core/kernel.cpp b/src/gallium/state_trackers/clover/core/kernel.cpp index 6c166fbba5..53714b4283 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(); } |