mesa/st: expose ARB_texture_rgb10_a2ui if R10G10B10A2_UINT is supported v2

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Christoph Bumiller
2013-12-26 19:06:25 +01:00
committed by Maarten Lankhorst
parent c7b14ba23f
commit 3efed4cd05
2 changed files with 8 additions and 2 deletions

View File

@@ -419,7 +419,9 @@ void st_init_extensions(struct st_context *st)
PIPE_FORMAT_R16G16B16A16_FLOAT } },
{ { o(ARB_texture_rgb10_a2ui) },
{ PIPE_FORMAT_B10G10R10A2_UINT } },
{ PIPE_FORMAT_R10G10B10A2_UINT,
PIPE_FORMAT_B10G10R10A2_UINT },
GL_TRUE }, /* at least one format must be supported */
{ { o(EXT_framebuffer_sRGB) },
{ PIPE_FORMAT_A8B8G8R8_SRGB,

View File

@@ -359,6 +359,8 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
return PIPE_FORMAT_R11G11B10_FLOAT;
case MESA_FORMAT_ARGB2101010_UINT:
return PIPE_FORMAT_B10G10R10A2_UINT;
case MESA_FORMAT_ABGR2101010_UINT:
return PIPE_FORMAT_R10G10B10A2_UINT;
case MESA_FORMAT_XRGB4444_UNORM:
return PIPE_FORMAT_B4G4R4X4_UNORM;
@@ -712,6 +714,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
case PIPE_FORMAT_B10G10R10A2_UINT:
return MESA_FORMAT_ARGB2101010_UINT;
case PIPE_FORMAT_R10G10B10A2_UINT:
return MESA_FORMAT_ABGR2101010_UINT;
case PIPE_FORMAT_B4G4R4X4_UNORM:
return MESA_FORMAT_XRGB4444_UNORM;
@@ -1483,7 +1487,7 @@ static const struct format_mapping format_map[] = {
},
{
{ GL_RGB10_A2UI, 0 },
{ PIPE_FORMAT_B10G10R10A2_UINT, 0 }
{ PIPE_FORMAT_R10G10B10A2_UINT, PIPE_FORMAT_B10G10R10A2_UINT, 0 }
},
};