Mesa (master): tgsi: add buffer texture to tgsi_util_get_texture_coord_dim( )
Chia-I Wu
olv at kemper.freedesktop.org
Mon May 27 03:29:03 UTC 2013
Module: Mesa
Branch: master
Commit: 441aa9326a2c7b575f833ed18e97f3ce70844b25
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=441aa9326a2c7b575f833ed18e97f3ce70844b25
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Thu May 23 13:24:55 2013 +0800
tgsi: add buffer texture to tgsi_util_get_texture_coord_dim()
TGSI_TEXTURE_BUFFER is one-dimensional. Assert that exec_tex() is never
called with TGSI_TEXTURE_BUFFER.
Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/gallium/auxiliary/tgsi/tgsi_exec.c | 1 +
src/gallium/auxiliary/tgsi/tgsi_util.c | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index cb66a40..4482c6b 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -1791,6 +1791,7 @@ exec_tex(struct tgsi_exec_machine *mach,
fetch_texel_offsets(mach, inst, offsets);
assert(modifier != TEX_MODIFIER_LEVEL_ZERO);
+ assert(inst->Texture.Texture != TGSI_TEXTURE_BUFFER);
dim = tgsi_util_get_texture_coord_dim(inst->Texture.Texture, &shadow_ref);
diff --git a/src/gallium/auxiliary/tgsi/tgsi_util.c b/src/gallium/auxiliary/tgsi/tgsi_util.c
index 862b79f..98c1e6e 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_util.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_util.c
@@ -353,6 +353,7 @@ tgsi_util_get_texture_coord_dim(int tgsi_tex, int *shadow_or_sample)
* Depending on the texture target, (src0.xyzw, src1.x) is interpreted
* differently:
*
+ * (s, X, X, X, X), for BUFFER
* (s, X, X, X, X), for 1D
* (s, t, X, X, X), for 2D, RECT
* (s, t, r, X, X), for 3D, CUBE
@@ -373,6 +374,7 @@ tgsi_util_get_texture_coord_dim(int tgsi_tex, int *shadow_or_sample)
* (s, t, layer, sample, X), for 2D_ARRAY_MSAA
*/
switch (tgsi_tex) {
+ case TGSI_TEXTURE_BUFFER:
case TGSI_TEXTURE_1D:
case TGSI_TEXTURE_SHADOW1D:
dim = 1;
More information about the mesa-commit
mailing list