From: Dave Airlie Date: Tue, 18 Nov 2014 04:06:36 +0000 (+1000) Subject: r600g: geom shaders: always load texture src regs from inputs X-Git-Tag: android-x86-4.4-r3~1832 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d4c342f67e128dd9c17e8ae48a44677baf546295;p=android-x86%2Fexternal-mesa.git r600g: geom shaders: always load texture src regs from inputs Otherwise we seem to lose the split_gs_inputs and try and pull from an uninitialised register. fixes 9 texelFetch geom shader tests. Reviewed-by: Glenn Kennard Cc: "10.3 10.4" Signed-off-by: Dave Airlie --- diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 709fcd74471..ab2a83871be 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -4919,7 +4919,8 @@ static inline boolean tgsi_tex_src_requires_loading(struct r600_shader_ctx *ctx, return (inst->Src[index].Register.File != TGSI_FILE_TEMPORARY && inst->Src[index].Register.File != TGSI_FILE_INPUT && inst->Src[index].Register.File != TGSI_FILE_OUTPUT) || - ctx->src[index].neg || ctx->src[index].abs; + ctx->src[index].neg || ctx->src[index].abs || + (inst->Src[index].Register.File == TGSI_FILE_INPUT && ctx->type == TGSI_PROCESSOR_GEOMETRY); } static inline unsigned tgsi_tex_get_src_gpr(struct r600_shader_ctx *ctx,