From acb65a23a3488d820f851342b06d215cd4964b3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 28 Apr 2016 17:34:40 -0500 Subject: [PATCH] tgsi/build: pass Memory.Texture and .Format through tgsi_build_full_instruction Reviewed-by: Ilia Mirkin Reviewed-by: Dave Airlie --- src/gallium/auxiliary/tgsi/tgsi_build.c | 8 ++++++-- 1 file 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 ); -- 2.30.2