[Mesa-dev] [PATCH] mesa: fix texStore for FORMAT_Z32_FLOAT_S8X24_UINT

[Marek Olšák]

Yes, but if the original author doesn't reply, I'd like to push this.

Marek

On Thu, Aug 15, 2019 at 8:01 PM Ilia Mirkin <imirkin at alum.mit.edu> wrote:

> Subtle. The source format *can* be 64-bit, by the way, but if it's
> GL_DEPTH_COMPONENT it may well be 32-bit.
>
> But what if it's GL_STENCIL_INDEX -- could it not be 1-byte? IOW,
> should this just be a char *, and use byte addressing and be done with
> it?
>
> On Thu, Aug 15, 2019 at 7:56 PM Marek Olšák <maraeo at gmail.com> wrote:
> >
> > From: Jiadong Zhu <Jiadong.Zhu at amd.com>
> >
> > _mesa_texstore_z32f_x24s8 calculates source rowStride at a
> > pace of 64-bit, this will make inaccuracy offset if the width
> > of src image is an odd number. Modify src pointer to int_32* as
> > source image format is gl_float which is 32-bit per pixel.
> >
> > Signed-off-by: Jiadong Zhu <Jiadong.Zhu at amd.com>
> > Signed-off-by: Marek Olšák <marek.olsak at amd.com>
> > ---
> >  src/mesa/main/texstore.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >  mode change 100644 => 100755 src/mesa/main/texstore.c
> >
> > diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
> > old mode 100644
> > new mode 100755
> > index 2913d4bc067..207695041a7
> > --- a/src/mesa/main/texstore.c
> > +++ b/src/mesa/main/texstore.c
> > @@ -531,35 +531,35 @@ _mesa_texstore_s8(TEXSTORE_PARAMS)
> >     return GL_TRUE;
> >  }
> >
> >
> >  static GLboolean
> >  _mesa_texstore_z32f_x24s8(TEXSTORE_PARAMS)
> >  {
> >     GLint img, row;
> >     const GLint srcRowStride
> >        = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
> > -      / sizeof(uint64_t);
> > +         / sizeof(int32_t);
> >
> >     assert(dstFormat == MESA_FORMAT_Z32_FLOAT_S8X24_UINT);
> >     assert(srcFormat == GL_DEPTH_STENCIL ||
> >            srcFormat == GL_DEPTH_COMPONENT ||
> >            srcFormat == GL_STENCIL_INDEX);
> >     assert(srcFormat != GL_DEPTH_STENCIL ||
> >            srcType == GL_UNSIGNED_INT_24_8 ||
> >            srcType == GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
> >
> >     /* In case we only upload depth we need to preserve the stencil */
> >     for (img = 0; img < srcDepth; img++) {
> >        uint64_t *dstRow = (uint64_t *) dstSlices[img];
> > -      const uint64_t *src
> > -         = (const uint64_t *) _mesa_image_address(dims, srcPacking,
> srcAddr,
> > +      const int32_t *src
> > +         = (const int32_t *) _mesa_image_address(dims, srcPacking,
> srcAddr,
> >                 srcWidth, srcHeight,
> >                 srcFormat, srcType,
> >                 img, 0, 0);
> >        for (row = 0; row < srcHeight; row++) {
> >           /* The unpack functions with:
> >            *    dstType = GL_FLOAT_32_UNSIGNED_INT_24_8_REV
> >            * only write their own dword, so the other dword (stencil
> >            * or depth) is preserved. */
> >           if (srcFormat != GL_STENCIL_INDEX)
> >              _mesa_unpack_depth_span(ctx, srcWidth,
> > --
> > 2.17.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190827/4028a78c/attachment.html>