diff options
| author | Jordan Justen <[email protected]> | 2012-06-09 12:19:11 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2012-07-22 00:10:27 -0700 |
| commit | 257f32ad20d2ef811da2a41af69b0afe6d2cff47 (patch) | |
| tree | a0aacfa55194b1a93d84bed2bbb0f6afedb55be8 | |
| parent | 4e0ece34ed3fc8dacb209a3fb1e9bc8ec129a30a (diff) | |
i965: add ARB_texture_rgb10_a2ui supportrgb10_a2ui-v3
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | docs/GL3.txt | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 1 | ||||
| -rwxr-xr-x | src/mesa/drivers/dri/intel/intel_extensions.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt index 7c68745685c..0f6521d0170 100644 --- 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 82e44f9b83a..57a83d80c8a 100644 --- 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 c2bc0722afa..2bdb8e86d4b 100755 --- 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; |