X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2FRenderTexture.h;h=5d68a02c698d6b076fd506f646b4ead417b02f01;hb=b5c4328682ac21fa4f39ae9f50b1ef662bee32f1;hp=c8377d1161eea01991a7a9800f59121b1e1080f3;hpb=72f35dc9143bbe4c009df4ee4ed7c76c9db07c21;p=simgear.git diff --git a/simgear/screen/RenderTexture.h b/simgear/screen/RenderTexture.h index c8377d11..5d68a02c 100644 --- a/simgear/screen/RenderTexture.h +++ b/simgear/screen/RenderTexture.h @@ -27,6 +27,7 @@ // Original RenderTexture code: Mark J. Harris // Original Render-to-depth-texture support: Thorsten Scheuermann // Linux Copy-to-texture: Eric Werness +// OS X: Alexander Powell (someone please help) // Various Bug Fixes: Daniel (Redge) Sperl // Bill Baxter // @@ -45,13 +46,17 @@ * Changelog: * * Jan. 2005, Removed GLEW dependencies, Erik Hofman + * Mar. 2006, Added MAC OS X support, Alexander Powell */ #include -#ifndef _WIN32 +#if !defined( _WIN32 ) && !defined( __MACH__ ) # include #endif #include SG_GL_H +#if defined( __MACH__) +# include +#endif #ifndef _WIN32 # include SG_GLX_H #endif @@ -337,8 +342,11 @@ protected: // data HDC _hPreviousDC; HGLRC _hPreviousContext; -#elif defined( __APPLE__ ) - +#elif defined( __MACH__ ) + CGLContextObj _hGLContext; + CGLPBufferObj _hPBuffer; + + CGLContextObj _hPreviousContext; #else Display *_pDisplay; GLXContext _hGLContext; @@ -350,8 +358,8 @@ protected: // data // Texture stuff GLenum _iTextureTarget; - unsigned int _iTextureID; - unsigned int _iDepthTextureID; + GLuint _iTextureID; + GLuint _iDepthTextureID; unsigned short* _pPoorDepthTexture; // [Redge]