i965: Use the new XRGB UNORM formats.

This is a step on the way to removing some of our code for forcing alpha
to 1, but I want easy bisecting so I'll add groups of formats separately.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

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 046c4e8..1dcdd93 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -555,13 +555,13 @@ brw_format_for_mesa_format(gl_format mesa_format)
       [MESA_FORMAT_ABGR2101010_UINT] = BRW_SURFACEFORMAT_R10G10B10A2_UINT,
 
       [MESA_FORMAT_XRGB4444_UNORM] = 0,
-      [MESA_FORMAT_XRGB1555_UNORM] = 0,
+      [MESA_FORMAT_XRGB1555_UNORM] = BRW_SURFACEFORMAT_B5G5R5X1_UNORM,
       [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_XRGB2101010_UNORM] = BRW_SURFACEFORMAT_B10G10R10X2_UNORM,
+      [MESA_FORMAT_XBGR16161616_UNORM] = BRW_SURFACEFORMAT_R16G16B16X16_UNORM,
       [MESA_FORMAT_XBGR16161616_SNORM] = 0,
       [MESA_FORMAT_XBGR16161616_FLOAT] = 0,
       [MESA_FORMAT_XBGR16161616_UINT] = 0,