diff options
| author | Eric Anholt <[email protected]> | 2013-03-21 09:59:31 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-05-08 15:31:07 -0700 |
| commit | 0b0d6f97cfac75524470c895be686b69d67f050f (patch) | |
| tree | 4c3315ead542c53a3e47ea7dbc4727a8b7ff51ea /src/mesa/drivers | |
| parent | 2755946427392344b79d39f8e2fc144e9fa333aa (diff) | |
i965: Sync brw_format_for_mesa_format() table with new Mesa formats.
I'm not filling them all in, to prevent any breakage in this commit.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 55dcadfd212..b067f6db9e8 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -406,7 +406,6 @@ brw_format_for_mesa_format(gl_format mesa_format) [MESA_FORMAT_GR1616] = BRW_SURFACEFORMAT_R16G16_UNORM, [MESA_FORMAT_RG1616] = 0, [MESA_FORMAT_ARGB2101010] = BRW_SURFACEFORMAT_B10G10R10A2_UNORM, - [MESA_FORMAT_ABGR2101010_UINT] = BRW_SURFACEFORMAT_R10G10B10A2_UINT, [MESA_FORMAT_Z24_S8] = 0, [MESA_FORMAT_S8_Z24] = 0, [MESA_FORMAT_Z16] = 0, @@ -525,6 +524,18 @@ brw_format_for_mesa_format(gl_format mesa_format) [MESA_FORMAT_LA_LATC2] = 0, [MESA_FORMAT_SIGNED_LA_LATC2] = 0, + [MESA_FORMAT_ETC1_RGB8] = 0, + [MESA_FORMAT_ETC2_RGB8] = 0, + [MESA_FORMAT_ETC2_SRGB8] = 0, + [MESA_FORMAT_ETC2_RGBA8_EAC] = 0, + [MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC] = 0, + [MESA_FORMAT_ETC2_R11_EAC] = 0, + [MESA_FORMAT_ETC2_RG11_EAC] = 0, + [MESA_FORMAT_ETC2_SIGNED_R11_EAC] = 0, + [MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = 0, + [MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] = 0, + [MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1] = 0, + [MESA_FORMAT_SIGNED_A8] = 0, [MESA_FORMAT_SIGNED_L8] = 0, [MESA_FORMAT_SIGNED_AL88] = 0, @@ -539,6 +550,25 @@ brw_format_for_mesa_format(gl_format mesa_format) [MESA_FORMAT_Z32_FLOAT] = 0, [MESA_FORMAT_Z32_FLOAT_X24S8] = 0, + + [MESA_FORMAT_ARGB2101010_UINT] = 0, + [MESA_FORMAT_ABGR2101010_UINT] = BRW_SURFACEFORMAT_R10G10B10A2_UINT, + + [MESA_FORMAT_XRGB4444_UNORM] = 0, + [MESA_FORMAT_XRGB1555_UNORM] = 0, + [MESA_FORMAT_XBGR8888_SNORM] = 0, + [MESA_FORMAT_XBGR8888_SRGB] = 0, + [MESA_FORMAT_XBGR8888_UINT] = 0, + [MESA_FORMAT_XBGR8888_SINT] = 0, + [MESA_FORMAT_XRGB2101010_UNORM] = 0, + [MESA_FORMAT_XBGR16161616_UNORM] = 0, + [MESA_FORMAT_XBGR16161616_SNORM] = 0, + [MESA_FORMAT_XBGR16161616_FLOAT] = 0, + [MESA_FORMAT_XBGR16161616_UINT] = 0, + [MESA_FORMAT_XBGR16161616_SINT] = 0, + [MESA_FORMAT_XBGR32323232_FLOAT] = 0, + [MESA_FORMAT_XBGR32323232_UINT] = 0, + [MESA_FORMAT_XBGR32323232_SINT] = 0, }; assert(mesa_format < MESA_FORMAT_COUNT); return table[mesa_format]; |