From f44779d7eb1e19034ef96366b29fe01ec58e514b Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Tue, 10 Mar 2020 18:19:15 +0100
Subject: [PATCH] vtn/opencl: fully enable OpenCLstd_Clz

Fixes: 7325f6ac987 ("vtn/opencl: add clz support")
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4318>
(cherry picked from commit 4821ec6d8fcd0287ee9ea5afdd922da5ab787900)
---
 .pick_status.json               | 2 +-
 src/compiler/spirv/vtn_opencl.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 182e189acf6..2b2161b7a84 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -769,7 +769,7 @@
         "description": "vtn/opencl: fully enable OpenCLstd_Clz",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "7325f6ac987d295b101372bffcb98799251fe678"
     },
diff --git a/src/compiler/spirv/vtn_opencl.c b/src/compiler/spirv/vtn_opencl.c
index 81328d23854..55980fd72ff 100644
--- a/src/compiler/spirv/vtn_opencl.c
+++ b/src/compiler/spirv/vtn_opencl.c
@@ -388,6 +388,7 @@ vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
    case OpenCLstd_Smoothstep:
    case OpenCLstd_S_Upsample:
    case OpenCLstd_U_Upsample:
+   case OpenCLstd_Clz:
       handle_instr(b, ext_opcode, w, count, handle_special);
       return true;
    case OpenCLstd_Vloadn: