Mesa (master): clover: use PIPE_SHADER_CAP_SUPPORTED_IRS to discover IR

[Timothy Arceri]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Feb  9 12:03:57 2018 +1100

clover: use PIPE_SHADER_CAP_SUPPORTED_IRS to discover IR

PIPE_SHADER_CAP_PREFERRED_IR was conflicting with PIPE_SHADER_IR_NIR
for compute shaders, so we let clover pick the one it wants to use.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/state_trackers/clover/core/device.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/state_trackers/clover/core/device.cpp
index 9dd7eed3f1..71cf4bf60a 100644
--- a/src/gallium/state_trackers/clover/core/device.cpp
+++ b/src/gallium/state_trackers/clover/core/device.cpp
@@ -243,8 +243,15 @@ device::vendor_name() const {
 
 enum pipe_shader_ir
 device::ir_format() const {
-   return (enum pipe_shader_ir) pipe->get_shader_param(
-      pipe, PIPE_SHADER_COMPUTE, PIPE_SHADER_CAP_PREFERRED_IR);
+   int supported_irs =
+      pipe->get_shader_param(pipe, PIPE_SHADER_COMPUTE,
+                             PIPE_SHADER_CAP_SUPPORTED_IRS);
+
+   if (supported_irs & (1 << PIPE_SHADER_IR_NATIVE)) {
+      return PIPE_SHADER_IR_NATIVE;
+   }
+
+   return PIPE_SHADER_IR_TGSI;
 }
 
 std::string