Am Freitag, den 21.07.2017, 12:49 +0200 schrieb Wladimir J. van der Laan: > Remove the following duplicates from the formats table: > > - R8G8B8A8_UNORM (V_,_T) > - R8G8B8X8_UNORM (_T,_T) > - DXT3_RGBA (_T,_T) > > Only the first has an effect because the _T overrides the V_ initializer, > the latter two were harmless duplications of the same.
Urgh, well spotted. Has this caused issues in any application? Regards, Lucas > Signed-off-by: Wladimir J. van der Laan <[email protected]> > --- > src/gallium/drivers/etnaviv/etnaviv_format.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c > b/src/gallium/drivers/etnaviv/etnaviv_format.c > index 492499a..69e07bc 100644 > --- a/src/gallium/drivers/etnaviv/etnaviv_format.c > +++ b/src/gallium/drivers/etnaviv/etnaviv_format.c > @@ -155,7 +155,7 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = { > > V_(A8B8G8R8_UNORM, UNSIGNED_BYTE, NONE), > > - V_(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8), > + VT(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8, SWIZ(X, Y, Z, W), A8B8G8R8), > V_(R8G8B8A8_SNORM, BYTE, A8B8G8R8), > _T(R8G8B8X8_UNORM, X8B8G8R8, SWIZ(X, Y, Z, W), X8B8G8R8), > V_(R8G8B8A8_UINT, UNSIGNED_BYTE, A8B8G8R8), > @@ -163,9 +163,6 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = { > V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8), > V_(R8G8B8A8_SSCALED, BYTE, A8B8G8R8), > > - _T(R8G8B8A8_UNORM, A8B8G8R8, SWIZ(X, Y, Z, W), A8B8G8R8), > - _T(R8G8B8X8_UNORM, X8B8G8R8, SWIZ(X, Y, Z, W), X8B8G8R8), > - > _T(B8G8R8A8_UNORM, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8), > _T(B8G8R8X8_UNORM, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8), > > @@ -230,7 +227,6 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = { > _T(DXT1_RGB, DXT1, SWIZ(X, Y, Z, W), NONE), > _T(DXT1_RGBA, DXT1, SWIZ(X, Y, Z, W), NONE), > _T(DXT3_RGBA, DXT2_DXT3, SWIZ(X, Y, Z, W), NONE), > - _T(DXT3_RGBA, DXT2_DXT3, SWIZ(X, Y, Z, W), NONE), > _T(DXT5_RGBA, DXT4_DXT5, SWIZ(X, Y, Z, W), NONE), > > _T(ETC2_RGB8, EXT_NONE | EXT_FORMAT, > SWIZ(X, Y, Z, W), NONE), /* Extd. format NONE doubles as ETC2_RGB8 */ _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
