Skip to content

A
angle
Commit 846ca843 by Jamie Madill
Options

Fix 2D tex array buffer unpacking.

In some cases, when an unpack buffer is enabled, we would use the incorrect layer offset, because we would think the pixel pointer was NULL. Use a new parameter instead of the double "null" meaning to fix this. This fixes several tests in the dEQP texture specification group. (EG: dEQP-GLES3.functional.texture.specification.teximage3d_pbo) BUG=angle:899 Change-Id: If96bba6987a04653301efc348d32de372a237aa1 Reviewed-on: https://chromium-review.googlesource.com/244092Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent 9d294c33
Showing with 47 additions and 33 deletions
src/libANGLE/renderer/d3d/TextureD3D.cpp
......@@ -29,7 +29,8 @@ namespace rx
namespace
{
gl::Error GetUnpackPointer(const gl::PixelUnpackState &unpack, const uint8_t *pixels, const uint8_t **pointerOut)
gl::Error GetUnpackPointer(const gl::PixelUnpackState &unpack, const uint8_t *pixels,
ptrdiff_t layerOffset, const uint8_t **pointerOut)
{
if (unpack.pixelBuffer.id() != 0)
{
......@@ -55,6 +56,12 @@ gl::Error GetUnpackPointer(const gl::PixelUnpackState &unpack, const uint8_t *pi
*pointerOut = pixels;
}
// Offset the pointer for 2D array layer (if it's valid)
if (*pointerOut != nullptr)
{
*pointerOut += layerOffset;
}
return gl::Error(GL_NO_ERROR);
}
......@@ -144,7 +151,9 @@ bool TextureD3D::shouldUseSetData(const ImageD3D *image) const
return (mTexStorage && !internalFormat.compressed);
}
gl::Error TextureD3D::setImage(const gl::ImageIndex &index, GLenum type, const gl::PixelUnpackState &unpack, const uint8_t *pixels)
gl::Error TextureD3D::setImage(const gl::ImageIndex &index, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels,
ptrdiff_t layerOffset)
{
ImageD3D *image = getImage(index);
ASSERT(image);
......@@ -158,7 +167,7 @@ gl::Error TextureD3D::setImage(const gl::ImageIndex &index, GLenum type, const g
// We no longer need the "GLenum format" parameter to TexImage to determine what data format "pixels" contains.
// From our image internal format we know how many channels to expect, and "type" gives the format of pixel's components.
const uint8_t *pixelData = NULL;
gl::Error error = GetUnpackPointer(unpack, pixels, &pixelData);
gl::Error error = GetUnpackPointer(unpack, pixels, layerOffset, &pixelData);
if (error.isError())
{
return error;
......@@ -188,11 +197,11 @@ gl::Error TextureD3D::setImage(const gl::ImageIndex &index, GLenum type, const g
}
gl::Error TextureD3D::subImage(const gl::ImageIndex &index, const gl::Box &area, GLenum format, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
const gl::PixelUnpackState &unpack, const uint8_t *pixels, ptrdiff_t layerOffset)
{
// CPU readback & copy where direct GPU copy is not supported
const uint8_t *pixelData = NULL;
gl::Error error = GetUnpackPointer(unpack, pixels, &pixelData);
gl::Error error = GetUnpackPointer(unpack, pixels, layerOffset, &pixelData);
if (error.isError())
{
return error;
......@@ -226,12 +235,13 @@ gl::Error TextureD3D::subImage(const gl::ImageIndex &index, const gl::Box &area,
return gl::Error(GL_NO_ERROR);
}
gl::Error TextureD3D::setCompressedImage(const gl::ImageIndex &index, const gl::PixelUnpackState &unpack, const uint8_t *pixels)
gl::Error TextureD3D::setCompressedImage(const gl::ImageIndex &index, const gl::PixelUnpackState &unpack,
const uint8_t *pixels, ptrdiff_t layerOffset)
{
// We no longer need the "GLenum format" parameter to TexImage to determine what data format "pixels" contains.
// From our image internal format we know how many channels to expect, and "type" gives the format of pixel's components.
const uint8_t *pixelData = NULL;
gl::Error error = GetUnpackPointer(unpack, pixels, &pixelData);
gl::Error error = GetUnpackPointer(unpack, pixels, layerOffset, &pixelData);
if (error.isError())
{
return error;
......@@ -256,10 +266,11 @@ gl::Error TextureD3D::setCompressedImage(const gl::ImageIndex &index, const gl::
}
gl::Error TextureD3D::subImageCompressed(const gl::ImageIndex &index, const gl::Box &area, GLenum format,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
const gl::PixelUnpackState &unpack, const uint8_t *pixels,
ptrdiff_t layerOffset)
{
const uint8_t *pixelData = NULL;
gl::Error error = GetUnpackPointer(unpack, pixels, &pixelData);
gl::Error error = GetUnpackPointer(unpack, pixels, layerOffset, &pixelData);
if (error.isError())
{
return error;
......@@ -646,7 +657,7 @@ gl::Error TextureD3D_2D::setImage(GLenum target, size_t level, GLenum internalFo
if (!fastUnpacked)
{
gl::Error error = TextureD3D::setImage(index, type, unpack, pixels);
gl::Error error = TextureD3D::setImage(index, type, unpack, pixels, 0);
if (error.isError())
{
return error;
......@@ -677,7 +688,7 @@ gl::Error TextureD3D_2D::setSubImage(GLenum target, size_t level, const gl::Box
}
else
{
return TextureD3D::subImage(index, area, format, type, unpack, pixels);
return TextureD3D::subImage(index, area, format, type, unpack, pixels, 0);
}
}
......@@ -690,7 +701,7 @@ gl::Error TextureD3D_2D::setCompressedImage(GLenum target, size_t level, GLenum
// compressed formats don't have separate sized internal formats-- we can just use the compressed format directly
redefineImage(level, internalFormat, size);
return TextureD3D::setCompressedImage(gl::ImageIndex::Make2D(level), unpack, pixels);
return TextureD3D::setCompressedImage(gl::ImageIndex::Make2D(level), unpack, pixels, 0);
}
gl::Error TextureD3D_2D::setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
......@@ -699,7 +710,7 @@ gl::Error TextureD3D_2D::setCompressedSubImage(GLenum target, size_t level, cons
ASSERT(target == GL_TEXTURE_2D && area.depth == 1 && area.z == 0);
gl::ImageIndex index = gl::ImageIndex::Make2D(level);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels, 0);
if (error.isError())
{
return error;
......@@ -1223,7 +1234,7 @@ gl::Error TextureD3D_Cube::setImage(GLenum target, size_t level, GLenum internal
redefineImage(index.layerIndex, level, sizedInternalFormat, size);
return TextureD3D::setImage(index, type, unpack, pixels);
return TextureD3D::setImage(index, type, unpack, pixels, 0);
}
gl::Error TextureD3D_Cube::setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
......@@ -1232,7 +1243,7 @@ gl::Error TextureD3D_Cube::setSubImage(GLenum target, size_t level, const gl::Bo
ASSERT(area.depth == 1 && area.z == 0);
gl::ImageIndex index = gl::ImageIndex::MakeCube(target, level);
return TextureD3D::subImage(index, area, format, type, unpack, pixels);
return TextureD3D::subImage(index, area, format, type, unpack, pixels, 0);
}
gl::Error TextureD3D_Cube::setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
......@@ -1246,7 +1257,7 @@ gl::Error TextureD3D_Cube::setCompressedImage(GLenum target, size_t level, GLenu
redefineImage(faceIndex, level, internalFormat, size);
gl::ImageIndex index = gl::ImageIndex::MakeCube(target, level);
return TextureD3D::setCompressedImage(index, unpack, pixels);
return TextureD3D::setCompressedImage(index, unpack, pixels, 0);
}
gl::Error TextureD3D_Cube::setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
......@@ -1256,7 +1267,7 @@ gl::Error TextureD3D_Cube::setCompressedSubImage(GLenum target, size_t level, co
gl::ImageIndex index = gl::ImageIndex::MakeCube(target, level);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels, 0);
if (error.isError())
{
return error;
......@@ -1838,7 +1849,7 @@ gl::Error TextureD3D_3D::setImage(GLenum target, size_t level, GLenum internalFo
if (!fastUnpacked)
{
gl::Error error = TextureD3D::setImage(index, type, unpack, pixels);
gl::Error error = TextureD3D::setImage(index, type, unpack, pixels, 0);
if (error.isError())
{
return error;
......@@ -1871,7 +1882,7 @@ gl::Error TextureD3D_3D::setSubImage(GLenum target, size_t level, const gl::Box
}
else
{
return TextureD3D::subImage(index, area, format, type, unpack, pixels);
return TextureD3D::subImage(index, area, format, type, unpack, pixels, 0);
}
}
......@@ -1884,7 +1895,7 @@ gl::Error TextureD3D_3D::setCompressedImage(GLenum target, size_t level, GLenum
redefineImage(level, internalFormat, size);
gl::ImageIndex index = gl::ImageIndex::Make3D(level);
return TextureD3D::setCompressedImage(index, unpack, pixels);
return TextureD3D::setCompressedImage(index, unpack, pixels, 0);
}
gl::Error TextureD3D_3D::setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
......@@ -1893,7 +1904,7 @@ gl::Error TextureD3D_3D::setCompressedSubImage(GLenum target, size_t level, cons
ASSERT(target == GL_TEXTURE_3D);
gl::ImageIndex index = gl::ImageIndex::Make3D(level);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels);
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels, 0);
if (error.isError())
{
return error;
......@@ -2346,9 +2357,9 @@ gl::Error TextureD3D_2DArray::setImage(GLenum target, size_t level, GLenum inter
for (int i = 0; i < size.depth; i++)
{
const uint8_t *layerPixels = pixels ? (pixels + (inputDepthPitch * i)) : NULL;
const ptrdiff_t layerOffset = (inputDepthPitch * i);
gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, i);
gl::Error error = TextureD3D::setImage(index, type, unpack, layerPixels);
gl::Error error = TextureD3D::setImage(index, type, unpack, pixels, layerOffset);
if (error.isError())
{
return error;
......@@ -2369,12 +2380,12 @@ gl::Error TextureD3D_2DArray::setSubImage(GLenum target, size_t level, const gl:
for (int i = 0; i < area.depth; i++)
{
int layer = area.z + i;
const uint8_t *layerPixels = pixels ? (pixels + (inputDepthPitch * i)) : NULL;
const ptrdiff_t layerOffset = (inputDepthPitch * i);
gl::Box layerArea(area.x, area.y, 0, area.width, area.height, 1);
gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, layer);
gl::Error error = TextureD3D::subImage(index, layerArea, format, type, unpack, layerPixels);
gl::Error error = TextureD3D::subImage(index, layerArea, format, type, unpack, pixels, layerOffset);
if (error.isError())
{
return error;
......@@ -2397,10 +2408,10 @@ gl::Error TextureD3D_2DArray::setCompressedImage(GLenum target, size_t level, GL
for (int i = 0; i < size.depth; i++)
{
const uint8_t *layerPixels = pixels ? (pixels + (inputDepthPitch * i)) : NULL;
const ptrdiff_t layerOffset = (inputDepthPitch * i);
gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, i);
gl::Error error = TextureD3D::setCompressedImage(index, unpack, layerPixels);
gl::Error error = TextureD3D::setCompressedImage(index, unpack, pixels, layerOffset);
if (error.isError())
{
return error;
......@@ -2421,12 +2432,12 @@ gl::Error TextureD3D_2DArray::setCompressedSubImage(GLenum target, size_t level,
for (int i = 0; i < area.depth; i++)
{
int layer = area.z + i;
const uint8_t *layerPixels = pixels ? (pixels + (inputDepthPitch * i)) : NULL;
const ptrdiff_t layerOffset = (inputDepthPitch * i);
gl::Box layerArea(area.x, area.y, 0, area.width, area.height, 1);
gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, layer);
gl::Error error = TextureD3D::subImageCompressed(index, layerArea, format, unpack, layerPixels);
gl::Error error = TextureD3D::subImageCompressed(index, layerArea, format, unpack, pixels, layerOffset);
if (error.isError())
{
return error;
......
src/libANGLE/renderer/d3d/TextureD3D.h
......@@ -67,12 +67,15 @@ class TextureD3D : public TextureImpl
ImageD3D *getBaseLevelImage() const;
protected:
gl::Error setImage(const gl::ImageIndex &index, GLenum type, const gl::PixelUnpackState &unpack, const uint8_t *pixels);
gl::Error setImage(const gl::ImageIndex &index, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels,
ptrdiff_t layerOffset);
gl::Error subImage(const gl::ImageIndex &index, const gl::Box &area, GLenum format, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels);
gl::Error setCompressedImage(const gl::ImageIndex &index, const gl::PixelUnpackState &unpack, const uint8_t *pixels);
const gl::PixelUnpackState &unpack, const uint8_t *pixels, ptrdiff_t layerOffset);
gl::Error setCompressedImage(const gl::ImageIndex &index, const gl::PixelUnpackState &unpack,
const uint8_t *pixels, ptrdiff_t layerOffset);
gl::Error subImageCompressed(const gl::ImageIndex &index, const gl::Box &area, GLenum format,
const gl::PixelUnpackState &unpack, const uint8_t *pixels);
const gl::PixelUnpackState &unpack, const uint8_t *pixels, ptrdiff_t layerOffset);
bool isFastUnpackable(const gl::PixelUnpackState &unpack, GLenum sizedInternalFormat);
gl::Error fastUnpackPixels(const gl::PixelUnpackState &unpack, const uint8_t *pixels, const gl::Box &destArea,
GLenum sizedInternalFormat, GLenum type, RenderTargetD3D *destRenderTarget);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment