r600g: add color/texture support for more depth formats.
This commit is contained in:
parent
2cabbb290f
commit
3a1defa5e8
|
@ -313,6 +313,10 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
||||||
return V_028C70_SWAP_STD;
|
return V_028C70_SWAP_STD;
|
||||||
|
|
||||||
|
case PIPE_FORMAT_X8Z24_UNORM:
|
||||||
|
case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
|
||||||
|
return V_028C70_SWAP_STD;
|
||||||
|
|
||||||
case PIPE_FORMAT_R10G10B10A2_UNORM:
|
case PIPE_FORMAT_R10G10B10A2_UNORM:
|
||||||
case PIPE_FORMAT_R10G10B10X2_SNORM:
|
case PIPE_FORMAT_R10G10B10X2_SNORM:
|
||||||
case PIPE_FORMAT_B10G10R10A2_UNORM:
|
case PIPE_FORMAT_B10G10R10A2_UNORM:
|
||||||
|
@ -389,6 +393,10 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
||||||
return V_028C70_COLOR_8_24;
|
return V_028C70_COLOR_8_24;
|
||||||
|
|
||||||
|
case PIPE_FORMAT_X8Z24_UNORM:
|
||||||
|
case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
|
||||||
|
return V_028C70_COLOR_24_8;
|
||||||
|
|
||||||
case PIPE_FORMAT_R32_FLOAT:
|
case PIPE_FORMAT_R32_FLOAT:
|
||||||
return V_028C70_COLOR_32_FLOAT;
|
return V_028C70_COLOR_32_FLOAT;
|
||||||
|
|
||||||
|
|
|
@ -314,6 +314,10 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
|
||||||
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
||||||
return V_0280A0_SWAP_STD;
|
return V_0280A0_SWAP_STD;
|
||||||
|
|
||||||
|
case PIPE_FORMAT_X8Z24_UNORM:
|
||||||
|
case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
|
||||||
|
return V_0280A0_SWAP_STD;
|
||||||
|
|
||||||
case PIPE_FORMAT_R10G10B10A2_UNORM:
|
case PIPE_FORMAT_R10G10B10A2_UNORM:
|
||||||
case PIPE_FORMAT_R10G10B10X2_SNORM:
|
case PIPE_FORMAT_R10G10B10X2_SNORM:
|
||||||
case PIPE_FORMAT_B10G10R10A2_UNORM:
|
case PIPE_FORMAT_B10G10R10A2_UNORM:
|
||||||
|
@ -390,6 +394,10 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
|
||||||
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
||||||
return V_0280A0_COLOR_8_24;
|
return V_0280A0_COLOR_8_24;
|
||||||
|
|
||||||
|
case PIPE_FORMAT_X8Z24_UNORM:
|
||||||
|
case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
|
||||||
|
return V_0280A0_COLOR_24_8;
|
||||||
|
|
||||||
case PIPE_FORMAT_R32_FLOAT:
|
case PIPE_FORMAT_R32_FLOAT:
|
||||||
return V_0280A0_COLOR_32_FLOAT;
|
return V_0280A0_COLOR_32_FLOAT;
|
||||||
|
|
||||||
|
|
|
@ -467,11 +467,13 @@ uint32_t r600_translate_texformat(enum pipe_format format,
|
||||||
result = V_0280A0_COLOR_16;
|
result = V_0280A0_COLOR_16;
|
||||||
goto out_word4;
|
goto out_word4;
|
||||||
case PIPE_FORMAT_Z24X8_UNORM:
|
case PIPE_FORMAT_Z24X8_UNORM:
|
||||||
result = V_0280A0_COLOR_8_24;
|
|
||||||
goto out_word4;
|
|
||||||
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
|
||||||
result = V_0280A0_COLOR_8_24;
|
result = V_0280A0_COLOR_8_24;
|
||||||
goto out_word4;
|
goto out_word4;
|
||||||
|
case PIPE_FORMAT_X8Z24_UNORM:
|
||||||
|
case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
|
||||||
|
result = V_0280A0_COLOR_24_8;
|
||||||
|
goto out_word4;
|
||||||
default:
|
default:
|
||||||
goto out_unknown;
|
goto out_unknown;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue