diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-06-23 15:50:18 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-17 14:46:22 -0700 |
| commit | 09879eff30ad4501bf72c1f3d0a45779be0235a6 (patch) | |
| tree | b037a3f8057b0f820ad7592a1ac6ced8deb1647c /src/mesa/drivers/dri/i965/brw_blorp.h | |
| parent | e2a1bdb3c524f0a25bc311b1025e257f6b16cfaa (diff) | |
i965/blorp: Use isl_msaa_layout instead of intel_msaa_layout
We also remove brw_blorp_surface_info::msaa_layout.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_blorp.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index 0f142b41264..d60b9887368 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -134,12 +134,6 @@ struct brw_blorp_surface_info uint32_t brw_surfaceformat; /** - * For MSAA surfaces, MSAA layout that should be used when setting up the - * surface state for this surface. - */ - enum intel_msaa_layout msaa_layout; - - /** * In order to support cases where RGBA format is backing client requested * RGB, one needs to have means to force alpha channel to one when user * requested RGB surface is used as blit source. This is possible by @@ -298,7 +292,7 @@ struct brw_blorp_blit_prog_key /* MSAA layout that has been configured in the surface state for texturing * from. */ - enum intel_msaa_layout tex_layout; + enum isl_msaa_layout tex_layout; enum isl_aux_usage tex_aux_usage; @@ -306,7 +300,7 @@ struct brw_blorp_blit_prog_key unsigned src_samples; /* Actual MSAA layout used by the source image. */ - enum intel_msaa_layout src_layout; + enum isl_msaa_layout src_layout; /* Number of samples per pixel that have been configured in the render * target. @@ -314,13 +308,13 @@ struct brw_blorp_blit_prog_key unsigned rt_samples; /* MSAA layout that has been configured in the render target. */ - enum intel_msaa_layout rt_layout; + enum isl_msaa_layout rt_layout; /* Actual number of samples per pixel in the destination image. */ unsigned dst_samples; /* Actual MSAA layout used by the destination image. */ - enum intel_msaa_layout dst_layout; + enum isl_msaa_layout dst_layout; /* Type of the data to be read from the texture (one of * BRW_REGISTER_TYPE_{UD,D,F}). |