projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e690d88
)
nir/builder: Allow tex helpers on image types
author
Faith Ekstrand
<faith.ekstrand@collabora.com>
Fri, 28 Jul 2023 15:53:28 +0000
(10:53 -0500)
committer
Marge Bot
<emma+marge@anholt.net>
Fri, 28 Jul 2023 20:39:07 +0000
(20:39 +0000)
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24375>
src/compiler/nir/nir_builder.c
patch
|
blob
|
history
diff --git
a/src/compiler/nir/nir_builder.c
b/src/compiler/nir/nir_builder.c
index
484d973
..
465bbfc
100644
(file)
--- a/
src/compiler/nir/nir_builder.c
+++ b/
src/compiler/nir/nir_builder.c
@@
-221,7
+221,8
@@
nir_build_tex_deref_instr(nir_builder *build, nir_texop op,
const nir_tex_src *extra_srcs)
{
assert(texture != NULL);
- assert(glsl_type_is_texture(texture->type) ||
+ assert(glsl_type_is_image(texture->type) ||
+ glsl_type_is_texture(texture->type) ||
glsl_type_is_sampler(texture->type));
const unsigned num_srcs = 1 + (sampler != NULL) + num_extra_srcs;