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

Fix obscure GL crash

This commit is contained in:
rdb 2015-07-27 12:57:06 +02:00
parent e8e155f218
commit 4206e349c9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ begin_frame(FrameMode mode, Thread *current_thread) {
for (it = _texture_contexts.begin(); it != _texture_contexts.end(); ++it) {
CLP(TextureContext) *gtc = *it;
if (gtc->needs_barrier(GL_FRAMEBUFFER_BARRIER_BIT)) {
if (gtc != NULL && gtc->needs_barrier(GL_FRAMEBUFFER_BARRIER_BIT)) {
glgsg->issue_memory_barrier(GL_FRAMEBUFFER_BARRIER_BIT);
// If we've done it for one, we've done it for all.
break;
@ -1656,7 +1656,7 @@ resolve_multisamples() {
for (it = _texture_contexts.begin(); it != _texture_contexts.end(); ++it) {
CLP(TextureContext) *gtc = *it;
if (gtc->needs_barrier(GL_FRAMEBUFFER_BARRIER_BIT)) {
if (gtc != NULL && gtc->needs_barrier(GL_FRAMEBUFFER_BARRIER_BIT)) {
glgsg->issue_memory_barrier(GL_FRAMEBUFFER_BARRIER_BIT);
// If we've done it for one, we've done it for all.
break;

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

@ -7045,6 +7045,9 @@ report_extensions() const {
out.put(' ');
}
out << ' ' << (*ei);
} else {
out.put('\n');
break;
}
}
out.put('\n');