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

[Fix] (MG_State/Texture): deal with GL_UNPACK_ROW_LENGTH

Browse Source
This commit is contained in:
swung0x48
2025-06-25 23:48:24 +08:00
parent afcc892b32
commit 1e6f91809e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/GL/Texture/GL_Texture.cpp
+8 -4
View File
@@ -600,6 +600,8 @@ namespace MG_GL::GL {
auto unitState = &texState.textureUnits_[activeUnit]; auto unitState = &texState.textureUnits_[activeUnit];
GLuint boundTextureID = unitState->GetBoundTexture(target); GLuint boundTextureID = unitState->GetBoundTexture(target);
MG_Util::Debug::LogD("TexSubImage2D: bound texture: GL name %u", boundTextureID);
if (boundTextureID == 0) { if (boundTextureID == 0) {
MG_Util::Debug::LogD("TexSubImage2D: No texture bound to active unit. Skipping update."); MG_Util::Debug::LogD("TexSubImage2D: No texture bound to active unit. Skipping update.");
return; return;
@@ -622,11 +624,11 @@ namespace MG_GL::GL {
return; return;
} }
Diligent::TextureDesc desc = pTexture->GetDesc(); auto rowLength = TextureState::GetUnpackParam_(GL_UNPACK_ROW_LENGTH);
Diligent::TextureSubResData SubResData; Diligent::TextureSubResData SubResData;
SubResData.pData = pixels; SubResData.pData = pixels;
SubResData.Stride = width * GetBytesPerPixel(format, type); SubResData.Stride = ((rowLength > 0) ? rowLength : width) * GetBytesPerPixel(format, type);
Diligent::Box UpdateBox; Diligent::Box UpdateBox;
UpdateBox.MinX = xoffset; UpdateBox.MinX = xoffset;
@@ -636,8 +638,10 @@ namespace MG_GL::GL {
UpdateBox.MinZ = 0; UpdateBox.MinZ = 0;
UpdateBox.MaxZ = 1; UpdateBox.MaxZ = 1;
MG_Util::Debug::LogD("TexSubImage2D: Updating region [%d,%d]-[%d,%d] at level %d", MG_Util::Debug::LogD("TexSubImage2D: Got GL_UNPACK_ROW_LENGTH = %d", rowLength);
xoffset, yoffset, xoffset+width, yoffset+height, level);
MG_Util::Debug::LogD("TexSubImage2D: Updating region [%d,%d]-[%d,%d] at level %d, %d bytes",
xoffset, yoffset, xoffset+width, yoffset+height, level, width * height * GetBytesPerPixel(format, type));
if (MG_Diligent::IsInRenderPass) { if (MG_Diligent::IsInRenderPass) {
MG_Diligent::g_pContext->EndRenderPass(); MG_Diligent::g_pContext->EndRenderPass();