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 compilation error, remove redundant parameter

This commit is contained in:
rdb 2026-01-15 10:49:15 +01:00
parent 576d124b5e
commit f025ba5da8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16384,8 +16384,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc, int view) {
PTA_uchar image;
size_t page_size = 0;
if (!extract_texture_image(image, page_size, tex, target, page_target,
type, compression, 0)) {
if (!extract_texture_image(image, page_size, tex, target, type, compression, 0)) {
return false;
}
@ -16403,8 +16402,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc, int view) {
// Also get the mipmap levels.
for (int n = 1; n < gtc->_num_levels; ++n) {
if (!extract_texture_image(image, page_size, tex, target, page_target,
type, compression, n)) {
if (!extract_texture_image(image, page_size, tex, target, type, compression, n)) {
return false;
}
if (num_views == 1) {
@ -16424,7 +16422,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc, int view) {
*/
bool CLP(GraphicsStateGuardian)::
extract_texture_image(PTA_uchar &image, size_t &page_size,
Texture *tex, GLenum target, GLenum page_target,
Texture *tex, GLenum target,
Texture::ComponentType type,
Texture::CompressionMode compression, int n) {
#ifdef OPENGLES // Extracting texture data unsupported in OpenGL ES.
@ -16453,8 +16451,8 @@ extract_texture_image(PTA_uchar &image, size_t &page_size,
if (compression != Texture::CM_off) {
GLint image_size;
glGetTexLevelParameteriv(page_target, n,
GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size);
glGetTexLevelParameteriv(GL_TEXTURE_CUBE_MAP_POSITIVE_X, n,
GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size);
nassertr(image_size <= (int)page_size, false);
page_size = image_size;
}
@ -16462,7 +16460,7 @@ extract_texture_image(PTA_uchar &image, size_t &page_size,
image = PTA_uchar::empty_array(page_size * 6);
for (int z = 0; z < 6; ++z) {
page_target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + z;
GLenum page_target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + z;
if (compression == Texture::CM_off) {
glGetTexImage(page_target, n, external_format, pixel_type,

6
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -669,9 +669,9 @@ protected:
void check_nonresident_texture(BufferContextChain &chain);
bool do_extract_texture_data(CLP(TextureContext) *gtc, int view);
bool extract_texture_image(PTA_uchar &image, size_t &page_size,
Texture *tex, GLenum target, GLenum page_target,
Texture::ComponentType type,
Texture::CompressionMode compression, int n);
Texture *tex, GLenum target,
Texture::ComponentType type,
Texture::CompressionMode compression, int n);
#ifdef SUPPORT_FIXED_FUNCTION
void do_point_size();