On Thu, 2016-12-01 at 18:58 -0800, Jason Ekstrand wrote: > On Fri, Nov 25, 2016 at 12:52 AM, Juan A. Suarez Romero <jasuarez@iga > lia.com> wrote: > > From: Samuel Iglesias Gonsálvez <sigles...@igalia.com> > > > > > > > > We use *64*_PASSTHRU formats to upload vertex attributes of 64 bits > > > > to avoid conversions. From the BDW PRM, Volume 2d, page 586 > > > > (VERTEX_ELEMENT_STATE): > > > > > > > > "When SourceElementFormat is set to one of the *64*_PASSTHRU > > > > formats, 64-bit components are stored in the URB without any > > > > conversion. In this case, vertex elements must be written as > > 128 > > > > or 256 bits, with VFCOMP_STORE_0 being used to pad the output > > > > as required. E.g., if R64_PASSTHRU is used to copy a 64-bit > > Red > > > > component into the URB, Component 1 must be specified as > > > > VFCOMP_STORE_0 (with Components 2,3 set to VFCOMP_NOSTORE) > > > > in order to output a 128-bit vertex element, or Components 1-3 > > must > > > > be specified as VFCOMP_STORE_0 in order to output a 256-bit > > vertex > > > > element. Likewise, use of R64G64B64_PASSTHRU requires > > Component 3 > > > > to be specified as VFCOMP_STORE_0 in order to output a 256-bit > > vertex > > > > element." > > > > > > > > Signed-off-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> > > > > --- > > > > src/intel/isl/isl_format.c | 4 ++-- > > > > src/intel/isl/isl_format_layout.csv | 3 --- > > > > src/intel/vulkan/anv_formats.c | 8 ++++---- > > > > 3 files changed, 6 insertions(+), 9 deletions(-) > > > > > > > > diff --git a/src/intel/isl/isl_format.c > > b/src/intel/isl/isl_format.c > > > > index 98806f4..92b630a 100644 > > > > --- a/src/intel/isl/isl_format.c > > > > +++ b/src/intel/isl/isl_format.c > > > > @@ -97,7 +97,7 @@ static const struct surface_format_info > > format_info[] = { > > > > SF( x, x, x, x, x, x, Y, x, x, x, > > R32G32B32A32_SSCALED) > > > > SF( x, x, x, x, x, x, Y, x, x, x, > > R32G32B32A32_USCALED) > > > > SF( x, x, x, x, x, x, 75, x, x, x, > > R32G32B32A32_SFIXED) > > > > - SF( x, x, x, x, x, x, x, x, x, x, R64G64_PASSTHRU) > > > > + SF( x, x, x, x, x, x, 80, x, x, x, R64G64_PASSTHRU) > > > > SF( Y, 50, x, x, x, x, Y, Y, x, x, R32G32B32_FLOAT) > > > > SF( Y, x, x, x, x, x, Y, Y, x, x, R32G32B32_SINT) > > > > SF( Y, x, x, x, x, x, Y, Y, x, x, R32G32B32_UINT) > > > > @@ -131,7 +131,7 @@ static const struct surface_format_info > > format_info[] = { > > > > SF( x, x, x, x, x, x, Y, x, x, x, R32G32_SSCALED) > > > > SF( x, x, x, x, x, x, Y, x, x, x, R32G32_USCALED) > > > > SF( x, x, x, x, x, x, 75, x, x, x, R32G32_SFIXED) > > > > - SF( x, x, x, x, x, x, x, x, x, x, R64_PASSTHRU) > > > > + SF( x, x, x, x, x, x, 80, x, x, x, R64_PASSTHRU) > > > > SF( Y, Y, x, Y, Y, Y, Y, x, 60, 90, B8G8R8A8_UNORM) > > > > SF( Y, Y, x, x, Y, Y, x, x, x, x, > > B8G8R8A8_UNORM_SRGB) > > > > /* smpl filt shad CK RT AB VB SO color ccs_e */ > > > > diff --git a/src/intel/isl/isl_format_layout.csv > > b/src/intel/isl/isl_format_layout.csv > > > > index f0f31c7..b1e298b 100644 > > > > --- a/src/intel/isl/isl_format_layout.csv > > > > +++ b/src/intel/isl/isl_format_layout.csv > > > > @@ -96,7 +96,6 @@ X32_TYPELESS_G8X24_UINT , 64, 1, 1, 1, > > x32, ui8, x24, , , > > > > L32A32_FLOAT , 64, 1, 1, 1, , , , > > sf32, sf32, , , linear, > > > > R32G32_UNORM , 64, 1, 1, 1, un32, un32, , > > , , , , linear, > > > > R32G32_SNORM , 64, 1, 1, 1, sn32, sn32, , > > , , , , linear, > > > > -R64_FLOAT , 64, 1, 1, 1, sf64, , , > > , , , , linear, > > > > R16G16B16X16_UNORM , 64, 1, 1, 1, un16, un16, un16, > > x16, , , , linear, > > > > R16G16B16X16_FLOAT , 64, 1, 1, 1, sf16, sf16, sf16, > > x16, , , , linear, > > > > A32X32_FLOAT , 64, 1, 1, 1, , , , > > sf32, x32, , , alpha, > > > > @@ -243,8 +242,6 @@ R8G8B8_UNORM , 24, 1, 1, 1, > > un8, un8, un8, , , > > > > R8G8B8_SNORM , 24, 1, 1, 1, sn8, sn8, sn8, > > , , , , linear, > > > > R8G8B8_SSCALED , 24, 1, 1, 1, ss8, ss8, ss8, > > , , , , linear, > > > > R8G8B8_USCALED , 24, 1, 1, 1, us8, us8, us8, > > , , , , linear, > > > > -R64G64B64A64_FLOAT , 256, 1, 1, 1, sf64, sf64, sf64, > > sf64, , , , linear, > > > > -R64G64B64_FLOAT , 196, 1, 1, 1, sf64, sf64, sf64, > > , , , , linear, > > Why are we deleting these three formats? Do they not exist? Are > their entries wrong? The isl_format_layout table contains > information for several formats that are unused in either driver. > I'd rather leave them here unless they are causing a problem. >
OK, then we will keep them. I was deleting them because they were unused but you are right. Sam > > BC4_SNORM , 64, 4, 4, 1, sn8, , , > > , , , , linear, rgtc1 > > > > BC5_SNORM , 128, 4, 4, 1, sn8, sn8, , > > , , , , linear, rgtc2 > > > > R16G16B16_FLOAT , 48, 1, 1, 1, sf16, sf16, sf16, > > , , , , linear, > > > > diff --git a/src/intel/vulkan/anv_formats.c > > b/src/intel/vulkan/anv_formats.c > > > > index 9ef998c..39810d4 100644 > > > > --- a/src/intel/vulkan/anv_formats.c > > > > +++ b/src/intel/vulkan/anv_formats.c > > > > @@ -156,16 +156,16 @@ static const struct anv_format anv_formats[] > > = { > > > > fmt(VK_FORMAT_R32G32B32A32_SFLOAT, > > ISL_FORMAT_R32G32B32A32_FLOAT), > > > > fmt(VK_FORMAT_R64_UINT, > > ISL_FORMAT_R64_PASSTHRU), > > > > fmt(VK_FORMAT_R64_SINT, > > ISL_FORMAT_R64_PASSTHRU), > > > > - fmt(VK_FORMAT_R64_SFLOAT, ISL_FORMAT_R64_FLOAT), > > > > + fmt(VK_FORMAT_R64_SFLOAT, > > ISL_FORMAT_R64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64_UINT, > > ISL_FORMAT_R64G64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64_SINT, > > ISL_FORMAT_R64G64_PASSTHRU), > > > > - fmt(VK_FORMAT_R64G64_SFLOAT, > > ISL_FORMAT_R64G64_FLOAT), > > > > + fmt(VK_FORMAT_R64G64_SFLOAT, > > ISL_FORMAT_R64G64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64B64_UINT, > > ISL_FORMAT_R64G64B64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64B64_SINT, > > ISL_FORMAT_R64G64B64_PASSTHRU), > > > > - fmt(VK_FORMAT_R64G64B64_SFLOAT, > > ISL_FORMAT_R64G64B64_FLOAT), > > > > + fmt(VK_FORMAT_R64G64B64_SFLOAT, > > ISL_FORMAT_R64G64B64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64B64A64_UINT, > > ISL_FORMAT_R64G64B64A64_PASSTHRU), > > > > fmt(VK_FORMAT_R64G64B64A64_SINT, > > ISL_FORMAT_R64G64B64A64_PASSTHRU), > > > > - fmt(VK_FORMAT_R64G64B64A64_SFLOAT, > > ISL_FORMAT_R64G64B64A64_FLOAT), > > > > + fmt(VK_FORMAT_R64G64B64A64_SFLOAT, > > ISL_FORMAT_R64G64B64A64_PASSTHRU), > > > > fmt(VK_FORMAT_B10G11R11_UFLOAT_PACK32, > > ISL_FORMAT_R11G11B10_FLOAT), > > > > fmt(VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, > > ISL_FORMAT_R9G9B9E5_SHAREDEXP), > > > > > > > > -- > > > > 2.7.4 > > > > > > > > _______________________________________________ > > > > mesa-dev mailing list > > > > mesa-dev@lists.freedesktop.org > > > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > > > > > > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev