summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-09-16 10:21:07 -0600
committerBrian Paul <[email protected]>2013-10-03 14:05:27 -0600
commit93e6694f2cdc3a93d1f33d178639aadfa7edb431 (patch)
tree18958df25842a11d308af621050496ccec51259d
parenta5350a9f3efc0cf45ecb27cba8deedf9488f073b (diff)
clover: remove bind_compute_sampler_states() calls
-rw-r--r--src/gallium/state_trackers/clover/core/kernel.cpp14
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 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();
}