summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-04-28 17:34:40 -0500
committerNicolai Hähnle <[email protected]>2016-04-29 11:39:32 -0500
commitacb65a23a3488d820f851342b06d215cd4964b3d (patch)
treeb052e8b5297719f6a14188387c66c8bbf1a256c0 /src/gallium/auxiliary
parent318d305f6dd416295003d04b6c9092ae988f894a (diff)
tgsi/build: pass Memory.Texture and .Format through tgsi_build_full_instruction
Reviewed-by: Ilia Mirkin <[email protected]> Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_build.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 7e30bb646e2..d525c8ff34e 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -791,6 +791,8 @@ tgsi_default_instruction_memory( void )
static struct tgsi_instruction_memory
tgsi_build_instruction_memory(
unsigned qualifier,
+ unsigned texture,
+ unsigned format,
struct tgsi_token *prev_token,
struct tgsi_instruction *instruction,
struct tgsi_header *header )
@@ -798,8 +800,8 @@ tgsi_build_instruction_memory(
struct tgsi_instruction_memory instruction_memory;
instruction_memory.Qualifier = qualifier;
- instruction_memory.Texture = 0;
- instruction_memory.Format = 0;
+ instruction_memory.Texture = texture;
+ instruction_memory.Format = format;
instruction_memory.Padding = 0;
instruction->Memory = 1;
@@ -1177,6 +1179,8 @@ tgsi_build_full_instruction(
*instruction_memory = tgsi_build_instruction_memory(
full_inst->Memory.Qualifier,
+ full_inst->Memory.Texture,
+ full_inst->Memory.Format,
prev_token,
instruction,
header );