summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2013-01-24 21:06:50 +0100
committerMarek Olšák <[email protected]>2013-02-06 14:51:31 +0100
commitebe86b80825404cec057fb7e7519864754e9481c (patch)
treed46ea2770e5d0d1276771e04167f932ed5a82c7c /src/mesa/state_tracker
parentcf37aef4143d4a0a679830318217251d027bb193 (diff)
mesa: fixup inconsistent naming of RG16 formats
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 2169bed8961..c13bea804e8 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -184,7 +184,7 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
return PIPE_FORMAT_R16_UNORM;
case MESA_FORMAT_GR88:
return PIPE_FORMAT_R8G8_UNORM;
- case MESA_FORMAT_RG1616:
+ case MESA_FORMAT_GR1616:
return PIPE_FORMAT_R16G16_UNORM;
case MESA_FORMAT_RGBA_16:
return PIPE_FORMAT_R16G16B16A16_UNORM;
@@ -509,7 +509,7 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
case PIPE_FORMAT_R8G8_UNORM:
return MESA_FORMAT_GR88;
case PIPE_FORMAT_R16G16_UNORM:
- return MESA_FORMAT_RG1616;
+ return MESA_FORMAT_GR1616;
case PIPE_FORMAT_A8_UINT:
return MESA_FORMAT_ALPHA_UINT8;