From: Thomas H.P. Andersen <phomes@gmail.com>
Date: Thu, 8 Jun 2023 21:51:53 +0000 (+0200)
Subject: r600: tgsi cleanup
X-Git-Tag: upstream/23.3.3~7085
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20e6c31ba679c373cbe8ee51d785cb0e45cdd446;p=platform%2Fupstream%2Fmesa.git

r600: tgsi cleanup

337dc7d76604e646f1a85615ab2d9d238427bf46 removed the usage of these
fields in struct r600_shader_ctx

Cleaning this up will let us drop tgsi_array_info in a later MR

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23535>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index ded2dd1..83fd197 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -388,11 +388,6 @@ void r600_pipe_shader_destroy(struct pipe_context *ctx UNUSED, struct r600_pipe_
 		free(shader->shader.arrays);
 }
 
-/*
- * tgsi -> r600 shader
- */
-struct r600_shader_tgsi_instruction;
-
 struct r600_shader_src {
 	unsigned				sel;
 	unsigned				swizzle[4];
@@ -410,53 +405,12 @@ struct eg_interp {
 };
 
 struct r600_shader_ctx {
-	struct tgsi_shader_info			info;
-	struct tgsi_array_info			*array_infos;
-	/* flag for each tgsi temp array if its been spilled or not */
-	bool					*spilled_arrays;
-	struct tgsi_parse_context		parse;
-	const struct tgsi_token			*tokens;
 	unsigned				type;
-	unsigned				file_offset[TGSI_FILE_COUNT];
 	unsigned				temp_reg;
-	const struct r600_shader_tgsi_instruction	*inst_info;
 	struct r600_bytecode			*bc;
 	struct r600_shader			*shader;
-	struct r600_shader_src			src[4];
-	uint32_t				*literals;
-	uint32_t				nliterals;
 	uint32_t				max_driver_temp_used;
-	/* needed for evergreen interpolation */
-	struct eg_interp		eg_interpolators[6]; // indexed by Persp/Linear * 3 + sample/center/centroid
-	/* evergreen/cayman also store sample mask in face register */
-	int					face_gpr;
-	/* sample id is .w component stored in fixed point position register */
-	int					fixed_pt_position_gpr;
-	int					colors_used;
-	boolean                 clip_vertex_write;
-	unsigned                cv_output;
-	unsigned		edgeflag_output;
-	int					helper_invoc_reg;
-	int                                     cs_block_size_reg;
-	int                                     cs_grid_size_reg;
-	bool cs_block_size_loaded, cs_grid_size_loaded;
-	int					fragcoord_input;
-	int					next_ring_offset;
-	int					gs_out_ring_offset;
-	int					gs_next_vertex;
-	struct r600_shader	*gs_for_vs;
-	int					gs_export_gpr_tregs[4];
-	int                                     gs_rotated_input[2];
-	const struct pipe_stream_output_info	*gs_stream_output_info;
 	unsigned				enabled_stream_buffers_mask;
-	unsigned                                tess_input_info; /* temp with tess input offsets */
-	unsigned                                tess_output_info; /* temp with tess input offsets */
-	unsigned                                thread_id_gpr; /* temp with thread id calculated for images */
-};
-
-struct r600_shader_tgsi_instruction {
-	unsigned	op;
-	int (*process)(struct r600_shader_ctx *ctx);
 };
 
 int eg_get_interpolator_index(unsigned interpolate, unsigned location)