nouveau: remove final PIPE_FORMAT_U_* usage
This commit is contained in:
@@ -44,9 +44,9 @@ nv10_texture_formats[] = {
|
||||
_(A8R8G8B8_UNORM, A8R8G8B8),
|
||||
_(A1R5G5B5_UNORM, A1R5G5B5),
|
||||
_(A4R4G4B4_UNORM, A4R4G4B4),
|
||||
_(U_L8 , L8 ),
|
||||
_(U_A8 , A8 ),
|
||||
_(U_A8_L8 , A8L8 ),
|
||||
_(L8_UNORM , L8 ),
|
||||
_(A8_UNORM , A8 ),
|
||||
_(A8L8_UNORM , A8L8 ),
|
||||
// _(RGB_DXT1 , DXT1, ),
|
||||
// _(RGBA_DXT1 , DXT1, ),
|
||||
// _(RGBA_DXT3 , DXT3, ),
|
||||
|
||||
@@ -102,9 +102,9 @@ nv10_screen_is_format_supported(struct pipe_screen *screen,
|
||||
case PIPE_FORMAT_A1R5G5B5_UNORM:
|
||||
case PIPE_FORMAT_A4R4G4B4_UNORM:
|
||||
case PIPE_FORMAT_R5G6B5_UNORM:
|
||||
case PIPE_FORMAT_U_L8:
|
||||
case PIPE_FORMAT_U_A8:
|
||||
case PIPE_FORMAT_U_I8:
|
||||
case PIPE_FORMAT_L8_UNORM:
|
||||
case PIPE_FORMAT_A8_UNORM:
|
||||
case PIPE_FORMAT_I8_UNORM:
|
||||
return TRUE;
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -50,10 +50,10 @@ nv30_texture_formats[] = {
|
||||
_(A1R5G5B5_UNORM, A1R5G5B5, S1, S1, S1, S1, X, Y, Z, W),
|
||||
_(A4R4G4B4_UNORM, A4R4G4B4, S1, S1, S1, S1, X, Y, Z, W),
|
||||
// _(R5G6B5_UNORM , R5G6B5 , S1, S1, S1, ONE, X, Y, Z, W),
|
||||
_(U_L8 , L8 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(U_A8 , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X),
|
||||
_(U_I8 , L8 , S1, S1, S1, S1, X, X, X, X),
|
||||
_(U_A8_L8 , A8L8 , S1, S1, S1, S1, X, X, X, Y),
|
||||
_(L8_UNORM , L8 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(A8_UNORM , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X),
|
||||
_(I8_UNORM , L8 , S1, S1, S1, S1, X, X, X, X),
|
||||
_(A8L8_UNORM , A8L8 , S1, S1, S1, S1, X, X, X, Y),
|
||||
// _(Z16_UNORM , Z16 , S1, S1, S1, ONE, X, X, X, X),
|
||||
// _(Z24S8_UNORM , Z24 , S1, S1, S1, ONE, X, X, X, X),
|
||||
// _(RGB_DXT1 , 0x86, S1, S1, S1, ONE, X, Y, Z, W, 0x00, 0x00),
|
||||
|
||||
@@ -106,10 +106,10 @@ nv30_screen_surface_format_supported(struct pipe_screen *pscreen,
|
||||
case PIPE_FORMAT_A1R5G5B5_UNORM:
|
||||
case PIPE_FORMAT_A4R4G4B4_UNORM:
|
||||
case PIPE_FORMAT_R5G6B5_UNORM:
|
||||
case PIPE_FORMAT_U_L8:
|
||||
case PIPE_FORMAT_U_A8:
|
||||
case PIPE_FORMAT_U_I8:
|
||||
case PIPE_FORMAT_U_A8_L8:
|
||||
case PIPE_FORMAT_L8_UNORM:
|
||||
case PIPE_FORMAT_A8_UNORM:
|
||||
case PIPE_FORMAT_I8_UNORM:
|
||||
case PIPE_FORMAT_A8L8_UNORM:
|
||||
case PIPE_FORMAT_Z16_UNORM:
|
||||
case PIPE_FORMAT_Z24S8_UNORM:
|
||||
return TRUE;
|
||||
|
||||
@@ -24,10 +24,10 @@ nv40_texture_formats[] = {
|
||||
_(A1R5G5B5_UNORM, A1R5G5B5, S1, S1, S1, S1, X, Y, Z, W),
|
||||
_(A4R4G4B4_UNORM, A4R4G4B4, S1, S1, S1, S1, X, Y, Z, W),
|
||||
_(R5G6B5_UNORM , R5G6B5 , S1, S1, S1, ONE, X, Y, Z, W),
|
||||
_(U_L8 , L8 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(U_A8 , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X),
|
||||
_(U_I8 , L8 , S1, S1, S1, S1, X, X, X, X),
|
||||
_(U_A8_L8 , A8L8 , S1, S1, S1, S1, X, X, X, Y),
|
||||
_(L8_UNORM , L8 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(A8_UNORM , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X),
|
||||
_(I8_UNORM , L8 , S1, S1, S1, S1, X, X, X, X),
|
||||
_(A8L8_UNORM , A8L8 , S1, S1, S1, S1, X, X, X, Y),
|
||||
_(Z16_UNORM , Z16 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(Z24S8_UNORM , Z24 , S1, S1, S1, ONE, X, X, X, X),
|
||||
_(DXT1_RGB , DXT1 , S1, S1, S1, ONE, X, Y, Z, W),
|
||||
|
||||
@@ -111,10 +111,10 @@ nv40_screen_surface_format_supported(struct pipe_screen *pscreen,
|
||||
case PIPE_FORMAT_A1R5G5B5_UNORM:
|
||||
case PIPE_FORMAT_A4R4G4B4_UNORM:
|
||||
case PIPE_FORMAT_R5G6B5_UNORM:
|
||||
case PIPE_FORMAT_U_L8:
|
||||
case PIPE_FORMAT_U_A8:
|
||||
case PIPE_FORMAT_U_I8:
|
||||
case PIPE_FORMAT_U_A8_L8:
|
||||
case PIPE_FORMAT_L8_UNORM:
|
||||
case PIPE_FORMAT_A8_UNORM:
|
||||
case PIPE_FORMAT_I8_UNORM:
|
||||
case PIPE_FORMAT_A8L8_UNORM:
|
||||
case PIPE_FORMAT_Z16_UNORM:
|
||||
case PIPE_FORMAT_Z24S8_UNORM:
|
||||
case PIPE_FORMAT_DXT1_RGB:
|
||||
|
||||
Reference in New Issue
Block a user