fix compilation errors with new buffer merge

panda/src/glxdisplay/glxGraphicsPipe.cxx

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

panda/src/glxdisplay/glxGraphicsPipe.h

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

panda/src/glxdisplay/glxGraphicsStateGuardian.cxx

@@ -120,7 +120,8 @@ reset() {
     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();
 
   // 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;
   }
 
+  // FIXME: we need a place to store this now.
+  /*
   // Update the GSG's record to indicate whether we believe it is a
   // hardware or software renderer.
   properties.set_frame_buffer_mode(frame_buffer_mode);
   set_properties(properties);
+  */
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/glxdisplay/glxGraphicsWindow.cxx

@@ -50,7 +50,7 @@ glxGraphicsWindow(GraphicsPipe *pipe,
                   int x_size, int y_size, int flags,
                   GraphicsStateGuardian *gsg,
                   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;
   DCAST_INTO_V(glx_pipe, _pipe);

panda/src/mesadisplay/osMesaGraphicsPipe.cxx

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

panda/src/mesadisplay/osMesaGraphicsPipe.h

@@ -47,14 +47,14 @@ public:
 
 protected:
   virtual PT(GraphicsStateGuardian) make_gsg(const FrameBufferProperties &properties,
-                                             GraphicsStateGuardian *share_with);
+                                             GraphicsStateGuardian *share_with);  
   virtual PT(GraphicsOutput) make_output(const string &name,
                                          const FrameBufferProperties &properties,
                                          int x_size, int y_size, int flags,
                                          GraphicsStateGuardian *gsg,
                                          GraphicsOutput *host,
                                          int retry,
-                                         bool precertify);
+                                         bool &precertify);
 
 private: