Attachment 42992 Details for Bug 31667 – r600g_relative_addressing

[patch] r600g_relative_addressing

r600g_relative_addressing.diff (text/plain), 23.64 KB, created by Henri Verbeet on 2011-02-06 07:26:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henri Verbeet

Created: 2011-02-06 07:26:27 UTC

Size: 23.64 KB

patch

obsolete

>diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
>index 05539aa..9017bd2 100644
>--- a/src/gallium/drivers/r600/evergreen_state.c
>+++ b/src/gallium/drivers/r600/evergreen_state.c
>@@ -434,7 +434,8 @@ static void evergreen_set_vs_sampler_view(struct pipe_context *ctx, unsigned cou
> 
> 	for (int i = 0; i < count; i++) {
> 		if (resource[i]) {
>-			evergreen_context_pipe_state_set_vs_resource(&rctx->ctx, &resource[i]->state, i);
>+			evergreen_context_pipe_state_set_vs_resource(&rctx->ctx, &resource[i]->state,
>+								     i + R600_MAX_CONST_BUFFERS);
> 		}
> 	}
> }
>@@ -449,9 +450,11 @@ static void evergreen_set_ps_sampler_view(struct pipe_context *ctx, unsigned cou
> 	for (i = 0; i < count; i++) {
> 		if (&rctx->ps_samplers.views[i]->base != views[i]) {
> 			if (resource[i])
>-				evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, &resource[i]->state, i);
>+				evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, &resource[i]->state,
>+									     i + R600_MAX_CONST_BUFFERS);
> 			else
>-				evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, NULL, i);
>+				evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, NULL,
>+									     i + R600_MAX_CONST_BUFFERS);
> 
> 			pipe_sampler_view_reference(
> 				(struct pipe_sampler_view **)&rctx->ps_samplers.views[i],
>@@ -460,7 +463,8 @@ static void evergreen_set_ps_sampler_view(struct pipe_context *ctx, unsigned cou
> 	}
> 	for (i = count; i < NUM_TEX_UNITS; i++) {
> 		if (rctx->ps_samplers.views[i]) {
>-			evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, NULL, i);
>+			evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, NULL,
>+								     i + R600_MAX_CONST_BUFFERS);
> 			pipe_sampler_view_reference((struct pipe_sampler_view **)&rctx->ps_samplers.views[i], NULL);
> 		}
> 	}
>@@ -1492,11 +1496,10 @@ void *evergreen_create_db_flush_dsa(struct r600_pipe_context *rctx)
> 	return rstate;
> }
> 
>-void evergreen_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
>-				      struct r600_pipe_state *rstate,
>-				      unsigned index,
>-				      struct r600_resource *rbuffer,
>-				      unsigned offset, unsigned stride)
>+void evergreen_pipe_set_resource(struct r600_pipe_context *rctx,
>+				 struct r600_pipe_state *rstate,
>+				 struct r600_resource *rbuffer,
>+				 unsigned offset, unsigned stride)
> {
> 	r600_pipe_state_add_reg(rstate, R_030000_RESOURCE0_WORD0,
> 				offset, 0xFFFFFFFF, rbuffer->bo);
>@@ -1519,5 +1522,4 @@ void evergreen_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
> 				0x00000000, 0xFFFFFFFF, NULL);
> 	r600_pipe_state_add_reg(rstate, R_03001C_RESOURCE0_WORD7,
> 				0xC0000000, 0xFFFFFFFF, NULL);
>-	evergreen_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, index);
> }
>diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
>index 35a7bc7..f3540b4 100644
>--- a/src/gallium/drivers/r600/r600_asm.c
>+++ b/src/gallium/drivers/r600/r600_asm.c
>@@ -47,6 +47,7 @@ static inline unsigned int r600_bc_get_num_operands(struct r600_bc *bc, struct r
> 		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP:
> 			return 0;
> 		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD:
>+		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD_INT:
> 		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLE:
> 		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGT:
> 		case V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGE:
>@@ -94,6 +95,7 @@ static inline unsigned int r600_bc_get_num_operands(struct r600_bc *bc, struct r
> 		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP:
> 			return 0;
> 		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD:
>+		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD_INT:
> 		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLE:
> 		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGT:
> 		case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGE:
>@@ -1347,6 +1349,7 @@ static int r600_bc_vtx_build(struct r600_bc *bc, struct r600_bc_vtx *vtx, unsign
> 		}
> 	}
> 	bc->bytecode[id++] = S_SQ_VTX_WORD0_BUFFER_ID(vtx->buffer_id + fetch_resource_start) |
>+			S_SQ_VTX_WORD0_FETCH_TYPE(vtx->fetch_type) |
> 			S_SQ_VTX_WORD0_SRC_GPR(vtx->src_gpr) |
> 			S_SQ_VTX_WORD0_SRC_SEL_X(vtx->src_sel_x) |
> 			S_SQ_VTX_WORD0_MEGA_FETCH_COUNT(vtx->mega_fetch_count);
>diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
>index 510529a..82456d9 100644
>--- a/src/gallium/drivers/r600/r600_asm.h
>+++ b/src/gallium/drivers/r600/r600_asm.h
>@@ -34,7 +34,7 @@ struct r600_bc_alu_src {
> 	unsigned			neg;
> 	unsigned			abs;
> 	unsigned			rel;
>-	u32				*value;
>+	uint32_t			value[4];
> };
> 
> struct r600_bc_alu_dst {
>diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
>index 45c0931..363250e 100644
>--- a/src/gallium/drivers/r600/r600_pipe.c
>+++ b/src/gallium/drivers/r600/r600_pipe.c
>@@ -95,8 +95,6 @@ static void r600_destroy_context(struct pipe_context *context)
> 	if (rctx->tran.translate_cache)
> 		translate_cache_destroy(rctx->tran.translate_cache);
> 
>-	FREE(rctx->ps_resource);
>-	FREE(rctx->vs_resource);
> 	FREE(rctx);
> }
> 
>@@ -194,18 +192,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
> 		return NULL;
> 	}
> 
>-	rctx->vs_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
>-	if (!rctx->vs_resource) {
>-		FREE(rctx);
>-		return NULL;
>-	}
>-
>-	rctx->ps_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
>-	if (!rctx->ps_resource) {
>-		FREE(rctx);
>-		return NULL;
>-	}
>-
> 	class = r600_get_family_class(rctx->radeon);
> 	if (class == R600 || class == R700)
> 		rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
>diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
>index d376a77..a374434 100644
>--- a/src/gallium/drivers/r600/r600_pipe.h
>+++ b/src/gallium/drivers/r600/r600_pipe.h
>@@ -36,6 +36,8 @@
> #include "r600_shader.h"
> #include "r600_resource.h"
> 
>+#define R600_MAX_CONST_BUFFERS 1
>+
> enum r600_pipe_state_id {
> 	R600_PIPE_STATE_BLEND = 0,
> 	R600_PIPE_STATE_BLEND_COLOR,
>@@ -129,9 +131,6 @@ struct r600_translate_context {
> 	void				*new_velems;
> };
> 
>-#define R600_CONSTANT_ARRAY_SIZE 256
>-#define R600_RESOURCE_ARRAY_SIZE 160
>-
> struct r600_pipe_context {
> 	struct pipe_context		context;
> 	struct blitter_context		*blitter;
>@@ -142,6 +141,7 @@ struct r600_pipe_context {
> 	struct r600_pipe_state		*states[R600_PIPE_NSTATES];
> 	struct r600_context		ctx;
> 	struct r600_vertex_element	*vertex_elements;
>+	struct r600_pipe_state		fs_resource[PIPE_MAX_ATTRIBS];
> 	struct pipe_framebuffer_state	framebuffer;
> 	struct pipe_index_buffer	index_buffer;
> 	struct pipe_vertex_buffer	vertex_buffer[PIPE_MAX_ATTRIBS];
>@@ -153,14 +153,13 @@ struct r600_pipe_context {
> 	struct pipe_stencil_ref		stencil_ref;
> 	struct pipe_viewport_state	viewport;
> 	struct pipe_clip_state		clip;
>-	unsigned			nvs_resource;
>-	struct r600_pipe_state		*vs_resource;
>-	struct r600_pipe_state		*ps_resource;
> 	struct r600_pipe_state		config;
> 	struct r600_pipe_shader 	*ps_shader;
> 	struct r600_pipe_shader 	*vs_shader;
> 	struct r600_pipe_state		vs_const_buffer;
>+	struct r600_pipe_state		vs_const_buffer_resource[R600_MAX_CONST_BUFFERS];
> 	struct r600_pipe_state		ps_const_buffer;
>+	struct r600_pipe_state		ps_const_buffer_resource[R600_MAX_CONST_BUFFERS];
> 	struct r600_pipe_rasterizer	*rasterizer;
> 	/* shader information */
> 	unsigned			sprite_coord_enable;
>@@ -189,11 +188,10 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
> void evergreen_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader *shader);
> void *evergreen_create_db_flush_dsa(struct r600_pipe_context *rctx);
> void evergreen_polygon_offset_update(struct r600_pipe_context *rctx);
>-void evergreen_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
>-				      struct r600_pipe_state *rstate,
>-				      unsigned index,
>-				      struct r600_resource *rbuffer,
>-				      unsigned offset, unsigned stride);
>+void evergreen_pipe_set_resource(struct r600_pipe_context *rctx,
>+				 struct r600_pipe_state *rstate,
>+				 struct r600_resource *rbuffer,
>+				 unsigned offset, unsigned stride);
> 
> /* r600_blit.c */
> void r600_init_blit_functions(struct r600_pipe_context *rctx);
>@@ -231,11 +229,10 @@ void r600_spi_update(struct r600_pipe_context *rctx);
> void r600_init_config(struct r600_pipe_context *rctx);
> void *r600_create_db_flush_dsa(struct r600_pipe_context *rctx);
> void r600_polygon_offset_update(struct r600_pipe_context *rctx);
>-void r600_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
>-				 struct r600_pipe_state *rstate,
>-				 unsigned index,
>-				 struct r600_resource *rbuffer,
>-				 unsigned offset, unsigned stride);
>+void r600_pipe_set_resource(struct r600_pipe_context *rctx,
>+			    struct r600_pipe_state *rstate,
>+			    struct r600_resource *rbuffer,
>+			    unsigned offset, unsigned stride);
> 
> /* r600_helper.h */
> int r600_conv_pipe_prim(unsigned pprim, unsigned *prim);
>diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
>index fa21bbb..5959876 100644
>--- a/src/gallium/drivers/r600/r600_shader.c
>+++ b/src/gallium/drivers/r600/r600_shader.c
>@@ -28,6 +28,7 @@
> #include "r600_pipe.h"
> #include "r600_asm.h"
> #include "r600_sq.h"
>+#include "r600_formats.h"
> #include "r600_opcodes.h"
> #include "r600d.h"
> #include <stdio.h>
>@@ -288,6 +289,7 @@ struct r600_shader_ctx {
> 	unsigned				type;
> 	unsigned				file_offset[TGSI_FILE_COUNT];
> 	unsigned				temp_reg;
>+	unsigned				ar_reg;
> 	struct r600_shader_tgsi_instruction	*inst_info;
> 	struct r600_bc				*bc;
> 	struct r600_shader			*shader;
>@@ -566,8 +568,9 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
> 	ctx.file_offset[TGSI_FILE_CONSTANT] = 512;
> 
> 	ctx.file_offset[TGSI_FILE_IMMEDIATE] = V_SQ_ALU_SRC_LITERAL;
>-	ctx.temp_reg = ctx.file_offset[TGSI_FILE_TEMPORARY] +
>+	ctx.ar_reg = ctx.file_offset[TGSI_FILE_TEMPORARY] +
> 			ctx.info.file_count[TGSI_FILE_TEMPORARY];
>+	ctx.temp_reg = ctx.ar_reg + 1;
> 
> 	ctx.nliterals = 0;
> 	ctx.literals = NULL;
>@@ -776,7 +779,7 @@ static int tgsi_src(struct r600_shader_ctx *ctx,
> 		}
> 		index = tgsi_src->Register.Index;
> 		r600_src->sel = V_SQ_ALU_SRC_LITERAL;
>-		r600_src->value = ctx->literals + index * 4;
>+		memcpy(r600_src->value, ctx->literals + index * 4, sizeof(r600_src->value));
> 	} else {
> 		if (tgsi_src->Register.Indirect)
> 			r600_src->rel = V_SQ_REL_RELATIVE;
>@@ -821,6 +824,57 @@ static unsigned tgsi_chan(const struct tgsi_full_src_register *tgsi_src, unsigne
> 	}
> }
> 
>+static int tgsi_fetch_rel_const(struct r600_shader_ctx *ctx, unsigned int offset, unsigned int dst_reg)
>+{
>+	struct r600_bc_vtx vtx;
>+	unsigned int ar_reg;
>+	int r;
>+
>+	if (offset) {
>+		struct r600_bc_alu alu;
>+
>+		memset(&alu, 0, sizeof(alu));
>+
>+		alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD_INT);
>+		alu.src[0].sel = ctx->ar_reg;
>+
>+		alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
>+		alu.src[1].value[0] = offset;
>+
>+		alu.dst.sel = dst_reg;
>+		alu.dst.write = 1;
>+		alu.last = 1;
>+
>+		r = r600_bc_add_alu(ctx->bc, &alu);
>+		if (r)
>+			return r;
>+
>+		ar_reg = dst_reg;
>+	} else {
>+		ar_reg = ctx->ar_reg;
>+	}
>+
>+	memset(&vtx, 0, sizeof(vtx));
>+	vtx.fetch_type = 2;		/* VTX_FETCH_NO_INDEX_OFFSET */
>+	vtx.src_gpr = ar_reg;
>+	vtx.mega_fetch_count = 16;
>+	vtx.dst_gpr = dst_reg;
>+	vtx.dst_sel_x = 0;		/* SEL_X */
>+	vtx.dst_sel_y = 1;		/* SEL_Y */
>+	vtx.dst_sel_z = 2;		/* SEL_Z */
>+	vtx.dst_sel_w = 3;		/* SEL_W */
>+	vtx.data_format = FMT_32_32_32_32_FLOAT;
>+	vtx.num_format_all = 2;		/* NUM_FORMAT_SCALED */
>+	vtx.format_comp_all = 1;	/* FORMAT_COMP_SIGNED */
>+	vtx.srf_mode_all = 1;		/* SRF_MODE_NO_ZERO */
>+
>+	r = r600_bc_add_vtx(ctx->bc, &vtx);
>+	if (r)
>+		return r;
>+
>+	return 0;
>+}
>+
> static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_src r600_src[3])
> {
> 	struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
>@@ -837,7 +891,19 @@ static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_s
> 		}
> 	}
> 	for (i = 0, j = nconst - 1; i < inst->Instruction.NumSrcRegs; i++) {
>-		if (j > 0 && inst->Src[i].Register.File == TGSI_FILE_CONSTANT) {
>+		if (inst->Src[i].Register.File != TGSI_FILE_CONSTANT) {
>+			continue;
>+		}
>+
>+		if (r600_src[i].rel) {
>+			int treg = r600_get_temp(ctx);
>+			if ((r = tgsi_fetch_rel_const(ctx, r600_src[i].sel - 512, treg)))
>+				return r;
>+
>+			r600_src[i].sel = treg;
>+			r600_src[i].rel = 0;
>+			j--;
>+		} else if (j > 0) {
> 			int treg = r600_get_temp(ctx);
> 			for (k = 0; k < 4; k++) {
> 				memset(&alu, 0, sizeof(struct r600_bc_alu));
>@@ -882,7 +948,7 @@ static int tgsi_split_literal_constant(struct r600_shader_ctx *ctx, struct r600_
> 				alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
> 				alu.src[0].sel = r600_src[i].sel;
> 				alu.src[0].chan = k;
>-				alu.src[0].value = r600_src[i].value;
>+				alu.src[0].value[k] = r600_src[i].value[k];
> 				alu.dst.sel = treg;
> 				alu.dst.chan = k;
> 				alu.dst.write = 1;
>@@ -1014,7 +1080,7 @@ static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
> 
> 	alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
> 	alu.src[1].chan = 0;
>-	alu.src[1].value = (uint32_t *)&half_inv_pi;
>+	alu.src[1].value[0] = *(uint32_t *)&half_inv_pi;
> 	alu.src[2].sel = V_SQ_ALU_SRC_0_5;
> 	alu.src[2].chan = 0;
> 	alu.last = 1;
>@@ -1053,8 +1119,8 @@ static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
> 	alu.src[2].chan = 0;
> 
> 	if (ctx->bc->chiprev == CHIPREV_R600) {
>-		alu.src[1].value = (uint32_t *)&double_pi;
>-		alu.src[2].value = (uint32_t *)&neg_pi;
>+		alu.src[1].value[0] = *(uint32_t *)&double_pi;
>+		alu.src[2].value[0] = *(uint32_t *)&neg_pi;
> 	} else {
> 		alu.src[1].sel = V_SQ_ALU_SRC_1;
> 		alu.src[2].sel = V_SQ_ALU_SRC_0_5;
>@@ -1814,7 +1880,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
> 
> 		alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
> 		alu.src[2].chan = 0;
>-		alu.src[2].value = (u32*)&one_point_five;
>+		alu.src[2].value[0] = *(uint32_t *)&one_point_five;
> 
> 		alu.dst.sel = ctx->temp_reg;
> 		alu.dst.chan = 0;
>@@ -1835,7 +1901,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
> 
> 		alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
> 		alu.src[2].chan = 0;
>-		alu.src[2].value = (u32*)&one_point_five;
>+		alu.src[2].value[0] = *(uint32_t *)&one_point_five;
> 
> 		alu.dst.sel = ctx->temp_reg;
> 		alu.dst.chan = 1;
>@@ -1878,7 +1944,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
> 	memset(&tex, 0, sizeof(struct r600_bc_tex));
> 	tex.inst = opcode;
> 	tex.sampler_id = ctx->file_offset[inst->Src[1].Register.File] + inst->Src[1].Register.Index;
>-	tex.resource_id = tex.sampler_id;
>+	tex.resource_id = tex.sampler_id + R600_MAX_CONST_BUFFERS;
> 	tex.src_gpr = src_gpr;
> 	tex.dst_gpr = ctx->file_offset[inst->Dst[0].Register.File] + inst->Dst[0].Register.Index;
> 	tex.dst_sel_x = (inst->Dst[0].Register.WriteMask & 1) ? 0 : 7;
>@@ -2502,23 +2568,25 @@ static int tgsi_eg_arl(struct r600_shader_ctx *ctx)
> 		return r;
> 	alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
> 	alu.last = 1;
>-	alu.dst.chan = 0;
>-	alu.dst.sel = ctx->temp_reg;
>+	alu.dst.sel = ctx->ar_reg;
> 	alu.dst.write = 1;
> 	r = r600_bc_add_alu(ctx->bc, &alu);
> 	if (r)
> 		return r;
>+
>+	/* TODO: Note that the move to AR can be avoided if we never use AR
>+	 * for indexing GPRs in this clause. Similarly, we need to load it
>+	 * from ar_reg again if started a new clause between ARL and first
>+	 * usage. The easy way to do that is to remove this here, and load it
>+	 * for the first AR access after ar_reg has been modified in each
>+	 * clause. */
> 	memset(&alu, 0, sizeof(struct r600_bc_alu));
> 	alu.inst = EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA_INT;
>-	r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
>-	if (r)
>-		return r;
>-	alu.src[0].sel = ctx->temp_reg;
>-	alu.src[0].chan = 0;
>+	alu.src[0].sel = ctx->ar_reg;
> 	alu.last = 1;
>-	r = r600_bc_add_alu(ctx->bc, &alu);
>-	if (r)
>+	if ((r = r600_bc_add_alu(ctx->bc, &alu)))
> 		return r;
>+
> 	return 0;
> }
> static int tgsi_r600_arl(struct r600_shader_ctx *ctx)
>@@ -2527,31 +2595,57 @@ static int tgsi_r600_arl(struct r600_shader_ctx *ctx)
> 	struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
> 	struct r600_bc_alu alu;
> 	int r;
>-	memset(&alu, 0, sizeof(struct r600_bc_alu));
> 
> 	switch (inst->Instruction.Opcode) {
> 	case TGSI_OPCODE_ARL:
>-		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA_FLOOR;
>+		memset(&alu, 0, sizeof(alu));
>+		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR;
>+		if ((r = tgsi_src(ctx, &inst->Src[0], &alu.src[0])))
>+			return r;
>+		alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
>+		alu.dst.sel = ctx->ar_reg;
>+		alu.dst.write = 1;
>+		alu.last = 1;
>+
>+		if ((r = r600_bc_add_alu(ctx->bc, &alu)))
>+			return r;
>+
>+		memset(&alu, 0, sizeof(alu));
>+		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT;
>+		alu.src[0].sel = ctx->ar_reg;
>+		alu.dst.sel = ctx->ar_reg;
>+		alu.dst.write = 1;
>+		alu.last = 1;
>+
>+		if ((r = r600_bc_add_alu(ctx->bc, &alu)))
>+			return r;
> 		break;
> 	case TGSI_OPCODE_ARR:
>-		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA;
>+		memset(&alu, 0, sizeof(alu));
>+		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT;
>+		if ((r = tgsi_src(ctx, &inst->Src[0], &alu.src[0])))
>+			return r;
>+		alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
>+		alu.dst.sel = ctx->ar_reg;
>+		alu.dst.write = 1;
>+		alu.last = 1;
>+
>+		if ((r = r600_bc_add_alu(ctx->bc, &alu)))
>+			return r;
> 		break;
> 	default:
> 		assert(0);
> 		return -1;
> 	}
> 
>-
>-	r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
>-	if (r)
>-		return r;
>-	alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
>-
>+	memset(&alu, 0, sizeof(alu));
>+	alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA_INT;
>+	alu.src[0].sel = ctx->ar_reg;
> 	alu.last = 1;
> 
>-	r = r600_bc_add_alu(ctx->bc, &alu);
>-	if (r)
>+	if ((r = r600_bc_add_alu(ctx->bc, &alu)))
> 		return r;
>+
> 	ctx->bc->cf_last->r6xx_uses_waterfall = 1;
> 	return 0;
> }
>diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
>index a51e705..7a0297f 100644
>--- a/src/gallium/drivers/r600/r600_state.c
>+++ b/src/gallium/drivers/r600/r600_state.c
>@@ -495,9 +495,11 @@ static void r600_set_ps_sampler_view(struct pipe_context *ctx, unsigned count,
> 	for (i = 0; i < count; i++) {
> 		if (&rctx->ps_samplers.views[i]->base != views[i]) {
> 			if (resource[i])
>-				r600_context_pipe_state_set_ps_resource(&rctx->ctx, &resource[i]->state, i);
>+				r600_context_pipe_state_set_ps_resource(&rctx->ctx, &resource[i]->state,
>+									i + R600_MAX_CONST_BUFFERS);
> 			else
>-				r600_context_pipe_state_set_ps_resource(&rctx->ctx, NULL, i);
>+				r600_context_pipe_state_set_ps_resource(&rctx->ctx, NULL,
>+									i + R600_MAX_CONST_BUFFERS);
> 
> 			pipe_sampler_view_reference(
> 				(struct pipe_sampler_view **)&rctx->ps_samplers.views[i],
>@@ -507,7 +509,8 @@ static void r600_set_ps_sampler_view(struct pipe_context *ctx, unsigned count,
> 	}
> 	for (i = count; i < NUM_TEX_UNITS; i++) {
> 		if (rctx->ps_samplers.views[i]) {
>-			r600_context_pipe_state_set_ps_resource(&rctx->ctx, NULL, i);
>+			r600_context_pipe_state_set_ps_resource(&rctx->ctx, NULL,
>+								i + R600_MAX_CONST_BUFFERS);
> 			pipe_sampler_view_reference((struct pipe_sampler_view **)&rctx->ps_samplers.views[i], NULL);
> 		}
> 	}
>@@ -1218,11 +1221,10 @@ void *r600_create_db_flush_dsa(struct r600_pipe_context *rctx)
> 	return rstate;
> }
> 
>-void r600_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
>-				 struct r600_pipe_state *rstate,
>-				 unsigned index,
>-				 struct r600_resource *rbuffer,
>-				 unsigned offset, unsigned stride)
>+void r600_pipe_set_resource(struct r600_pipe_context *rctx,
>+			    struct r600_pipe_state *rstate,
>+			    struct r600_resource *rbuffer,
>+			    unsigned offset, unsigned stride)
> {
> 	r600_pipe_state_add_reg(rstate, R_038000_RESOURCE0_WORD0,
> 				offset, 0xFFFFFFFF, rbuffer->bo);
>@@ -1239,5 +1241,4 @@ void r600_pipe_add_vertex_attrib(struct r600_pipe_context *rctx,
> 				0x00000000, 0xFFFFFFFF, NULL);
> 	r600_pipe_state_add_reg(rstate, R_038018_RESOURCE0_WORD6,
> 				0xC0000000, 0xFFFFFFFF, NULL);
>-	r600_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, index);
> }
>diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
>index 3b037f8..8e81985 100644
>--- a/src/gallium/drivers/r600/r600_state_common.c
>+++ b/src/gallium/drivers/r600/r600_state_common.c
>@@ -394,6 +394,7 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
> {
> 	struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
> 	struct r600_resource_buffer *rbuffer = r600_buffer(buffer);
>+	struct r600_pipe_state *rstate;
> 	uint32_t offset;
> 
> 	/* Note that the state tracker can unbind constant buffers by
>@@ -404,6 +405,7 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
> 	}
> 
> 	r600_upload_const_buffer(rctx, &rbuffer, &offset);
>+	offset += r600_bo_offset(rbuffer->r.bo);
> 
> 	switch (shader) {
> 	case PIPE_SHADER_VERTEX:
>@@ -414,8 +416,19 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
> 					0xFFFFFFFF, NULL);
> 		r600_pipe_state_add_reg(&rctx->vs_const_buffer,
> 					R_028980_ALU_CONST_CACHE_VS_0,
>-					(r600_bo_offset(rbuffer->r.bo) + offset) >> 8, 0xFFFFFFFF, rbuffer->r.bo);
>+					offset >> 8, 0xFFFFFFFF, rbuffer->r.bo);
> 		r600_context_pipe_state_set(&rctx->ctx, &rctx->vs_const_buffer);
>+
>+		rstate = &rctx->vs_const_buffer_resource[index];
>+		rstate->id = R600_PIPE_STATE_RESOURCE;
>+		rstate->nregs = 0;
>+		if (rctx->family >= CHIP_CEDAR) {
>+			evergreen_pipe_set_resource(rctx, rstate, &rbuffer->r, offset, 16);
>+			evergreen_context_pipe_state_set_vs_resource(&rctx->ctx, rstate, index);
>+		} else {
>+			r600_pipe_set_resource(rctx, rstate, &rbuffer->r, offset, 16);
>+			r600_context_pipe_state_set_vs_resource(&rctx->ctx, rstate, index);
>+		}
> 		break;
> 	case PIPE_SHADER_FRAGMENT:
> 		rctx->ps_const_buffer.nregs = 0;
>@@ -425,8 +438,19 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
> 					0xFFFFFFFF, NULL);
> 		r600_pipe_state_add_reg(&rctx->ps_const_buffer,
> 					R_028940_ALU_CONST_CACHE_PS_0,
>-					(r600_bo_offset(rbuffer->r.bo) + offset) >> 8, 0xFFFFFFFF, rbuffer->r.bo);
>+					offset >> 8, 0xFFFFFFFF, rbuffer->r.bo);
> 		r600_context_pipe_state_set(&rctx->ctx, &rctx->ps_const_buffer);
>+
>+		rstate = &rctx->ps_const_buffer_resource[index];
>+		rstate->id = R600_PIPE_STATE_RESOURCE;
>+		rstate->nregs = 0;
>+		if (rctx->family >= CHIP_CEDAR) {
>+			evergreen_pipe_set_resource(rctx, rstate, &rbuffer->r, offset, 16);
>+			evergreen_context_pipe_state_set_ps_resource(&rctx->ctx, rstate, index);
>+		} else {
>+			r600_pipe_set_resource(rctx, rstate, &rbuffer->r, offset, 16);
>+			r600_context_pipe_state_set_ps_resource(&rctx->ctx, rstate, index);
>+		}
> 		break;
> 	default:
> 		R600_ERR("unsupported %d\n", shader);
>@@ -442,18 +466,18 @@ static void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
> 	struct r600_pipe_state *rstate;
> 	struct r600_resource *rbuffer;
> 	struct pipe_vertex_buffer *vertex_buffer;
>-	unsigned i, offset;
>+	unsigned i, count, offset;
> 
> 	if (rctx->vertex_elements->vbuffer_need_offset) {
> 		/* one resource per vertex elements */
>-		rctx->nvs_resource = rctx->vertex_elements->count;
>+		count = rctx->vertex_elements->count;
> 	} else {
> 		/* bind vertex buffer once */
>-		rctx->nvs_resource = rctx->nreal_vertex_buffers;
>+		count = rctx->nreal_vertex_buffers;
> 	}
> 
>-	for (i = 0 ; i < rctx->nvs_resource; i++) {
>-		rstate = &rctx->vs_resource[i];
>+	for (i = 0 ; i < count; i++) {
>+		rstate = &rctx->fs_resource[i];
> 		rstate->id = R600_PIPE_STATE_RESOURCE;
> 		rstate->nregs = 0;
> 
>@@ -475,13 +499,11 @@ static void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
> 		offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);
> 
> 		if (rctx->family >= CHIP_CEDAR) {
>-			evergreen_pipe_add_vertex_attrib(rctx, rstate, i,
>-							 rbuffer, offset,
>-							 vertex_buffer->stride);
>+			evergreen_pipe_set_resource(rctx, rstate, rbuffer, offset, vertex_buffer->stride);
>+			evergreen_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, i);
> 		} else {
>-			r600_pipe_add_vertex_attrib(rctx, rstate, i,
>-						    rbuffer, offset,
>-						    vertex_buffer->stride);
>+			r600_pipe_set_resource(rctx, rstate, rbuffer, offset, vertex_buffer->stride);
>+			r600_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, i);
> 		}
> 	}
> }

Actions: View | Splinter Review

Attachments on bug 31667: 40311 | 40312 | 40313 | 40314 | 40315 | 40867 | 41652 | 41655 | 42992 | 77965 | 77966

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.