lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 09:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment calculation when copying GLES compressed tex data

Browse Source 
Change-Id: I05140cd6493a2cda9a17864071e7c67a191c9907
This commit is contained in:
Tristan Ritchie
2025-01-31 13:59:08 +00:00
committed by Baldur Karlsson
parent 876212c4da
commit 9c8bb99494
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/common.h
+6
View File
@@ -294,6 +294,12 @@ inline T AlignUpPtr(T x, A a)
return (T)AlignUp<uintptr_t>((uintptr_t)x, (uintptr_t)a);
}
template <typename T>
T AlignToMultiple(T value, T multiple)
{
return ((value + multiple - 1) / multiple) * multiple | 0;
}
#define MAKE_FOURCC(a, b, c, d) \
(((uint32_t)(d) << 24) | ((uint32_t)(c) << 16) | ((uint32_t)(b) << 8) | (uint32_t)(a))
renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp
+3 -3
View File
@@ -1514,9 +1514,9 @@ void WrappedOpenGL::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint s
// image size is not an integer multiple of the block size, so we need to take into
// account that in the loop
size_t roundedUpDepth =
srcIsCompressed ? AlignUp((uint32_t)srcDepth, srcBlockSize[2]) : srcDepth;
srcIsCompressed ? AlignToMultiple((uint32_t)srcDepth, srcBlockSize[2]) : srcDepth;
size_t roundedUpHeight =
srcIsCompressed ? AlignUp((uint32_t)srcHeight, srcBlockSize[1]) : srcHeight;
srcIsCompressed ? AlignToMultiple((uint32_t)srcHeight, srcBlockSize[1]) : srcHeight;
for(size_t z = 0; z < roundedUpDepth; z += srcBlockSize[2])
{
size_t srcOffset = srcSliceSize * ((srcZ + z) / (GLsizei)srcBlockSize[2]) +
@@ -3813,7 +3813,7 @@ void WrappedOpenGL::StoreCompressedTexData(ResourceId texId, GLenum target, GLin
// GetCompressedByteSize() will factor in the 'partial' blocks at image edges when the
// image size is not an integer multiple of the block size, so we need to take into
// account that in the loop
size_t roundedUpHeight = AlignUp((uint32_t)height, blockSize[1]);
size_t roundedUpHeight = AlignToMultiple((uint32_t)height, blockSize[1]);
for(size_t y = 0; y < roundedUpHeight; y += blockSize[1])
{
memcpy(cdData.data() + dstOffset, srcPixels + srcOffset, srcRowSize);