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

fix compilation errors with new buffer merge

Browse Source
This commit is contained in:
David Rose 2006-03-23 19:02:16 +00:00
parent d1e65cd52d
commit 6335ebe61c
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/glxdisplay/glxGraphicsPipe.cxx
View File

@ -280,7 +280,7 @@ make_output(const string &name,
GraphicsStateGuardian *gsg, GraphicsStateGuardian *gsg,
GraphicsOutput *host, GraphicsOutput *host,
int retry, int retry,
bool precertify) { bool &precertify) {
if (!_is_valid) { if (!_is_valid) {
return NULL; return NULL;

2
panda/src/glxdisplay/glxGraphicsPipe.h
View File

@ -119,7 +119,7 @@ protected:
GraphicsStateGuardian *gsg, GraphicsStateGuardian *gsg,
GraphicsOutput *host, GraphicsOutput *host,
int retry, int retry,
bool precertify); bool &precertify);
private: private:
#ifdef HAVE_GLXFBCONFIG #ifdef HAVE_GLXFBCONFIG

6
panda/src/glxdisplay/glxGraphicsStateGuardian.cxx
View File

@ -120,7 +120,8 @@ reset() {
software = true; software = true;
} }
FrameBufferProperties properties = get_properties(); // FIXME: should these properties be taken from the window?
FrameBufferProperties properties = get_default_properties();
int frame_buffer_mode = properties.get_frame_buffer_mode(); int frame_buffer_mode = properties.get_frame_buffer_mode();
// If "Mesa" is present, assume software. However, if "Mesa DRI" is // If "Mesa" is present, assume software. However, if "Mesa DRI" is
@ -150,10 +151,13 @@ reset() {
frame_buffer_mode = (frame_buffer_mode | FrameBufferProperties::FM_hardware) & ~FrameBufferProperties::FM_software; frame_buffer_mode = (frame_buffer_mode | FrameBufferProperties::FM_hardware) & ~FrameBufferProperties::FM_software;
} }
// FIXME: we need a place to store this now.
/*
// Update the GSG's record to indicate whether we believe it is a // Update the GSG's record to indicate whether we believe it is a
// hardware or software renderer. // hardware or software renderer.
properties.set_frame_buffer_mode(frame_buffer_mode); properties.set_frame_buffer_mode(frame_buffer_mode);
set_properties(properties); set_properties(properties);
*/
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
panda/src/glxdisplay/glxGraphicsWindow.cxx
View File

@ -50,7 +50,7 @@ glxGraphicsWindow(GraphicsPipe *pipe,
int x_size, int y_size, int flags, int x_size, int y_size, int flags,
GraphicsStateGuardian *gsg, GraphicsStateGuardian *gsg,
GraphicsOutput *host) : GraphicsOutput *host) :
GraphicsWindow(pipe, name, x_size, y_size, flags, gsg, host) GraphicsWindow(pipe, name, properties, x_size, y_size, flags, gsg, host)
{ {
glxGraphicsPipe *glx_pipe; glxGraphicsPipe *glx_pipe;
DCAST_INTO_V(glx_pipe, _pipe); DCAST_INTO_V(glx_pipe, _pipe);

2
panda/src/mesadisplay/osMesaGraphicsPipe.cxx
View File

@ -144,7 +144,7 @@ make_output(const string &name,
((flags&BF_require_window)!=0)|| ((flags&BF_require_window)!=0)||
((flags&BF_size_track_host)!=0)|| ((flags&BF_size_track_host)!=0)||
((flags&BF_can_bind_every)!=0)|| ((flags&BF_can_bind_every)!=0)||
(properties != gsg->get_default_properties()) { (properties != gsg->get_default_properties())) {
return NULL; return NULL;
} }
return new OsMesaGraphicsBuffer(this, name, properties, return new OsMesaGraphicsBuffer(this, name, properties,

2
panda/src/mesadisplay/osMesaGraphicsPipe.h
View File

@ -54,7 +54,7 @@ protected:
GraphicsStateGuardian *gsg, GraphicsStateGuardian *gsg,
GraphicsOutput *host, GraphicsOutput *host,
int retry, int retry,
bool precertify); bool &precertify);
private: private: