Attachment 132157 Details for Bug 100785 – fix

[patch] fix

interpolateAtSample-fix.patch (text/plain), 2.38 KB, created by Hi-Angel on 2017-06-23 15:57:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hi-Angel

Created: 2017-06-23 15:57:44 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
>index 156dba085d..a431e937ef 100644
>--- a/src/gallium/drivers/r600/r600_shader.c
>+++ b/src/gallium/drivers/r600/r600_shader.c
>@@ -1127,6 +1127,7 @@ static int allocate_system_value_inputs(struct r600_shader_ctx *ctx, int gpr_off
> 
> 	tgsi_parse_free(&parse);
> 
>+	ctx->shader->nsys_inputs = 0;
> 	for (i = 0; i < ARRAY_SIZE(inputs); i++) {
> 		boolean enabled = inputs[i].enabled;
> 		int *reg = inputs[i].reg;
>@@ -1134,9 +1135,10 @@ static int allocate_system_value_inputs(struct r600_shader_ctx *ctx, int gpr_off
> 
> 		if (enabled) {
> 			int gpr = gpr_offset + num_regs++;
>+			ctx->shader->nsys_inputs++;
> 
> 			// add to inputs, allocate a gpr
>-			k = ctx->shader->ninput ++;
>+			k = ctx->shader->ninput++;
> 			ctx->shader->input[k].name = name;
> 			ctx->shader->input[k].sid = 0;
> 			ctx->shader->input[k].interpolate = TGSI_INTERPOLATE_CONSTANT;
>@@ -6322,12 +6324,10 @@ static int tgsi_interp_egcm(struct r600_shader_ctx *ctx)
> 	struct r600_bytecode_alu alu;
> 	int r, i = 0, k, interp_gpr, interp_base_chan, tmp, lasti;
> 	unsigned location;
>-	int input;
>+	const int input = inst->Src[0].Register.Index + ctx->shader->nsys_inputs;
> 
> 	assert(inst->Src[0].Register.File == TGSI_FILE_INPUT);
> 
>-	input = inst->Src[0].Register.Index;
>-
> 	/* Interpolators have been marked for use already by allocate_system_value_inputs */
> 	if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
> 		inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
>diff --git a/src/gallium/drivers/r600/r600_shader.h b/src/gallium/drivers/r600/r600_shader.h
>index cfdb020033..7beedc6247 100644
>--- a/src/gallium/drivers/r600/r600_shader.h
>+++ b/src/gallium/drivers/r600/r600_shader.h
>@@ -49,11 +49,12 @@ struct r600_shader_io {
> 	int			spi_sid;
> 	unsigned		interpolate;
> 	unsigned		ij_index;
>-	unsigned        interpolate_location; //  TGSI_INTERPOLATE_LOC_CENTER, CENTROID, SAMPLE
>+	unsigned		interpolate_location; //  TGSI_INTERPOLATE_LOC_CENTER, CENTROID, SAMPLE
> 	unsigned		lds_pos; /* for evergreen */
> 	unsigned		back_color_input;
> 	unsigned		write_mask;
>-	int				ring_offset;
>+	int			ring_offset;
>+	int			num_sysval;
> };
> 
> struct r600_shader {
>@@ -62,6 +63,7 @@ struct r600_shader {
> 	unsigned		ninput;
> 	unsigned		noutput;
> 	unsigned		nlds;
>+	unsigned		nsys_inputs;
> 	struct r600_shader_io	input[64];
> 	struct r600_shader_io	output[64];
> 	boolean			uses_kill;

Actions: View | Splinter Review

Attachments on bug 100785: 131043 | 131044 | 131062 | 131063 | 132157

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.