Skip to content

Fix texture corruption when GL_UNPACK_ROW_LENGTH is left at its default of 0 #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chaos02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −3
Open

Fix texture corruption when GL_UNPACK_ROW_LENGTH is left at its default of 0 #872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/net/vulkanmod/vulkan/texture/VulkanImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ public void uploadSubTextureAsync(int mipLevel, int arrayLayer,
int unpackSkipRows, int unpackSkipPixels, int unpackRowLength,
long srcPtr)
{
long uploadSize = (long) (unpackRowLength * height - unpackSkipPixels) * this.formatSize;
// In GL a row length of 0 means rows are tightly packed, i.e. the row stride is the region width
final int rowLength = unpackRowLength != 0 ? unpackRowLength : width;

long uploadSize = (long) (rowLength * (height - 1) + width) * this.formatSize;

StagingBuffer stagingBuffer = Vulkan.getStagingBuffer();

Expand All @@ -240,7 +243,7 @@ public void uploadSubTextureAsync(int mipLevel, int arrayLayer,
stagingBuffer.scheduleFree();
}

srcPtr += ((long) unpackRowLength * unpackSkipRows + unpackSkipPixels) * this.formatSize;
srcPtr += ((long) rowLength * unpackSkipRows + unpackSkipPixels) * this.formatSize;

stagingBuffer.align(this.formatSize);
stagingBuffer.copyBuffer((int) uploadSize, srcPtr);
Expand All @@ -255,7 +258,7 @@ public void uploadSubTextureAsync(int mipLevel, int arrayLayer,

ImageUtil.copyBufferToImageCmd(stack, commandBuffer, bufferId, this.id,
arrayLayer, mipLevel, width, height, xOffset, yOffset,
srcOffset, unpackRowLength, height);
srcOffset, rowLength, height);

ImageUtil.imageTransferMemoryBarrier(stack, commandBuffer, this, mipLevel);
}
Expand Down