nzp-team
/
dquakeplus
mirror of https://github.com/nzp-team/dquakeplus.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from mallgrab/heap_allocation 

Replace texture allocations to use the hunk.
This commit is contained in:
Ian 2022-04-09 18:01:30 -04:00 committed by GitHub
parent 5ae2552f5e e0c3214d79
commit 41e391fd05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/psp/video_hardware_draw.cpp
View File

@ -2381,7 +2381,8 @@ void GL_Upload32(int texture_index, const byte *data, int width, int height)
// Create a temporary buffer to use as a source for swizzling. // Create a temporary buffer to use as a source for swizzling.
std::size_t buffer_size = GL_GetTexSize(texture.format, texture.width, texture.height, 0); std::size_t buffer_size = GL_GetTexSize(texture.format, texture.width, texture.height, 0);
std::vector<byte> unswizzled(buffer_size); int start = Hunk_LowMark ();
byte* unswizzled = static_cast<byte*>(Hunk_Alloc(buffer_size));
if (texture.mipmaps > 0) if (texture.mipmaps > 0)
{ {
@ -2432,7 +2433,7 @@ void GL_Upload32(int texture_index, const byte *data, int width, int height)
} }
} }
unswizzled.clear(); Hunk_FreeToLowMark(start);
// Copy to VRAM? // Copy to VRAM?
if (texture.vram) if (texture.vram)
@ -2470,7 +2471,8 @@ void GL_UploadDXT(int texture_index, const byte *data, int width, int height)
// Create a temporary buffer to use as a source for swizzling. // Create a temporary buffer to use as a source for swizzling.
std::size_t buffer_sizesrc = GL_GetTexSize(-1, texture.width, texture.height, texture.bpp); std::size_t buffer_sizesrc = GL_GetTexSize(-1, texture.width, texture.height, texture.bpp);
std::vector<byte> unswizzled(buffer_sizesrc); int start = Hunk_LowMark ();
byte* unswizzled = static_cast<byte*>(Hunk_Alloc(buffer_sizesrc));
// New compressed texture // New compressed texture
std::size_t buffer_sizedst = GL_GetTexSize(texture.format, texture.width, texture.height, 0); std::size_t buffer_sizedst = GL_GetTexSize(texture.format, texture.width, texture.height, 0);
@ -2492,7 +2494,8 @@ void GL_UploadDXT(int texture_index, const byte *data, int width, int height)
} }
tx_compress_dxtn(texture.bpp, texture.width, texture.height,(const unsigned char *)&unswizzled[0], texture.format, (unsigned char *)texture.ram); tx_compress_dxtn(texture.bpp, texture.width, texture.height,(const unsigned char *)&unswizzled[0], texture.format, (unsigned char *)texture.ram);
unswizzled.clear(); Hunk_FreeToLowMark (start);
// Copy to VRAM? // Copy to VRAM?
if (texture.vram) if (texture.vram)
{ {