diff options
| author | Brian Paul <[email protected]> | 2013-02-14 12:24:02 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-02-15 09:25:14 -0700 |
| commit | 4be5a067527107a383596c28f14bd76492c1cb4b (patch) | |
| tree | ff5e226cc7aaaf342f60037b84850eb173537c49 /src | |
| parent | c37992c54d753e732783f712dea2d483450371dd (diff) | |
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 <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 4d2d43d7e0a..11db9d3f318 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -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, |