st/mesa: fix format query for GL_ARB_texture_rg

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 <maraeo@gmail.com>
This commit is contained in:
Brian Paul 2013-02-14 12:24:02 -07:00
parent c37992c54d
commit 4be5a06752
1 changed files with 4 additions and 3 deletions

View File

@ -421,6 +421,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 */
@ -444,9 +448,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,