From 0ba813506d770ead7eb181fb2bf48d5a408fe0ea Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Tue, 3 Jul 2012 11:05:55 -0700 Subject: [PATCH] i965/msaa: Add CMS MSAA settings to brw_structs.h. Previously the DWORD used to control the CMS MSAA layout was just a pad value, because we didn't use it. Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_structs.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h index 41c88d010f5..67bfb982efa 100644 --- a/src/mesa/drivers/dri/i965/brw_structs.h +++ b/src/mesa/drivers/dri/i965/brw_structs.h @@ -854,8 +854,26 @@ struct gen7_surface_state GLuint x_offset:7; } ss5; - struct { - GLuint pad; /* Multisample Control Surface stuff */ + union { + GLuint raw_data; + struct { + GLuint y_offset_for_uv_plane:14; + GLuint pad1:2; + GLuint x_offset_for_uv_plane:14; + GLuint pad0:2; + } planar; /** Interpretation when Surface Format == PLANAR */ + struct { + GLuint mcs_enable:1; + GLuint append_counter_enable:1; + GLuint pad:4; + GLuint append_counter_address:26; + } mcs_disabled; /** Interpretation when mcs_enable == 0 */ + struct { + GLuint mcs_enable:1; + GLuint pad:2; + GLuint mcs_surface_pitch:9; + GLuint mcs_base_address:20; + } mcs_enabled; /** Interpretation when mcs_enable == 1 */ } ss6; struct { -- 2.30.2