From da73bcac37fb79e1e881c38ced350a285a57859c Mon Sep 17 00:00:00 2001 From: X512 Date: Sun, 13 Nov 2022 18:13:21 +0900 Subject: hgl: remove Use EGL and glvnd instead on Haiku platform. Part-of: --- include/HaikuGL/GLRenderer.h | 73 ---------------- include/HaikuGL/GLView.h | 194 ------------------------------------------- include/HaikuGL/OpenGLKit.h | 10 --- include/HaikuGL/README | 27 ------ include/meson.build | 8 -- 5 files changed, 312 deletions(-) delete mode 100644 include/HaikuGL/GLRenderer.h delete mode 100644 include/HaikuGL/GLView.h delete mode 100644 include/HaikuGL/OpenGLKit.h delete mode 100644 include/HaikuGL/README (limited to 'include') diff --git a/include/HaikuGL/GLRenderer.h b/include/HaikuGL/GLRenderer.h deleted file mode 100644 index 5c9c4daaeb6..00000000000 --- a/include/HaikuGL/GLRenderer.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2006, Philippe Houdoin. All rights reserved. - * Distributed under the terms of the MIT License. - - * This header defines BGLRenderer, the base class making up - * the Haiku GL renderer add-ons (essentially selfcontained C++ - * shared libraries that do the actual rendering such as - * libswpipe.so and libswrast.so) - */ -#ifndef GLRENDERER_H -#define GLRENDERER_H - - -#include -#include - - -class BGLDispatcher; -class GLRendererRoster; - -typedef unsigned long renderer_id; - -class _EXPORT BGLRenderer -{ - // Private unimplemented copy constructors - BGLRenderer(const BGLRenderer &); - BGLRenderer & operator=(const BGLRenderer &); - -public: - BGLRenderer(BGLView *view, ulong bgl_options); - virtual ~BGLRenderer(); - - void Acquire(); - void Release(); - - 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 DirectConnected(direct_buffer_info *info); - virtual void EnableDirectMode(bool enabled); - - inline int32 ReferenceCount() const { return fRefCount; }; - inline ulong Options() const { return fOptions; }; - inline BGLView* GLView() { return fView; }; - -private: - friend class GLRendererRoster; - - virtual status_t _Reserved_Renderer_0(int32, void *); - virtual status_t _Reserved_Renderer_1(int32, void *); - virtual status_t _Reserved_Renderer_2(int32, void *); - virtual status_t _Reserved_Renderer_3(int32, void *); - virtual status_t _Reserved_Renderer_4(int32, void *); - - int32 fRefCount; // How much we're still useful - BGLView* fView; // Never forget who is the boss! - ulong fOptions; // Keep that tune in memory - - GLRendererRoster* fOwningRoster; - renderer_id fID; -}; - -extern "C" _EXPORT BGLRenderer* instantiate_gl_renderer(BGLView *view, ulong options); - - -#endif // GLRENDERER_H diff --git a/include/HaikuGL/GLView.h b/include/HaikuGL/GLView.h deleted file mode 100644 index e733377a7fa..00000000000 --- a/include/HaikuGL/GLView.h +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright 2008-2013, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - * - * This header defines BGLView, the base class making up - * the Haiku GL Kit. - * - */ -#ifndef BGLVIEW_H -#define BGLVIEW_H - - -#include - -#define BGL_RGB 0 -#define BGL_INDEX 1 -#define BGL_SINGLE 0 -#define BGL_DOUBLE 2 -#define BGL_DIRECT 0 -#define BGL_INDIRECT 4 -#define BGL_ACCUM 8 -#define BGL_ALPHA 16 -#define BGL_DEPTH 32 -#define BGL_OVERLAY 64 -#define BGL_UNDERLAY 128 -#define BGL_STENCIL 512 -#define BGL_SHARE_CONTEXT 1024 - -#ifdef __cplusplus - -#include -#include -#include -#include -#include -#include - - -struct glview_direct_info; -class BGLRenderer; -class GLRendererRoster; - -class _EXPORT BGLView : public BView { -public: - BGLView(BRect rect, const char* name, - ulong resizingMode, ulong mode, - ulong options); - virtual ~BGLView(); - - void LockGL(); - void UnlockGL(); - void SwapBuffers(); - void SwapBuffers(bool vSync); - - BView* EmbeddedView(); // deprecated, returns NULL - void* GetGLProcAddress(const char* procName); - - status_t CopyPixelsOut(BPoint source, BBitmap *dest); - status_t CopyPixelsIn(BBitmap *source, BPoint dest); - - // Mesa's GLenum is uint where Be's ones was ulong! - virtual void ErrorCallback(unsigned long errorCode); - - virtual void Draw(BRect updateRect); - virtual void AttachedToWindow(); - virtual void AllAttached(); - virtual void DetachedFromWindow(); - virtual void AllDetached(); - - virtual void FrameResized(float newWidth, float newHeight); - virtual status_t Perform(perform_code d, void *arg); - - virtual status_t Archive(BMessage *data, bool deep = true) const; - - virtual void MessageReceived(BMessage *message); - virtual void SetResizingMode(uint32 mode); - - virtual void Show(); - virtual void Hide(); - - virtual BHandler* ResolveSpecifier(BMessage *msg, int32 index, - BMessage *specifier, int32 form, - const char *property); - virtual status_t GetSupportedSuites(BMessage *data); - - void DirectConnected(direct_buffer_info *info); - void EnableDirectMode(bool enabled); - - void* getGC() { return fGc; } // ??? - - virtual void GetPreferredSize(float* width, float* height); - -private: - - virtual void _ReservedGLView1(); - virtual void _ReservedGLView2(); - virtual void _ReservedGLView3(); - virtual void _ReservedGLView4(); - virtual void _ReservedGLView5(); - virtual void _ReservedGLView6(); - virtual void _ReservedGLView7(); - virtual void _ReservedGLView8(); - - BGLView(const BGLView &); - BGLView &operator=(const BGLView &); - - void _DitherFront(); - bool _ConfirmDither(); - void _Draw(BRect rect); - void _CallDirectConnected(); - - void* fGc; - uint32 fOptions; - uint32 fDitherCount; - BLocker fDrawLock; - BLocker fDisplayLock; - glview_direct_info* fClipInfo; - - BGLRenderer* fRenderer; - GLRendererRoster* fRoster; - - BBitmap* fDitherMap; - BRect fBounds; - int16* fErrorBuffer[2]; - uint64 _reserved[8]; - - void _LockDraw(); - void _UnlockDraw(); - -// BeOS compatibility -private: - BGLView(BRect rect, char* name, - ulong resizingMode, ulong mode, - ulong options); -}; - - -class BGLScreen : public BWindowScreen { -public: - BGLScreen(char* name, - ulong screenMode, ulong options, - status_t *error, bool debug=false); - ~BGLScreen(); - - void LockGL(); - void UnlockGL(); - void SwapBuffers(); - // Mesa's GLenum is uint where Be's ones was ulong! - virtual void ErrorCallback(unsigned long errorCode); - - virtual void ScreenConnected(bool connected); - virtual void FrameResized(float width, float height); - virtual status_t Perform(perform_code code, void *arg); - - virtual status_t Archive(BMessage *data, bool deep = true) const; - virtual void MessageReceived(BMessage *message); - - virtual void Show(); - virtual void Hide(); - - virtual BHandler* ResolveSpecifier(BMessage *message, - int32 index, - BMessage *specifier, - int32 form, - const char *property); - virtual status_t GetSupportedSuites(BMessage *data); - -private: - - virtual void _ReservedGLScreen1(); - virtual void _ReservedGLScreen2(); - virtual void _ReservedGLScreen3(); - virtual void _ReservedGLScreen4(); - virtual void _ReservedGLScreen5(); - virtual void _ReservedGLScreen6(); - virtual void _ReservedGLScreen7(); - virtual void _ReservedGLScreen8(); - - BGLScreen(const BGLScreen &); - BGLScreen &operator=(const BGLScreen &); - - void* fGc; - long fOptions; - BLocker fDrawLock; - - int32 fColorSpace; - uint32 fScreenMode; - - uint64 _reserved[7]; -}; - -#endif // __cplusplus - -#endif // BGLVIEW_H diff --git a/include/HaikuGL/OpenGLKit.h b/include/HaikuGL/OpenGLKit.h deleted file mode 100644 index 71d98307509..00000000000 --- a/include/HaikuGL/OpenGLKit.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Master include file for the Haiku OpenGL Kit. - */ - -#include -#include - -// Projects needing GL/glu.h and GL/glut.h should now -// include these headers independently as glu and glut -// are no longer core parts of mesa diff --git a/include/HaikuGL/README b/include/HaikuGL/README deleted file mode 100644 index da5e5b6b912..00000000000 --- a/include/HaikuGL/README +++ /dev/null @@ -1,27 +0,0 @@ -These headers make up the Haiku Op*nGL kit. - -Headers in this directory preserve some BeOS™ compatibility -compatibility, so changes should be mentioned to the Haiku -project mailing list. - -http://haiku-os.org - -Normal Haiku Op*enGL layout: - - * headers/os/OpenGLKit.h - * headers/os/opengl/GLView.h - * headers/os/opengl/GLRenderer.h - * headers/os/opengl/GL/gl.h - * headers/os/opengl/GL/glext.h - * headers/os/opengl/GL/osmesa.h (needed?) - -Extras: - - * headers/os/opengl/GL/glu.h - * headers/os/opengl/GL/glut.h - -OpenGL™ is a trademark of SGI. The usage of this trademark -in the Haiku GL Kit is not a sign of any certification or -endorsement by SGI or its affiliates. Usage is purely to -allow legacy compatibility with the BeOS™ and its 3D GL -rendering subsystem. diff --git a/include/meson.build b/include/meson.build index aa47e39c71d..c55325d2cd5 100644 --- a/include/meson.build +++ b/include/meson.build @@ -20,7 +20,6 @@ inc_include = [include_directories('.')] inc_d3d9 = include_directories('D3D9') -inc_haikugl = include_directories('HaikuGL') # Most things assume that Android headers are in the default include # path when compiling for Android so add the stub headers to @@ -111,13 +110,6 @@ if with_gallium_st_nine ) endif -if with_platform_haiku - install_headers( - 'HaikuGL/GLRenderer.h', 'HaikuGL/GLView.h', 'HaikuGL/OpenGLKit.h', - subdir : 'opengl', - ) -endif - opencl_headers = files( 'CL/cl.h', 'CL/cl.hpp', -- cgit v1.2.1