diff options
| author | Mark Mueller <[email protected]> | 2014-01-21 22:27:40 -0800 |
|---|---|---|
| committer | Mark Mueller <[email protected]> | 2014-01-27 14:33:29 -0800 |
| commit | 8b47b6bc32b595ee1a37cde279d44a6ac84403c0 (patch) | |
| tree | 7ff2e9ff0d330b4d5ac3682fada94851ec7b6657 /src/mesa/drivers | |
| parent | 2e02e195febc87a07fb753a25804b347ab2ee938 (diff) | |
mesa: Fix MESA_FORMAT names containg SIGNED
Update comments. Replace format names containing SIGNED with
SNORM appended w/decoration per the format name spec:
s/MESA_FORMAT_SIGNED_R8\b/MESA_FORMAT_R_SNORM8/g
s/MESA_FORMAT_SIGNED_RG88_REV\b/MESA_FORMAT_R8G8_SNORM/g
s/MESA_FORMAT_SIGNED_RGBX8888\b/MESA_FORMAT_X8B8G8R8_SNORM/g
s/MESA_FORMAT_SIGNED_RGBA8888\b/MESA_FORMAT_A8B8G8R8_SNORM/g
s/MESA_FORMAT_SIGNED_RGBA8888_REV\b/MESA_FORMAT_R8G8B8A8_SNORM/g
s/MESA_FORMAT_SIGNED_R16\b/MESA_FORMAT_R_SNORM16/g
s/MESA_FORMAT_SIGNED_GR1616\b/MESA_FORMAT_R16G16_SNORM/g
s/MESA_FORMAT_SIGNED_RGB_16\b/MESA_FORMAT_RGB_SNORM16/g
s/MESA_FORMAT_SIGNED_RGBA_16\b/MESA_FORMAT_RGBA_SNORM16/g
s/MESA_FORMAT_SIGNED_A8\b/MESA_FORMAT_A_SNORM8/g
s/MESA_FORMAT_SIGNED_I8\b/MESA_FORMAT_I_SNORM8/g
s/MESA_FORMAT_SIGNED_L8\b/MESA_FORMAT_L_SNORM8/g
s/MESA_FORMAT_SIGNED_A16\b/MESA_FORMAT_A_SNORM16/g
s/MESA_FORMAT_SIGNED_I16\b/MESA_FORMAT_I_SNORM16/g
s/MESA_FORMAT_SIGNED_L16\b/MESA_FORMAT_L_SNORM16/g
s/MESA_FORMAT_SIGNED_AL88\b/MESA_FORMAT_L8A8_SNORM/g
s/MESA_FORMAT_SIGNED_RG88\b/MESA_FORMAT_G8R8_SNORM/g
s/MESA_FORMAT_SIGNED_RG1616\b/MESA_FORMAT_G16R16_SNORM/g
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 34 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index 46e04805929..a004653d852 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -454,15 +454,15 @@ brw_format_for_mesa_format(mesa_format mesa_format) [MESA_FORMAT_RGBA_UINT32] = BRW_SURFACEFORMAT_R32G32B32A32_UINT, [MESA_FORMAT_DUDV8] = BRW_SURFACEFORMAT_R8G8_SNORM, - [MESA_FORMAT_SIGNED_R8] = BRW_SURFACEFORMAT_R8_SNORM, - [MESA_FORMAT_SIGNED_RG88_REV] = BRW_SURFACEFORMAT_R8G8_SNORM, - [MESA_FORMAT_SIGNED_RGBX8888] = 0, - [MESA_FORMAT_SIGNED_RGBA8888] = 0, - [MESA_FORMAT_SIGNED_RGBA8888_REV] = BRW_SURFACEFORMAT_R8G8B8A8_SNORM, - [MESA_FORMAT_SIGNED_R16] = BRW_SURFACEFORMAT_R16_SNORM, - [MESA_FORMAT_SIGNED_GR1616] = BRW_SURFACEFORMAT_R16G16_SNORM, - [MESA_FORMAT_SIGNED_RGB_16] = BRW_SURFACEFORMAT_R16G16B16_SNORM, - [MESA_FORMAT_SIGNED_RGBA_16] = BRW_SURFACEFORMAT_R16G16B16A16_SNORM, + [MESA_FORMAT_R_SNORM8] = BRW_SURFACEFORMAT_R8_SNORM, + [MESA_FORMAT_R8G8_SNORM] = BRW_SURFACEFORMAT_R8G8_SNORM, + [MESA_FORMAT_X8B8G8R8_SNORM] = 0, + [MESA_FORMAT_A8B8G8R8_SNORM] = 0, + [MESA_FORMAT_R8G8B8A8_SNORM] = BRW_SURFACEFORMAT_R8G8B8A8_SNORM, + [MESA_FORMAT_R_SNORM16] = BRW_SURFACEFORMAT_R16_SNORM, + [MESA_FORMAT_R16G16_SNORM] = BRW_SURFACEFORMAT_R16G16_SNORM, + [MESA_FORMAT_RGB_SNORM16] = BRW_SURFACEFORMAT_R16G16B16_SNORM, + [MESA_FORMAT_RGBA_SNORM16] = BRW_SURFACEFORMAT_R16G16B16A16_SNORM, [MESA_FORMAT_RGBA_UNORM16] = BRW_SURFACEFORMAT_R16G16B16A16_UNORM, [MESA_FORMAT_RED_RGTC1] = BRW_SURFACEFORMAT_BC4_UNORM, @@ -487,14 +487,14 @@ brw_format_for_mesa_format(mesa_format mesa_format) [MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] = BRW_SURFACEFORMAT_ETC2_RGB8_PTA, [MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1] = BRW_SURFACEFORMAT_ETC2_SRGB8_PTA, - [MESA_FORMAT_SIGNED_A8] = 0, - [MESA_FORMAT_SIGNED_L8] = 0, - [MESA_FORMAT_SIGNED_AL88] = 0, - [MESA_FORMAT_SIGNED_I8] = 0, - [MESA_FORMAT_SIGNED_A16] = 0, - [MESA_FORMAT_SIGNED_L16] = 0, - [MESA_FORMAT_SIGNED_AL1616] = 0, - [MESA_FORMAT_SIGNED_I16] = 0, + [MESA_FORMAT_A_SNORM8] = 0, + [MESA_FORMAT_L_SNORM8] = 0, + [MESA_FORMAT_L8A8_SNORM] = 0, + [MESA_FORMAT_I_SNORM8] = 0, + [MESA_FORMAT_A_SNORM16] = 0, + [MESA_FORMAT_L_SNORM16] = 0, + [MESA_FORMAT_LA_SNORM16] = 0, + [MESA_FORMAT_I_SNORM16] = 0, [MESA_FORMAT_R9G9B9E5_FLOAT] = BRW_SURFACEFORMAT_R9G9B9E5_SHAREDEXP, [MESA_FORMAT_R11G11B10_FLOAT] = BRW_SURFACEFORMAT_R11G11B10_FLOAT, diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 47a0afbbd79..5a606375198 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -522,13 +522,13 @@ intel_miptree_create(struct brw_context *brw, format = MESA_FORMAT_R_UNORM16; break; case MESA_FORMAT_ETC2_SIGNED_R11_EAC: - format = MESA_FORMAT_SIGNED_R16; + format = MESA_FORMAT_R_SNORM16; break; case MESA_FORMAT_ETC2_RG11_EAC: format = MESA_FORMAT_R16G16_UNORM; break; case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: - format = MESA_FORMAT_SIGNED_GR1616; + format = MESA_FORMAT_R16G16_SNORM; break; default: /* Non ETC1 / ETC2 format */ |