XXX: Various clover fixes

3 files changed, 2 insertions, 3 deletions

diff --git a/src/gallium/state_trackers/clover/api/kernel.cpp b/src/gallium/state_trackers/clover/api/kernel.cpp
index ab4982d2951..4ab5e9a7473 100644
--- a/src/gallium/state_trackers/clover/api/kernel.cpp
+++ b/src/gallium/state_trackers/clover/api/kernel.cpp
@@ -277,7 +277,7 @@ clEnqueueNDRangeKernel(cl_command_queue q, cl_kernel kern,
                        cl_event *ev) try {
    const std::vector<size_t> grid_offset = opt_vector(pgrid_offset, dims);
    const std::vector<size_t> grid_size = opt_vector(pgrid_size, dims);
-   const std::vector<size_t> block_size = opt_vector(pblock_size, dims);
+   const std::vector<size_t> block_size = pblock_size ? opt_vector(pblock_size, dims) : std::vector<size_t>(dims, 1);
 
    kernel_validate(q, kern, dims, pgrid_offset, pgrid_size, pblock_size,
                    num_deps, deps, ev);
diff --git a/src/gallium/state_trackers/clover/core/kernel.cpp b/src/gallium/state_trackers/clover/core/kernel.cpp
index 7f1a158c22b..6fa8bd63453 100644
--- a/src/gallium/state_trackers/clover/core/kernel.cpp
+++ b/src/gallium/state_trackers/clover/core/kernel.cpp
@@ -156,7 +156,6 @@ _cl_kernel::exec_context::bind(clover::command_queue *__q) {
       cs.prog = kern.module(*q).sec(module::section::text).data.begin();
       cs.req_local_mem = mem_local;
       cs.req_input_mem = input.size();
-      cs.entry_symbol = kern.name().data();
       st = q->pipe->create_compute_state(q->pipe, &cs);
    }
 
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 115c38d484b..6ab9025f209 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -234,7 +234,7 @@ namespace {
             }
          }
 
-         m.syms.push_back(module::symbol(kernel_name, 0, 0, args ));
+         m.syms.push_back(module::symbol(kernel_name, 0, i, args ));
       }
 
       header.num_bytes = llvm_bitcode.size();