diff options
| author | Marek Olšák <[email protected]> | 2013-01-24 21:06:50 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-02-06 14:51:31 +0100 |
| commit | ebe86b80825404cec057fb7e7519864754e9481c (patch) | |
| tree | d46ea2770e5d0d1276771e04167f932ed5a82c7c /src/mesa/drivers | |
| parent | cf37aef4143d4a0a679830318217251d027bb193 (diff) | |
mesa: fixup inconsistent naming of RG16 formats
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index f8251b2f0fe..77b7ab34c50 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -335,8 +335,8 @@ brw_format_for_mesa_format(gl_format mesa_format) [MESA_FORMAT_GR88] = BRW_SURFACEFORMAT_R8G8_UNORM, [MESA_FORMAT_RG88] = 0, [MESA_FORMAT_R16] = BRW_SURFACEFORMAT_R16_UNORM, - [MESA_FORMAT_RG1616] = BRW_SURFACEFORMAT_R16G16_UNORM, - [MESA_FORMAT_RG1616_REV] = 0, + [MESA_FORMAT_GR1616] = BRW_SURFACEFORMAT_R16G16_UNORM, + [MESA_FORMAT_RG1616] = 0, [MESA_FORMAT_ARGB2101010] = BRW_SURFACEFORMAT_B10G10R10A2_UNORM, [MESA_FORMAT_ABGR2101010_UINT] = BRW_SURFACEFORMAT_R10G10B10A2_UINT, [MESA_FORMAT_Z24_S8] = 0, diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index 3c4749f309b..306cbbea177 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -325,7 +325,7 @@ intel_miptree_create(struct intel_context *intel, format = MESA_FORMAT_SIGNED_R16; break; case MESA_FORMAT_ETC2_RG11_EAC: - format = MESA_FORMAT_RG1616; + format = MESA_FORMAT_GR1616; break; case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: format = MESA_FORMAT_SIGNED_GR1616; |