TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix some GCC warning messages

Browse Source
This commit is contained in:
rdb 2018-07-11 13:33:50 +02:00
parent ff3d005230
commit 16daf08e42
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,6 +613,8 @@ reset() {
get_extension_func("glDebugMessageControlARB"); get_extension_func("glDebugMessageControlARB");
_supports_debug = true; _supports_debug = true;
#endif #endif
} else {
_supports_debug = false;
} }
if (_supports_debug) { if (_supports_debug) {
@ -12778,7 +12780,9 @@ upload_texture_image(CLP(TextureContext) *gtc, bool needs_reload,
int width = tex->get_expected_mipmap_x_size(n); int width = tex->get_expected_mipmap_x_size(n);
int height = tex->get_expected_mipmap_y_size(n); int height = tex->get_expected_mipmap_y_size(n);
#ifndef OPENGLES_1
int depth = tex->get_expected_mipmap_z_size(n); int depth = tex->get_expected_mipmap_z_size(n);
#endif
#ifdef DO_PSTATS #ifdef DO_PSTATS
_data_transferred_pcollector.add_level(view_size); _data_transferred_pcollector.add_level(view_size);
@ -12958,7 +12962,9 @@ upload_texture_image(CLP(TextureContext) *gtc, bool needs_reload,
int width = tex->get_expected_mipmap_x_size(n); int width = tex->get_expected_mipmap_x_size(n);
int height = tex->get_expected_mipmap_y_size(n); int height = tex->get_expected_mipmap_y_size(n);
#ifndef OPENGLES_1
int depth = tex->get_expected_mipmap_z_size(n); int depth = tex->get_expected_mipmap_z_size(n);
#endif
#ifdef DO_PSTATS #ifdef DO_PSTATS
_data_transferred_pcollector.add_level(view_size); _data_transferred_pcollector.add_level(view_size);

4
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -2612,8 +2612,8 @@ update_shader_texture_bindings(ShaderContext *prev) {
} }
size_t num_textures = _shader->_tex_spec.size(); size_t num_textures = _shader->_tex_spec.size();
GLuint *textures; GLuint *textures = nullptr;
GLuint *samplers; GLuint *samplers = nullptr;
#ifdef OPENGLES #ifdef OPENGLES
static const bool multi_bind = false; static const bool multi_bind = false;
#else #else