diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2013-02-08 18:03:33 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-02-17 14:09:09 -0800 |
commit | 60bad0ddc3481c4f33b836804a7c9df0b284d7e1 (patch) | |
tree | 5c546aabd2f1ee39e93ee1c92fd48e517380ffe3 /src | |
parent | d41e9b4d14dab2d1d6633bb461de4074e33fb130 (diff) |
intel: Do not expose OES_compressed_ETC1_RGB8_texture or ARB_texture_rgb10_a2ui pre-GEN4
Older hardware cannot do ARB_texture_rgb10_a2ui, and the translation
code for OES_compressed_ETC1_RGB8_texture was never implemented in the
i915 driver.
NOTE: This is a candidate for all stable branches.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 0e2f26d5ea26febd16173aa8bbf7427b090e320f)
Diffstat (limited to 'src')
-rwxr-xr-x | src/mesa/drivers/dri/intel/intel_extensions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 6b5f6780cc0..4040ac68ebf 100755 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -86,8 +86,6 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.TDFX_texture_compression_FXT1 = true; ctx->Extensions.OES_EGL_image = true; 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 = 140; @@ -144,6 +142,7 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.EXT_packed_float = true; ctx->Extensions.ARB_texture_compression_rgtc = true; ctx->Extensions.ARB_texture_rg = true; + ctx->Extensions.ARB_texture_rgb10_a2ui = true; ctx->Extensions.ARB_vertex_type_2_10_10_10_rev = true; ctx->Extensions.EXT_draw_buffers2 = true; ctx->Extensions.EXT_framebuffer_sRGB = true; @@ -157,6 +156,7 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.ATI_envmap_bumpmap = true; ctx->Extensions.MESA_texture_array = true; ctx->Extensions.NV_conditional_render = true; + ctx->Extensions.OES_compressed_ETC1_RGB8_texture = true; ctx->Extensions.OES_standard_derivatives = true; } |