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

Fixed a few more gsg==NULL bugs

Browse Source
This commit is contained in:
Josh Yelon 2006-06-07 21:16:37 +00:00
parent 2408212aac
commit c1f03b3650
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/display/graphicsBuffer.cxx
View File

@ -36,8 +36,6 @@ GraphicsBuffer(GraphicsPipe *pipe,
GraphicsOutput *host) : GraphicsOutput *host) :
GraphicsOutput(pipe, name, properties, x_size, y_size, flags, gsg, host) GraphicsOutput(pipe, name, properties, x_size, y_size, flags, gsg, host)
{ {
nassertv(gsg != (GraphicsStateGuardian *)NULL);
#ifdef DO_MEMORY_USAGE #ifdef DO_MEMORY_USAGE
MemoryUsage::update_type(this, this); MemoryUsage::update_type(this, this);
#endif #endif
@ -49,8 +47,6 @@ GraphicsBuffer(GraphicsPipe *pipe,
_default_display_region->compute_pixels(_x_size, _y_size); _default_display_region->compute_pixels(_x_size, _y_size);
_open_request = OR_none; _open_request = OR_none;
set_inverted(gsg->get_copy_texture_inverted());
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -124,6 +120,7 @@ process_events() {
case OR_open: case OR_open:
open_buffer(); open_buffer();
set_inverted(_gsg->get_copy_texture_inverted());
break; break;
case OR_close: case OR_close:

1
panda/src/display/graphicsWindow.cxx
View File

@ -554,6 +554,7 @@ set_properties_now(WindowProperties &properties) {
// When the window is first opened, force its size to be // When the window is first opened, force its size to be
// broadcast to its display regions. // broadcast to its display regions.
_is_valid = true; _is_valid = true;
set_inverted(_gsg->get_copy_texture_inverted());
set_size_and_recalc(_properties.get_x_size(), set_size_and_recalc(_properties.get_x_size(),
_properties.get_y_size()); _properties.get_y_size());
} else { } else {

4
panda/src/wgldisplay/wglGraphicsBuffer.cxx
View File

@ -352,6 +352,10 @@ open_buffer() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void wglGraphicsBuffer:: void wglGraphicsBuffer::
release_pbuffer() { release_pbuffer() {
if (_gsg == 0) {
return;
}
wglGraphicsStateGuardian *wglgsg; wglGraphicsStateGuardian *wglgsg;
DCAST_INTO_V(wglgsg, _gsg); DCAST_INTO_V(wglgsg, _gsg);