diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
| commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
| tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /mesalib/include/HaikuGL | |
| parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
| parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
| download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'mesalib/include/HaikuGL')
| -rw-r--r-- | mesalib/include/HaikuGL/GLRenderer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/include/HaikuGL/GLRenderer.h b/mesalib/include/HaikuGL/GLRenderer.h index 7ffcc34bb..a93113b17 100644 --- a/mesalib/include/HaikuGL/GLRenderer.h +++ b/mesalib/include/HaikuGL/GLRenderer.h @@ -25,7 +25,7 @@ class BGLRenderer // Private unimplemented copy constructors BGLRenderer(const BGLRenderer &); BGLRenderer & operator=(const BGLRenderer &); - + public: BGLRenderer(BGLView *view, ulong bgl_options, BGLDispatcher *dispatcher); @@ -36,14 +36,14 @@ public: virtual void LockGL(); virtual void UnlockGL(); - + virtual void SwapBuffers(bool VSync = false); virtual void Draw(BRect updateRect); virtual status_t CopyPixelsOut(BPoint source, BBitmap *dest); virtual status_t CopyPixelsIn(BBitmap *source, BPoint dest); - virtual void FrameResized(float width, float height); - + virtual void FrameResized(float width, float height); + virtual void DirectConnected(direct_buffer_info *info); virtual void EnableDirectMode(bool enabled); @@ -61,7 +61,7 @@ private: virtual status_t _Reserved_Renderer_3(int32, void *); virtual status_t _Reserved_Renderer_4(int32, void *); - volatile int32 fRefCount; // How much we're still usefull? + int32 fRefCount; // How much we're still useful BGLView* fView; // Never forget who is the boss! ulong fOptions; // Keep that tune in memory BGLDispatcher* fDispatcher;// Our personal GL API call dispatcher |