Mesa (master): tgsi/scan: remember sampler view types
Marek Olšák
mareko at kemper.freedesktop.org
Mon Aug 29 12:24:52 UTC 2016
Module: Mesa
Branch: master
Commit: d301efb400accee1c6be790756d80957c7d04754
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d301efb400accee1c6be790756d80957c7d04754
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Aug 24 19:08:01 2016 +0200
tgsi/scan: remember sampler view types
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/gallium/auxiliary/tgsi/tgsi_scan.c | 4 ++++
src/gallium/auxiliary/tgsi/tgsi_scan.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 0167e22..a3b0d9f 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -497,13 +497,17 @@ scan_declaration(struct tgsi_shader_info *info,
info->samplers_declared |= 1u << reg;
} else if (file == TGSI_FILE_SAMPLER_VIEW) {
unsigned target = fulldecl->SamplerView.Resource;
+ unsigned type = fulldecl->SamplerView.ReturnTypeX;
+
assert(target < TGSI_TEXTURE_UNKNOWN);
if (info->sampler_targets[reg] == TGSI_TEXTURE_UNKNOWN) {
/* Save sampler target for this sampler index */
info->sampler_targets[reg] = target;
+ info->sampler_type[reg] = type;
} else {
/* if previously declared, make sure targets agree */
assert(info->sampler_targets[reg] == target);
+ assert(info->sampler_type[reg] == type);
}
} else if (file == TGSI_FILE_IMAGE) {
if (fulldecl->Image.Resource == TGSI_TEXTURE_BUFFER)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 30d0146..0c5f2ba 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -66,6 +66,7 @@ struct tgsi_shader_info
int const_file_max[PIPE_MAX_CONSTANT_BUFFERS];
unsigned samplers_declared; /**< bitmask of declared samplers */
ubyte sampler_targets[PIPE_MAX_SHADER_SAMPLER_VIEWS]; /**< TGSI_TEXTURE_x values */
+ ubyte sampler_type[PIPE_MAX_SHADER_SAMPLER_VIEWS]; /**< TGSI_RETURN_TYPE_x */
ubyte input_array_first[PIPE_MAX_SHADER_INPUTS];
ubyte input_array_last[PIPE_MAX_SHADER_INPUTS];
More information about the mesa-commit
mailing list