r600g: add L8A8 SRGB formats.
this fixes the piglit mipmap generation sRGB on my rv730. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
6e7d782da5
commit
04903d1f63
|
@ -296,6 +296,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
return V_028C70_SWAP_ALT_REV;
|
return V_028C70_SWAP_ALT_REV;
|
||||||
case PIPE_FORMAT_I8_UNORM:
|
case PIPE_FORMAT_I8_UNORM:
|
||||||
case PIPE_FORMAT_L8_UNORM:
|
case PIPE_FORMAT_L8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8_SRGB:
|
||||||
case PIPE_FORMAT_R8_UNORM:
|
case PIPE_FORMAT_R8_UNORM:
|
||||||
case PIPE_FORMAT_R8_SNORM:
|
case PIPE_FORMAT_R8_SNORM:
|
||||||
return V_028C70_SWAP_STD;
|
return V_028C70_SWAP_STD;
|
||||||
|
@ -316,6 +317,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
return V_028C70_SWAP_STD;
|
return V_028C70_SWAP_STD;
|
||||||
|
|
||||||
case PIPE_FORMAT_L8A8_UNORM:
|
case PIPE_FORMAT_L8A8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8A8_SRGB:
|
||||||
return V_028C70_SWAP_ALT;
|
return V_028C70_SWAP_ALT;
|
||||||
case PIPE_FORMAT_R8G8_UNORM:
|
case PIPE_FORMAT_R8G8_UNORM:
|
||||||
return V_028C70_SWAP_STD;
|
return V_028C70_SWAP_STD;
|
||||||
|
@ -391,6 +393,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
case PIPE_FORMAT_A8_UNORM:
|
case PIPE_FORMAT_A8_UNORM:
|
||||||
case PIPE_FORMAT_I8_UNORM:
|
case PIPE_FORMAT_I8_UNORM:
|
||||||
case PIPE_FORMAT_L8_UNORM:
|
case PIPE_FORMAT_L8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8_SRGB:
|
||||||
case PIPE_FORMAT_R8_UNORM:
|
case PIPE_FORMAT_R8_UNORM:
|
||||||
case PIPE_FORMAT_R8_SNORM:
|
case PIPE_FORMAT_R8_SNORM:
|
||||||
return V_028C70_COLOR_8;
|
return V_028C70_COLOR_8;
|
||||||
|
@ -411,6 +414,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
return V_028C70_COLOR_16;
|
return V_028C70_COLOR_16;
|
||||||
|
|
||||||
case PIPE_FORMAT_L8A8_UNORM:
|
case PIPE_FORMAT_L8A8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8A8_SRGB:
|
||||||
case PIPE_FORMAT_R8G8_UNORM:
|
case PIPE_FORMAT_R8G8_UNORM:
|
||||||
return V_028C70_COLOR_8_8;
|
return V_028C70_COLOR_8_8;
|
||||||
|
|
||||||
|
|
|
@ -285,6 +285,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
return V_0280A0_SWAP_ALT_REV;
|
return V_0280A0_SWAP_ALT_REV;
|
||||||
case PIPE_FORMAT_I8_UNORM:
|
case PIPE_FORMAT_I8_UNORM:
|
||||||
case PIPE_FORMAT_L8_UNORM:
|
case PIPE_FORMAT_L8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8_SRGB:
|
||||||
case PIPE_FORMAT_R8_UNORM:
|
case PIPE_FORMAT_R8_UNORM:
|
||||||
case PIPE_FORMAT_R8_SNORM:
|
case PIPE_FORMAT_R8_SNORM:
|
||||||
return V_0280A0_SWAP_STD;
|
return V_0280A0_SWAP_STD;
|
||||||
|
@ -308,6 +309,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
return V_0280A0_SWAP_STD;
|
return V_0280A0_SWAP_STD;
|
||||||
|
|
||||||
case PIPE_FORMAT_L8A8_UNORM:
|
case PIPE_FORMAT_L8A8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8A8_SRGB:
|
||||||
return V_0280A0_SWAP_ALT;
|
return V_0280A0_SWAP_ALT;
|
||||||
case PIPE_FORMAT_R8G8_UNORM:
|
case PIPE_FORMAT_R8G8_UNORM:
|
||||||
return V_0280A0_SWAP_STD;
|
return V_0280A0_SWAP_STD;
|
||||||
|
@ -384,6 +386,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
case PIPE_FORMAT_A8_UNORM:
|
case PIPE_FORMAT_A8_UNORM:
|
||||||
case PIPE_FORMAT_I8_UNORM:
|
case PIPE_FORMAT_I8_UNORM:
|
||||||
case PIPE_FORMAT_L8_UNORM:
|
case PIPE_FORMAT_L8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8_SRGB:
|
||||||
case PIPE_FORMAT_R8_UNORM:
|
case PIPE_FORMAT_R8_UNORM:
|
||||||
case PIPE_FORMAT_R8_SNORM:
|
case PIPE_FORMAT_R8_SNORM:
|
||||||
return V_0280A0_COLOR_8;
|
return V_0280A0_COLOR_8;
|
||||||
|
@ -404,6 +407,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
return V_0280A0_COLOR_16;
|
return V_0280A0_COLOR_16;
|
||||||
|
|
||||||
case PIPE_FORMAT_L8A8_UNORM:
|
case PIPE_FORMAT_L8A8_UNORM:
|
||||||
|
case PIPE_FORMAT_L8A8_SRGB:
|
||||||
case PIPE_FORMAT_R8G8_UNORM:
|
case PIPE_FORMAT_R8G8_UNORM:
|
||||||
return V_0280A0_COLOR_8_8;
|
return V_0280A0_COLOR_8_8;
|
||||||
|
|
||||||
|
|
|
@ -859,8 +859,6 @@ uint32_t r600_translate_texformat(enum pipe_format format,
|
||||||
|
|
||||||
case UTIL_FORMAT_COLORSPACE_SRGB:
|
case UTIL_FORMAT_COLORSPACE_SRGB:
|
||||||
word4 |= S_038010_FORCE_DEGAMMA(1);
|
word4 |= S_038010_FORCE_DEGAMMA(1);
|
||||||
if (format == PIPE_FORMAT_L8A8_SRGB || format == PIPE_FORMAT_L8_SRGB)
|
|
||||||
goto out_unknown; /* fails for some reason - TODO */
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue