glsl: fix buffer texture type

Fixes: 3ace6b968b3 ("compiler/types: Add a texture type")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19381>
(cherry picked from commit 87526f79db68a13ebd448cfd6b1be4b25616c801)

diff --git a/.pick_status.json b/.pick_status.json
index 21c9c8a..c030034 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3559,7 +3559,7 @@
         "description": "glsl: fix buffer texture type",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3ace6b968b3254cb83c5e6ffef9864d300265339"
     },

diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 63190ee..895a0d4 100644 (file)
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -1050,7 +1050,7 @@ glsl_type::get_texture_instance(enum glsl_sampler_dim dim,
       case GLSL_SAMPLER_DIM_3D:
          return (array ? error_type : vtexture3D_type);
       case GLSL_SAMPLER_DIM_BUF:
-         return (array ? error_type : vbuffer_type);
+         return (array ? error_type : vtextureBuffer_type);
       default:
          return error_type;
       }