r600g: implement texturing with 8x MSAA compressed surfaces for Evergreen

The 2x and 4x MSAA cases are completely broken. The lfdptr instruction returns
garbage there.

The 8x MSAA case is broken on Cayman, though at least the result looks somewhat
correct.

Only the 8x MSAA case works on Evergreen and is enabled.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 17dab7f23d5..238ab1676f4 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -184,6 +184,22 @@ struct r600_pipe_fences {
 	pipe_mutex			mutex;
 };
 
+enum r600_msaa_texture_mode {
+	/* If the hw can fetch the first sample only (no decompression available).
+	 * This means MSAA texturing is not fully implemented. */
+	MSAA_TEXTURE_SAMPLE_ZERO,
+
+	/* If the hw can fetch decompressed MSAA textures.
+	 * Supported families: R600, R700, Evergreen.
+	 * Cayman cannot use this, because it cannot do the decompression. */
+	MSAA_TEXTURE_DECOMPRESSED,
+
+	/* If the hw can fetch compressed MSAA textures, which means shaders can
+	 * read resolved FMASK. This yields the best performance.
+	 * Supported families: Evergreen, Cayman. */
+	MSAA_TEXTURE_COMPRESSED
+};
+
 struct r600_screen {
 	struct pipe_screen		screen;
 	struct radeon_winsys		*ws;
@@ -191,6 +207,8 @@ struct r600_screen {
 	enum chip_class			chip_class;
 	struct radeon_info		info;
 	bool				has_streamout;
+	bool				has_msaa;
+	enum r600_msaa_texture_mode	msaa_texture_support;
 	struct r600_tiling_info		tiling_info;
 	struct r600_pipe_fences		fences;
 
@@ -205,6 +223,7 @@ struct r600_pipe_sampler_view {
 	struct pipe_sampler_view	base;
 	struct r600_resource		*tex_resource;
 	uint32_t			tex_resource_words[8];
+	bool				skip_mip_address_reloc;
 };
 
 struct r600_rasterizer_state {
@@ -372,6 +391,7 @@ struct r600_context {
 	void				*custom_dsa_flush;
 	void				*custom_blend_resolve;
 	void				*custom_blend_decompress;
+	void				*custom_blend_fmask_decompress;
 	/* With rasterizer discard, there doesn't have to be a pixel shader.
 	 * In that case, we bind this one: */
 	void				*dummy_pixel_shader;
@@ -525,6 +545,7 @@ void evergreen_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader
 void *evergreen_create_db_flush_dsa(struct r600_context *rctx);
 void *evergreen_create_resolve_blend(struct r600_context *rctx);
 void *evergreen_create_decompress_blend(struct r600_context *rctx);
+void *evergreen_create_fmask_decompress_blend(struct r600_context *rctx);
 boolean evergreen_is_format_supported(struct pipe_screen *screen,
 				      enum pipe_format format,
 				      enum pipe_texture_target target,