aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_format.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 348853affd8..84b744e3df5 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -89,6 +89,8 @@ st_mesa_format_to_pipe_format(const struct st_context *st, mesa_format mesaForma
return PIPE_FORMAT_B10G10R10A2_UNORM;
case MESA_FORMAT_R10G10B10A2_UNORM:
return PIPE_FORMAT_R10G10B10A2_UNORM;
+ case MESA_FORMAT_R10G10B10X2_UNORM:
+ return PIPE_FORMAT_R10G10B10X2_UNORM;
case MESA_FORMAT_L4A4_UNORM:
return PIPE_FORMAT_L4A4_UNORM;
case MESA_FORMAT_L8A8_UNORM:
@@ -566,6 +568,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
return MESA_FORMAT_B10G10R10A2_UNORM;
case PIPE_FORMAT_R10G10B10A2_UNORM:
return MESA_FORMAT_R10G10B10A2_UNORM;
+ case PIPE_FORMAT_R10G10B10X2_UNORM:
+ return MESA_FORMAT_R10G10B10X2_UNORM;
case PIPE_FORMAT_L4A4_UNORM:
return MESA_FORMAT_L4A4_UNORM;
case PIPE_FORMAT_LA88_UNORM:
@@ -1058,7 +1062,7 @@ test_format_conversion(struct st_context *st)
struct format_mapping
{
GLenum glFormats[18]; /**< list of GLenum formats, 0-terminated */
- enum pipe_format pipeFormats[13]; /**< list of pipe formats, 0-terminated */
+ enum pipe_format pipeFormats[14]; /**< list of pipe formats, 0-terminated */
};
@@ -1110,8 +1114,9 @@ static const struct format_mapping format_map[] = {
/* Basic RGB, RGBA formats */
{
{ GL_RGB10, 0 },
- { PIPE_FORMAT_B10G10R10X2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM,
- PIPE_FORMAT_R10G10B10A2_UNORM, DEFAULT_RGB_FORMATS }
+ { PIPE_FORMAT_R10G10B10X2_UNORM, PIPE_FORMAT_B10G10R10X2_UNORM,
+ PIPE_FORMAT_R10G10B10A2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM,
+ DEFAULT_RGB_FORMATS }
},
{
{ GL_RGB10_A2, 0 },