Mesa (staging/19.2): tgsi_to_nir: handle PIPE_FORMAT_NONE in image opcodes

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 0e7e56aa2fdb13aedd618d2d6227662579f04169
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e7e56aa2fdb13aedd618d2d6227662579f04169

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Sep 16 21:19:44 2019 -0400

tgsi_to_nir: handle PIPE_FORMAT_NONE in image opcodes

radeonsi doesn't use the format and internal shaders don't set it.

Reviewed-By: Timur Kristóf <timur.kristof at gmail.com>
(cherry picked from commit f704fb7f0ba5c230ec9558621484acebb927a315)
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2112

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 63e62f13266..df6726d59a8 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1727,6 +1727,9 @@ static GLenum
 get_image_format(struct tgsi_full_instruction *tgsi_inst)
 {
    switch (tgsi_inst->Memory.Format) {
+   case PIPE_FORMAT_NONE:
+      return GL_NONE;
+
    case PIPE_FORMAT_R8_UNORM:
       return GL_R8;
    case PIPE_FORMAT_R8G8_UNORM: