KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: choose 3-component float formats before 4-component formats 

If GL_RGB16F or GL_RGB32F is specified let's try the 3-component float
texture formats before trying the 4-component ones.  Before this,
GL_RGB16/32F were treated the same as GL_RGBA16/32F.

Reviewed-by: Marek Olšák <maraeo@gmail.com>
This commit is contained in:
Brian Paul 2011-04-27 09:06:07 -06:00
parent 48aa772589
commit 66d95919d5
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mesa/state_tracker/st_format.c
View File

@ -954,14 +954,24 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
/* prefer formats in order of data size, choosing 16-bit ones if equal sized */
case GL_RGBA16F_ARB:
case GL_RGB16F_ARB:
{
static const enum pipe_format formats[] = {
PIPE_FORMAT_R16G16B16A16_FLOAT,
PIPE_FORMAT_R32G32B32A32_FLOAT
};
return find_supported_format(screen, formats, Elements(formats),
target, sample_count, bindings);
target, sample_count, bindings);
}
case GL_RGB16F_ARB:
{
static const enum pipe_format formats[] = {
PIPE_FORMAT_R16G16B16_FLOAT,
PIPE_FORMAT_R16G16B16A16_FLOAT,
PIPE_FORMAT_R32G32B32_FLOAT,
PIPE_FORMAT_R32G32B32A32_FLOAT
};
return find_supported_format(screen, formats, Elements(formats),
target, sample_count, bindings);
}
case GL_LUMINANCE_ALPHA16F_ARB:
{
@ -1040,14 +1050,23 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
/* try a 32-bit format if available, otherwise fallback to a 16-bit one */
case GL_RGBA32F_ARB:
case GL_RGB32F_ARB:
{
static const enum pipe_format formats[] = {
PIPE_FORMAT_R32G32B32A32_FLOAT,
PIPE_FORMAT_R16G16B16A16_FLOAT
};
return find_supported_format(screen, formats, Elements(formats),
target, sample_count, bindings);
target, sample_count, bindings);
}
case GL_RGB32F_ARB:
{
static const enum pipe_format formats[] = {
PIPE_FORMAT_R32G32B32_FLOAT,
PIPE_FORMAT_R32G32B32A32_FLOAT,
PIPE_FORMAT_R16G16B16A16_FLOAT
};
return find_supported_format(screen, formats, Elements(formats),
target, sample_count, bindings);
}
case GL_LUMINANCE_ALPHA32F_ARB:
{