diff options
| author | Brian Paul <brianp@vmware.com> | 2013-02-14 12:24:02 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-02-17 14:13:13 -0800 |
| commit | d8a0439c65ab4fcc87ee1607b98b6efb18491117 (patch) | |
| tree | 32961cad09cfd3c0cfa2b40b64578d669873cdbe | |
| parent | c785315f3d6b957c6124ce9efafdd47c8d8526a6 (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 <maraeo@gmail.com>
(cherry picked from commit 4be5a067527107a383596c28f14bd76492c1cb4b)
| -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 8f4bc91cb45..5f03cec5e9d 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, |