swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 22:28:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_Util/TextureMetrics, MG_State/Texture): reimplement TextureMetrics, attempting to fix glTexSubImage2D

Browse Source
This commit is contained in:
swung0x48
2025-10-28 10:17:56 +08:00
parent 507476d513
commit bd01e4f99d
3 changed files with 161 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp
+16 -8
View File
@@ -59,12 +59,14 @@ namespace MobileGL {
// ======================= Processing ================================
SizeT imageSize =
MG_Util::CalculateTextureImageSize(textureInternalFormat, texturePixelDataType, {width, height, 1});
MG_Util::CalculateInputTextureImageSize(textureInternalFormat,
texturePixelDataType,
{width, height, 1});
auto& mipmap = textureObject->GetMipmap(level);
Vector<Uint8>& data = mipmap.data;
SizeT bytesPerPixel = MG_Util::GetTexturePixelSize(textureInternalFormat) *
MG_Util::GetTexturePixelDataTypeSize(texturePixelDataType);
SizeT bytesPerPixel =
MG_Util::GetInputBytesPerPixel(textureInternalFormat, texturePixelDataType);
SizeT rowStride = mipmap.size.x() * bytesPerPixel;
const Uint8* srcData = reinterpret_cast<const Uint8*>(pixels);
@@ -74,13 +76,17 @@ namespace MobileGL {
for (GLint row = 0; row < height; ++row) {
SizeT dstOffset = ((yoffset + row) * mipmap.size.x() + xoffset) * bytesPerPixel;
// Should take states from glPixelStorei/glPixelStoref into account
SizeT srcOffset = row * width * bytesPerPixel;
if (dstOffset + width * bytesPerPixel <= data.size()) {
Copy(reinterpret_cast<const Uint8*>(srcData + srcOffset),
reinterpret_cast<Uint8*>(&data[dstOffset]), width * bytesPerPixel);
if (dstOffset + width * bytesPerPixel < data.size()) {
Memcpy(srcData + srcOffset, data.data() + dstOffset, width * bytesPerPixel);
} else {
return;
MG_State::pGLContext->RecordError(
ErrorCode::InvalidOperation,
MakeShared<GenericErrorInfo>("MG_Impl/GLImpl", __func__,
"Copy failed. Dest image does not have sufficient space."));
break;
}
}
@@ -295,7 +301,9 @@ namespace MobileGL {
// ======================= Processing ================================
SizeT imageSize =
MG_Util::CalculateTextureImageSize(textureInternalFormat, texturePixelDataType, {width, height, 1});
MG_Util::CalculateInputTextureImageSize(textureInternalFormat,
texturePixelDataType,
{width, height, 1});
textureObject->SetInternalFormat(textureInternalFormat);
MG_State::GLState::MipmapLevelInput mipmap = MG_State::GLState::MipmapLevelInput(