Skip to content

A
angle
Commit 331581e9 by Shahbaz Youssefi Committed by Commit Bot
Options

Make copy*Texture parameters consistent for level indices

They were passed as size_t, while GL level indices are GLint throughout ANGLE. Bug: angleproject:4880 Change-Id: I43bc9f01a607e457b55a061f473450d3360db808 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2380230 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com>
parent fbafb46c
Showing with 110 additions and 111 deletions
src/libANGLE/renderer/TextureImpl.cpp
...@@ -20,7 +20,7 @@ angle::Result TextureImpl::copyTexture(const gl::Context *context, ...@@ -20,7 +20,7 @@ angle::Result TextureImpl::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -33,7 +33,7 @@ angle::Result TextureImpl::copyTexture(const gl::Context *context, ...@@ -33,7 +33,7 @@ angle::Result TextureImpl::copyTexture(const gl::Context *context,
angle::Result TextureImpl::copySubTexture(const gl::Context *context, angle::Result TextureImpl::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -55,8 +55,8 @@ angle::Result TextureImpl::copy3DTexture(const gl::Context *context, ...@@ -55,8 +55,8 @@ angle::Result TextureImpl::copy3DTexture(const gl::Context *context,
gl::TextureTarget target, gl::TextureTarget target,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
size_t destLevel, GLint destLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -69,8 +69,8 @@ angle::Result TextureImpl::copy3DTexture(const gl::Context *context, ...@@ -69,8 +69,8 @@ angle::Result TextureImpl::copy3DTexture(const gl::Context *context,
angle::Result TextureImpl::copy3DSubTexture(const gl::Context *context, angle::Result TextureImpl::copy3DSubTexture(const gl::Context *context,
const gl::TextureTarget target, const gl::TextureTarget target,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
size_t destLevel, GLint destLevel,
const gl::Box &srcBox, const gl::Box &srcBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/TextureImpl.h
...@@ -97,7 +97,7 @@ class TextureImpl : public FramebufferAttachmentObjectImpl ...@@ -97,7 +97,7 @@ class TextureImpl : public FramebufferAttachmentObjectImpl
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -105,7 +105,7 @@ class TextureImpl : public FramebufferAttachmentObjectImpl ...@@ -105,7 +105,7 @@ class TextureImpl : public FramebufferAttachmentObjectImpl
virtual angle::Result copySubTexture(const gl::Context *context, virtual angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -119,8 +119,8 @@ class TextureImpl : public FramebufferAttachmentObjectImpl ...@@ -119,8 +119,8 @@ class TextureImpl : public FramebufferAttachmentObjectImpl
gl::TextureTarget target, gl::TextureTarget target,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
size_t destLevel, GLint destLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -128,8 +128,8 @@ class TextureImpl : public FramebufferAttachmentObjectImpl ...@@ -128,8 +128,8 @@ class TextureImpl : public FramebufferAttachmentObjectImpl
virtual angle::Result copy3DSubTexture(const gl::Context *context, virtual angle::Result copy3DSubTexture(const gl::Context *context,
const gl::TextureTarget target, const gl::TextureTarget target,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
size_t destLevel, GLint destLevel,
const gl::Box &srcBox, const gl::Box &srcBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/TextureImpl_mock.h
...@@ -73,7 +73,7 @@ class MockTextureImpl : public TextureImpl ...@@ -73,7 +73,7 @@ class MockTextureImpl : public TextureImpl
const gl::ImageIndex &, const gl::ImageIndex &,
GLenum, GLenum,
GLenum, GLenum,
size_t, GLint,
bool, bool,
bool, bool,
bool, bool,
...@@ -82,7 +82,7 @@ class MockTextureImpl : public TextureImpl ...@@ -82,7 +82,7 @@ class MockTextureImpl : public TextureImpl
angle::Result(const gl::Context *, angle::Result(const gl::Context *,
const gl::ImageIndex &, const gl::ImageIndex &,
const gl::Offset &, const gl::Offset &,
size_t, GLint,
const gl::Box &, const gl::Box &,
bool, bool,
bool, bool,
......
src/libANGLE/renderer/d3d/TextureD3D.cpp
...@@ -1137,7 +1137,7 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context, ...@@ -1137,7 +1137,7 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -1164,15 +1164,15 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context, ...@@ -1164,15 +1164,15 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context,
ASSERT(isValidLevel(index.getLevelIndex())); ASSERT(isValidLevel(index.getLevelIndex()));
ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex())); ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(sourceLevel);
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage)); ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
...@@ -1195,7 +1195,7 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context, ...@@ -1195,7 +1195,7 @@ angle::Result TextureD3D_2D::copyTexture(const gl::Context *context,
angle::Result TextureD3D_2D::copySubTexture(const gl::Context *context, angle::Result TextureD3D_2D::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -1212,15 +1212,15 @@ angle::Result TextureD3D_2D::copySubTexture(const gl::Context *context, ...@@ -1212,15 +1212,15 @@ angle::Result TextureD3D_2D::copySubTexture(const gl::Context *context,
const gl::InternalFormat &internalFormatInfo = const gl::InternalFormat &internalFormatInfo =
gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex())); gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(sourceLevel);
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage)); ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
...@@ -1887,7 +1887,7 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context, ...@@ -1887,7 +1887,7 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -1915,15 +1915,15 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context, ...@@ -1915,15 +1915,15 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context,
ASSERT(isValidFaceLevel(faceIndex, index.getLevelIndex())); ASSERT(isValidFaceLevel(faceIndex, index.getLevelIndex()));
ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex())); ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(sourceLevel);
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage)); ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
...@@ -1946,7 +1946,7 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context, ...@@ -1946,7 +1946,7 @@ angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context,
angle::Result TextureD3D_Cube::copySubTexture(const gl::Context *context, angle::Result TextureD3D_Cube::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -1965,15 +1965,15 @@ angle::Result TextureD3D_Cube::copySubTexture(const gl::Context *context, ...@@ -1965,15 +1965,15 @@ angle::Result TextureD3D_Cube::copySubTexture(const gl::Context *context,
const gl::InternalFormat &internalFormatInfo = const gl::InternalFormat &internalFormatInfo =
gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex(), faceIndex)); gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex(), faceIndex));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make2D(sourceLevel);
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage)); ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
...@@ -2607,7 +2607,7 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context, ...@@ -2607,7 +2607,7 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -2636,15 +2636,15 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context, ...@@ -2636,15 +2636,15 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context,
ASSERT(isValidLevel(index.getLevelIndex())); ASSERT(isValidLevel(index.getLevelIndex()));
ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex())); ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_3D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_3D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceIndex = gl::ImageIndex::Make3D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceIndex = gl::ImageIndex::Make3D(sourceLevel);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ImageD3D *destImage = nullptr; ImageD3D *destImage = nullptr;
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
...@@ -2666,7 +2666,7 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context, ...@@ -2666,7 +2666,7 @@ angle::Result TextureD3D_3D::copyTexture(const gl::Context *context,
angle::Result TextureD3D_3D::copySubTexture(const gl::Context *context, angle::Result TextureD3D_3D::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -2685,15 +2685,15 @@ angle::Result TextureD3D_3D::copySubTexture(const gl::Context *context, ...@@ -2685,15 +2685,15 @@ angle::Result TextureD3D_3D::copySubTexture(const gl::Context *context,
const gl::InternalFormat &internalFormatInfo = const gl::InternalFormat &internalFormatInfo =
gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex())); gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_3D,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_3D, sourceBox, sourceBox, internalFormatInfo.format,
internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make3D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make3D(sourceLevel);
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage)); ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
...@@ -3303,7 +3303,7 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context, ...@@ -3303,7 +3303,7 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -3335,20 +3335,19 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context, ...@@ -3335,20 +3335,19 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context,
ANGLE_TRY(ensureRenderTarget(context)); ANGLE_TRY(ensureRenderTarget(context));
ASSERT(isValidLevel(index.getLevelIndex())); ASSERT(isValidLevel(index.getLevelIndex()));
ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex())); ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2DArray,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2DArray, sourceBox, internalFormatInfo.format,
sourceBox, internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
for (int i = 0; i < size.depth; i++) for (int i = 0; i < size.depth; i++)
{ {
gl::ImageIndex currentSourceDepthIndex = gl::ImageIndex currentSourceDepthIndex = gl::ImageIndex::Make2DArray(sourceLevel, i);
gl::ImageIndex::Make2DArray(static_cast<GLint>(sourceLevel), i);
gl::ImageIndex currentDestDepthIndex = gl::ImageIndex currentDestDepthIndex =
gl::ImageIndex::Make2DArray(static_cast<GLint>(index.getLevelIndex()), i); gl::ImageIndex::Make2DArray(index.getLevelIndex(), i);
ImageD3D *sourceImage = nullptr; ImageD3D *sourceImage = nullptr;
ImageD3D *destImage = nullptr; ImageD3D *destImage = nullptr;
TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source); TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
...@@ -3375,7 +3374,7 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context, ...@@ -3375,7 +3374,7 @@ angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context,
angle::Result TextureD3D_2DArray::copySubTexture(const gl::Context *context, angle::Result TextureD3D_2DArray::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -3395,20 +3394,20 @@ angle::Result TextureD3D_2DArray::copySubTexture(const gl::Context *context, ...@@ -3395,20 +3394,20 @@ angle::Result TextureD3D_2DArray::copySubTexture(const gl::Context *context,
const gl::InternalFormat &internalFormatInfo = const gl::InternalFormat &internalFormatInfo =
gl::GetSizedInternalFormatInfo(getInternalFormat(destIndex.getLevelIndex())); gl::GetSizedInternalFormatInfo(getInternalFormat(destIndex.getLevelIndex()));
ANGLE_TRY(mRenderer->copyTexture( ANGLE_TRY(mRenderer->copyTexture(context, source, sourceLevel, gl::TextureTarget::_2DArray,
context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2DArray, sourceBox, internalFormatInfo.format,
sourceBox, internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage, internalFormatInfo.type, destOffset, mTexStorage,
index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha, index.getTarget(), index.getLevelIndex(), unpackFlipY,
unpackUnmultiplyAlpha)); unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
} }
else else
{ {
for (int i = 0; i < sourceBox.depth; i++) for (int i = 0; i < sourceBox.depth; i++)
{ {
gl::ImageIndex currentSourceIndex = gl::ImageIndex currentSourceIndex =
gl::ImageIndex::Make2DArray(static_cast<GLint>(sourceLevel), i + sourceBox.z); gl::ImageIndex::Make2DArray(sourceLevel, i + sourceBox.z);
gl::ImageIndex currentDestIndex = gl::ImageIndex::Make2DArray( gl::ImageIndex currentDestIndex =
static_cast<GLint>(index.getLevelIndex()), i + destOffset.z); gl::ImageIndex::Make2DArray(index.getLevelIndex(), i + destOffset.z);
gl::Box currentLayerBox(sourceBox.x, sourceBox.y, 0, sourceBox.width, sourceBox.height, gl::Box currentLayerBox(sourceBox.x, sourceBox.y, 0, sourceBox.width, sourceBox.height,
1); 1);
......
src/libANGLE/renderer/d3d/TextureD3D.h
...@@ -273,7 +273,7 @@ class TextureD3D_2D : public TextureD3D ...@@ -273,7 +273,7 @@ class TextureD3D_2D : public TextureD3D
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -281,7 +281,7 @@ class TextureD3D_2D : public TextureD3D ...@@ -281,7 +281,7 @@ class TextureD3D_2D : public TextureD3D
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -405,7 +405,7 @@ class TextureD3D_Cube : public TextureD3D ...@@ -405,7 +405,7 @@ class TextureD3D_Cube : public TextureD3D
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -413,7 +413,7 @@ class TextureD3D_Cube : public TextureD3D ...@@ -413,7 +413,7 @@ class TextureD3D_Cube : public TextureD3D
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -538,7 +538,7 @@ class TextureD3D_3D : public TextureD3D ...@@ -538,7 +538,7 @@ class TextureD3D_3D : public TextureD3D
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -546,7 +546,7 @@ class TextureD3D_3D : public TextureD3D ...@@ -546,7 +546,7 @@ class TextureD3D_3D : public TextureD3D
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -668,7 +668,7 @@ class TextureD3D_2DArray : public TextureD3D ...@@ -668,7 +668,7 @@ class TextureD3D_2DArray : public TextureD3D
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -676,7 +676,7 @@ class TextureD3D_2DArray : public TextureD3D ...@@ -676,7 +676,7 @@ class TextureD3D_2DArray : public TextureD3D
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/gl/TextureGL.cpp
...@@ -833,7 +833,7 @@ angle::Result TextureGL::copyTexture(const gl::Context *context, ...@@ -833,7 +833,7 @@ angle::Result TextureGL::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -859,7 +859,7 @@ angle::Result TextureGL::copyTexture(const gl::Context *context, ...@@ -859,7 +859,7 @@ angle::Result TextureGL::copyTexture(const gl::Context *context,
angle::Result TextureGL::copySubTexture(const gl::Context *context, angle::Result TextureGL::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -878,7 +878,7 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context, ...@@ -878,7 +878,7 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
gl::TextureTarget target, gl::TextureTarget target,
size_t level, size_t level,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Rectangle &sourceArea, const gl::Rectangle &sourceArea,
const gl::InternalFormat &destFormat, const gl::InternalFormat &destFormat,
bool unpackFlipY, bool unpackFlipY,
......
src/libANGLE/renderer/gl/TextureGL.h
...@@ -115,7 +115,7 @@ class TextureGL : public TextureImpl ...@@ -115,7 +115,7 @@ class TextureGL : public TextureImpl
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -123,7 +123,7 @@ class TextureGL : public TextureImpl ...@@ -123,7 +123,7 @@ class TextureGL : public TextureImpl
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -133,7 +133,7 @@ class TextureGL : public TextureImpl ...@@ -133,7 +133,7 @@ class TextureGL : public TextureImpl
gl::TextureTarget target, gl::TextureTarget target,
size_t level, size_t level,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Rectangle &sourceArea, const gl::Rectangle &sourceArea,
const gl::InternalFormat &destFormat, const gl::InternalFormat &destFormat,
bool unpackFlipY, bool unpackFlipY,
......
src/libANGLE/renderer/metal/TextureMtl.h
...@@ -83,7 +83,7 @@ class TextureMtl : public TextureImpl ...@@ -83,7 +83,7 @@ class TextureMtl : public TextureImpl
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -91,7 +91,7 @@ class TextureMtl : public TextureImpl ...@@ -91,7 +91,7 @@ class TextureMtl : public TextureImpl
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -243,7 +243,7 @@ class TextureMtl : public TextureImpl ...@@ -243,7 +243,7 @@ class TextureMtl : public TextureImpl
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const gl::InternalFormat &internalFormat, const gl::InternalFormat &internalFormat,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/metal/TextureMtl.mm
...@@ -845,7 +845,7 @@ angle::Result TextureMtl::copyTexture(const gl::Context *context, ...@@ -845,7 +845,7 @@ angle::Result TextureMtl::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -874,7 +874,7 @@ angle::Result TextureMtl::copyTexture(const gl::Context *context, ...@@ -874,7 +874,7 @@ angle::Result TextureMtl::copyTexture(const gl::Context *context,
angle::Result TextureMtl::copySubTexture(const gl::Context *context, angle::Result TextureMtl::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -1673,7 +1673,7 @@ angle::Result TextureMtl::copySubTextureImpl(const gl::Context *context, ...@@ -1673,7 +1673,7 @@ angle::Result TextureMtl::copySubTextureImpl(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const gl::InternalFormat &internalFormat, const gl::InternalFormat &internalFormat,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -1683,7 +1683,7 @@ angle::Result TextureMtl::copySubTextureImpl(const gl::Context *context, ...@@ -1683,7 +1683,7 @@ angle::Result TextureMtl::copySubTextureImpl(const gl::Context *context,
// Only 2D textures are supported. // Only 2D textures are supported.
ASSERT(sourceBox.depth == 1); ASSERT(sourceBox.depth == 1);
ASSERT(source->getType() == gl::TextureType::_2D); ASSERT(source->getType() == gl::TextureType::_2D);
gl::ImageIndex sourceIndex = gl::ImageIndex::Make2D(static_cast<GLint>(sourceLevel)); gl::ImageIndex sourceIndex = gl::ImageIndex::Make2D(sourceLevel);
ContextMtl *contextMtl = mtl::GetImpl(context); ContextMtl *contextMtl = mtl::GetImpl(context);
TextureMtl *sourceMtl = mtl::GetImpl(source); TextureMtl *sourceMtl = mtl::GetImpl(source);
......
src/libANGLE/renderer/null/TextureNULL.cpp
...@@ -89,7 +89,7 @@ angle::Result TextureNULL::copyTexture(const gl::Context *context, ...@@ -89,7 +89,7 @@ angle::Result TextureNULL::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -101,7 +101,7 @@ angle::Result TextureNULL::copyTexture(const gl::Context *context, ...@@ -101,7 +101,7 @@ angle::Result TextureNULL::copyTexture(const gl::Context *context,
angle::Result TextureNULL::copySubTexture(const gl::Context *context, angle::Result TextureNULL::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/null/TextureNULL.h
...@@ -69,7 +69,7 @@ class TextureNULL : public TextureImpl ...@@ -69,7 +69,7 @@ class TextureNULL : public TextureImpl
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevel, GLint sourceLevel,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -77,7 +77,7 @@ class TextureNULL : public TextureImpl ...@@ -77,7 +77,7 @@ class TextureNULL : public TextureImpl
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevel, GLint sourceLevel,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
......
src/libANGLE/renderer/vulkan/TextureVk.cpp
...@@ -484,7 +484,7 @@ angle::Result TextureVk::copyTexture(const gl::Context *context, ...@@ -484,7 +484,7 @@ angle::Result TextureVk::copyTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevelGL, GLint sourceLevelGL,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -510,7 +510,7 @@ angle::Result TextureVk::copyTexture(const gl::Context *context, ...@@ -510,7 +510,7 @@ angle::Result TextureVk::copyTexture(const gl::Context *context,
angle::Result TextureVk::copySubTexture(const gl::Context *context, angle::Result TextureVk::copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -650,7 +650,7 @@ angle::Result TextureVk::copySubTextureImpl(ContextVk *contextVk, ...@@ -650,7 +650,7 @@ angle::Result TextureVk::copySubTextureImpl(ContextVk *contextVk,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const gl::InternalFormat &destFormat, const gl::InternalFormat &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -783,7 +783,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk, ...@@ -783,7 +783,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const vk::Format &destFormat, const vk::Format &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
size_t sourceLayer, size_t sourceLayer,
const gl::Box &sourceBox, const gl::Box &sourceBox,
vk::ImageHelper *srcImage) vk::ImageHelper *srcImage)
...@@ -905,7 +905,7 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk, ...@@ -905,7 +905,7 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const vk::Format &destFormat, const vk::Format &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool isSrcFlipY, bool isSrcFlipY,
bool unpackFlipY, bool unpackFlipY,
...@@ -1385,7 +1385,7 @@ angle::Result TextureVk::redefineLevel(const gl::Context *context, ...@@ -1385,7 +1385,7 @@ angle::Result TextureVk::redefineLevel(const gl::Context *context,
} }
angle::Result TextureVk::copyImageDataToBufferAndGetData(ContextVk *contextVk, angle::Result TextureVk::copyImageDataToBufferAndGetData(ContextVk *contextVk,
size_t sourceLevelGL, GLint sourceLevelGL,
uint32_t layerCount, uint32_t layerCount,
const gl::Box &sourceArea, const gl::Box &sourceArea,
uint8_t **outDataPtr) uint8_t **outDataPtr)
......
src/libANGLE/renderer/vulkan/TextureVk.h
...@@ -85,7 +85,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -85,7 +85,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
const gl::ImageIndex &index, const gl::ImageIndex &index,
GLenum internalFormat, GLenum internalFormat,
GLenum type, GLenum type,
size_t sourceLevelGL, GLint sourceLevelGL,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha, bool unpackUnmultiplyAlpha,
...@@ -93,7 +93,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -93,7 +93,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
angle::Result copySubTexture(const gl::Context *context, angle::Result copySubTexture(const gl::Context *context,
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -272,7 +272,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -272,7 +272,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
const vk::Format &vkFormat); const vk::Format &vkFormat);
angle::Result copyImageDataToBufferAndGetData(ContextVk *contextVk, angle::Result copyImageDataToBufferAndGetData(ContextVk *contextVk,
size_t sourceLevelGL, GLint sourceLevelGL,
uint32_t layerCount, uint32_t layerCount,
const gl::Box &sourceArea, const gl::Box &sourceArea,
uint8_t **outDataPtr); uint8_t **outDataPtr);
...@@ -317,7 +317,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -317,7 +317,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const gl::InternalFormat &destFormat, const gl::InternalFormat &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
...@@ -328,7 +328,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -328,7 +328,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const vk::Format &destFormat, const vk::Format &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
size_t sourceLayer, size_t sourceLayer,
const gl::Box &sourceBox, const gl::Box &sourceBox,
vk::ImageHelper *srcImage); vk::ImageHelper *srcImage);
...@@ -337,7 +337,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface ...@@ -337,7 +337,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
const gl::ImageIndex &index, const gl::ImageIndex &index,
const gl::Offset &destOffset, const gl::Offset &destOffset,
const vk::Format &destFormat, const vk::Format &destFormat,
size_t sourceLevelGL, GLint sourceLevelGL,
const gl::Box &sourceBox, const gl::Box &sourceBox,
bool isSrcFlipY, bool isSrcFlipY,
bool unpackFlipY, bool unpackFlipY,
......
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