Mesa (master): clover: add support for drivers having no proper binary format

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c8cd8e279de97913c2b9ce1bd17f96de0c263ae8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8cd8e279de97913c2b9ce1bd17f96de0c263ae8

Author: Karol Herbst <kherbst at redhat.com>
Date:   Fri May 10 09:24:42 2019 +0200

clover: add support for drivers having no proper binary format

Most drivers have actually no binary format and just store the IR directly
as a single entry point blob.

v2: add a cap to switch between single or multi entry point binaries
v3: remove the entry_point field
v4: remove PIPE_CAP_MULTI_ENTRY_POINT_BINARIES
v5: remove supports_multiple_entry_points

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Pierre Moreau <pierre.morrow at free.fr>

---

 src/gallium/state_trackers/clover/core/kernel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/clover/core/kernel.cpp b/src/gallium/state_trackers/clover/core/kernel.cpp
index 7fe66ae4ea2..3cffec320e1 100644
--- a/src/gallium/state_trackers/clover/core/kernel.cpp
+++ b/src/gallium/state_trackers/clover/core/kernel.cpp
@@ -161,8 +161,9 @@ kernel::exec_context::bind(intrusive_ptr<command_queue> _q,
 
    // Bind kernel arguments.
    auto &m = kern.program().build(q->device()).binary;
-   auto margs = find(name_equals(kern.name()), m.syms).args;
-   auto msec = find(type_equals(module::section::text_executable), m.secs);
+   auto msym = find(name_equals(kern.name()), m.syms);
+   auto margs = msym.args;
+   auto msec = find(id_equals(msym.section), m.secs);
    auto explicit_arg = kern._args.begin();
 
    for (auto &marg : margs) {