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: Robustness and issue fixing around shader binding

This commit is contained in:
rdb 2026-01-29 21:01:06 +01:00
parent a4508065e2
commit 87c8aa8c90
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7030,6 +7030,22 @@ prepare_shader(Shader *se) {
void CLP(GraphicsStateGuardian)::
release_shader(ShaderContext *sc) {
#ifndef OPENGLES_1
if (_vertex_array_shader_context == sc) {
_vertex_array_shader = nullptr;
_vertex_array_shader_context = nullptr;
}
if (_texture_binding_shader_context == sc) {
_texture_binding_shader = nullptr;
_texture_binding_shader_context = nullptr;
}
if (_current_shader_context == sc) {
sc->unbind();
_current_shader = nullptr;
_current_shader_context = nullptr;
}
if (sc->is_of_type(CLP(ShaderContext)::get_class_type())) {
((CLP(ShaderContext) *)sc)->release_resources();
}
@ -7038,7 +7054,7 @@ release_shader(ShaderContext *sc) {
((CLP(CgShaderContext) *)sc)->release_resources();
}
#endif
#endif
#endif // !OPENGLES_1
delete sc;
}

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

@ -413,7 +413,8 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
_glgsg->report_my_gl_errors();
// Restore the active shader.
if (_glgsg->_current_shader_context == nullptr) {
if (_glgsg->_current_shader_context == nullptr ||
!_glgsg->_current_shader_context->valid()) {
_glgsg->_glUseProgram(0);
} else {
_glgsg->_current_shader_context->bind(_glgsg);
@ -2185,7 +2186,7 @@ release_resources() {
*/
bool CLP(ShaderContext)::
valid() {
if (_shader->get_error_flag()) {
if (_shader == nullptr || _shader->get_error_flag()) {
return false;
}
return (_glsl_program != 0);
@ -2197,6 +2198,8 @@ valid() {
*/
void CLP(ShaderContext)::
bind(GraphicsStateGuardian *gsg) {
nassertv(_shader != nullptr);
CLP(GraphicsStateGuardian) *glgsg = (CLP(GraphicsStateGuardian) *)gsg;
_glgsg = glgsg;
@ -3314,6 +3317,9 @@ glsl_compile_and_link() {
_glsl_shaders.clear();
_glsl_program = _glgsg->_glCreateProgram();
if (!_glsl_program) {
// If this happens, check whether you have a current GL context
GLCAT.error()
<< "Failed to create GLSL program object\n";
return false;
}