RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

glgsg: Fix regression uploading buffer texture with null image 

Regression in c1babd1ad1 - it caused an assertion to be thrown when uploading a buffer texture without a RAM image.
This commit is contained in:
rdb 2021-06-01 09:56:04 +02:00
parent 70ac82d5da
commit 967fbbc49e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -12846,22 +12846,23 @@ upload_texture(CLP(TextureContext) *gtc, bool force, bool uses_mipmaps) {
image = tex->get_uncompressed_ram_image();
}
bool is_buffer_texture = tex->get_texture_type() == Texture::TT_buffer_texture;
Texture::CompressionMode image_compression;
if (image.is_null()) {
image_compression = Texture::CM_off;
} else {
image_compression = tex->get_ram_image_compression();
}
bool is_buffer_texture = tex->get_texture_type() == Texture::TT_buffer_texture;
if (is_buffer_texture ||
!get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
if (is_buffer_texture ||
!get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
// If this triggers, Panda cannot decompress the texture. Compile with
// libsquish support or precompress the texture.
nassertr(!image.is_null(), false);
// If this triggers, Panda cannot decompress the texture. Compile with
// libsquish support or precompress the texture.
nassertr(!image.is_null(), false);
}
}
int mipmap_bias = 0;