From a21707ae13980f017daac014c2ec0f770742d749 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 14 Feb 2013 12:24:02 -0700 Subject: st/mesa: fix format query for GL_ARB_texture_rg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GL_ARB_texture_rg spec says that we need to support both texturing and rendering for the GL_RED and GL_RG formats. So move the format check up into the rendertarget_mapping[] list. Also, add PIPE_FORMAT_R8_UNORM to the list of formats required. Note: This is a candidate for the stable branches. Reviewed-by: Marek Olšák (cherry picked from commit 4be5a067527107a383596c28f14bd76492c1cb4b) --- src/mesa/state_tracker/st_extensions.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index f7a271e6d8..e8064954ed 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -398,6 +398,10 @@ void st_init_extensions(struct st_context *st) { { o(EXT_texture_integer) }, { PIPE_FORMAT_R32G32B32A32_UINT, PIPE_FORMAT_R32G32B32A32_SINT } }, + + { { o(ARB_texture_rg) }, + { PIPE_FORMAT_R8_UNORM, + PIPE_FORMAT_R8G8_UNORM } }, }; /* Required: depth stencil and sampler support */ @@ -421,9 +425,6 @@ void st_init_extensions(struct st_context *st) PIPE_FORMAT_RGTC2_UNORM, PIPE_FORMAT_RGTC2_SNORM } }, - { { o(ARB_texture_rg) }, - { PIPE_FORMAT_R8G8_UNORM } }, - { { o(EXT_texture_compression_latc) }, { PIPE_FORMAT_LATC1_UNORM, PIPE_FORMAT_LATC1_SNORM, -- cgit v1.2.3