diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
| commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
| tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h | |
| parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
| parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
| download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h')
| -rw-r--r-- | mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h b/mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h index 8ef84938d..8f0f01848 100644 --- a/mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h +++ b/mesalib/src/mesa/drivers/haiku/swrast/SoftwareRast.h @@ -24,7 +24,7 @@ extern "C" { } -class MesaSoftwareRast : public BGLRenderer { +class MesaSoftwareRast : public BGLRenderer, public gl_context { public: MesaSoftwareRast(BGLView* view, ulong bgl_options, @@ -79,7 +79,6 @@ private: BLocker fInfoLocker; ulong fOptions; - gl_context* fContext; gl_config* fVisual; struct gl_framebuffer* fFrameBuffer; |