i965: add ARB_texture_rgb10_a2ui support

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/docs/GL3.txt b/docs/GL3.txt
index d41c052c2342630ffd1ef0bf233f5832b0401d2d..246eb30a9df2a3dde96d4bfed80afdda3a17864a 100644 (file)
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -78,7 +78,7 @@ GL_ARB_explicit_attrib_location                       DONE (i915, i965, r300, r6
 GL_ARB_occlusion_query2                               DONE (r300, r600, swrast)
 GL_ARB_sampler_objects                                DONE (i965, r300, r600)
 GL_ARB_shader_bit_encoding                            DONE
-GL_ARB_texture_rgb10_a2ui                             DONE (r600)
+GL_ARB_texture_rgb10_a2ui                             DONE (i965, r600)
 GL_ARB_texture_swizzle                                DONE (same as EXT version) (i965, r300, r600, swrast)
 GL_ARB_timer_query                                    DONE
 GL_ARB_instanced_arrays                               DONE (i965, r300, r600)

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 4d3d265d40c83b631b5203c6f42c3abfa6d0671d..220af1bf9d5ce0927bc7d82a3f089d66efcb76f1 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -325,6 +325,7 @@ brw_format_for_mesa_format(gl_format mesa_format)
       [MESA_FORMAT_RG1616] = BRW_SURFACEFORMAT_R16G16_UNORM,
       [MESA_FORMAT_RG1616_REV] = 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,

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 746184f5c6cb09036259fe663d91c6814d467111..9065f3855cea484803ce8584992766866fcb4ffe 100755 (executable)
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -92,6 +92,7 @@ intelInitExtensions(struct gl_context *ctx)
 #endif
    ctx->Extensions.OES_draw_texture = true;
    ctx->Extensions.OES_compressed_ETC1_RGB8_texture = true;
+   ctx->Extensions.ARB_texture_rgb10_a2ui = true;
 
    if (intel->gen >= 6)
       ctx->Const.GLSLVersion = 130;