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

glgsg: Fix attempt to detect glTexStorage1D in OpenGL ES

Browse Source
This commit is contained in:
rdb 2021-01-31 18:12:43 +01:00
parent 60f3ac5163
commit a1e4cf059f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1030,8 +1030,10 @@ reset() {
#endif #endif
_supports_tex_storage = true; _supports_tex_storage = true;
#ifndef OPENGLES
_glTexStorage1D = (PFNGLTEXSTORAGE1DPROC) _glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)
get_extension_func("glTexStorage1D"); get_extension_func("glTexStorage1D");
#endif
_glTexStorage2D = (PFNGLTEXSTORAGE2DPROC) _glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)
get_extension_func("glTexStorage2D"); get_extension_func("glTexStorage2D");
_glTexStorage3D = (PFNGLTEXSTORAGE3DPROC) _glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)
@ -1041,8 +1043,6 @@ reset() {
else if (has_extension("GL_EXT_texture_storage")) { else if (has_extension("GL_EXT_texture_storage")) {
_supports_tex_storage = true; _supports_tex_storage = true;
_glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)
get_extension_func("glTexStorage1DEXT");
_glTexStorage2D = (PFNGLTEXSTORAGE2DPROC) _glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)
get_extension_func("glTexStorage2DEXT"); get_extension_func("glTexStorage2DEXT");
_glTexStorage3D = (PFNGLTEXSTORAGE3DPROC) _glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)
@ -1051,7 +1051,11 @@ reset() {
#endif #endif
if (_supports_tex_storage) { if (_supports_tex_storage) {
if (_glTexStorage1D == nullptr || _glTexStorage2D == nullptr || _glTexStorage3D == nullptr) { if (
#ifndef OPENGLES
_glTexStorage1D == nullptr ||
#endif
_glTexStorage2D == nullptr || _glTexStorage3D == nullptr) {
GLCAT.warning() GLCAT.warning()
<< "Immutable texture storage advertised as supported by OpenGL runtime, but could not get pointers to extension functions.\n"; << "Immutable texture storage advertised as supported by OpenGL runtime, but could not get pointers to extension functions.\n";
_supports_tex_storage = false; _supports_tex_storage = false;
@ -13005,8 +13009,10 @@ upload_texture(CLP(TextureContext) *gtc, bool force, bool uses_mipmaps) {
case Texture::TT_buffer_texture: case Texture::TT_buffer_texture:
// Won't get here, but squelch compiler warning // Won't get here, but squelch compiler warning
case Texture::TT_1d_texture: case Texture::TT_1d_texture:
#ifndef OPENGLES
_glTexStorage1D(target, num_levels, internal_format, width); _glTexStorage1D(target, num_levels, internal_format, width);
break; break;
#endif
case Texture::TT_2d_texture: case Texture::TT_2d_texture:
case Texture::TT_cube_map: case Texture::TT_cube_map:
case Texture::TT_1d_texture_array: case Texture::TT_1d_texture_array:

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

@ -785,7 +785,9 @@ public:
#endif #endif
bool _supports_tex_storage; bool _supports_tex_storage;
#ifndef OPENGLES
PFNGLTEXSTORAGE1DPROC _glTexStorage1D; PFNGLTEXSTORAGE1DPROC _glTexStorage1D;
#endif
PFNGLTEXSTORAGE2DPROC _glTexStorage2D; PFNGLTEXSTORAGE2DPROC _glTexStorage2D;
PFNGLTEXSTORAGE3DPROC _glTexStorage3D; PFNGLTEXSTORAGE3DPROC _glTexStorage3D;