luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/Irrlicht/CEGLManager.h
View File

@@ -36,39 +36,39 @@ namespace video
// Initialize EGL.
/* This method initialize EGLand create EGL display, anyway surface and context
aren't create. */
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate EGL.
/* Terminate EGL context. This method break both existed surface and context. */
virtual void terminate() _IRR_OVERRIDE_;
virtual void terminate() IRR_OVERRIDE;
// Create EGL surface.
/* This method create EGL surface. On some platforms eg. Android, we must
recreate surface on each resume, because WindowID may change, so existed
surface may not be valid. If EGL context already exist, this method
automatically activates it. */
virtual bool generateSurface() _IRR_OVERRIDE_;
virtual bool generateSurface() IRR_OVERRIDE;
// Destroy EGL surface.
/* This method destroy EGL. On some platforms eg. Android, we should call
this method on each pause, because after resume this surface may not be valid.
Hovewer this method doesn'r break EGL context. */
virtual void destroySurface() _IRR_OVERRIDE_;
virtual void destroySurface() IRR_OVERRIDE;
// Create EGL context.
/* This method create and activate EGL context. */
virtual bool generateContext() _IRR_OVERRIDE_;
virtual bool generateContext() IRR_OVERRIDE;
// Destroy EGL context.
/* This method destroy EGL context. */
virtual void destroyContext() _IRR_OVERRIDE_;
virtual void destroyContext() IRR_OVERRIDE;
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;
virtual const SExposedVideoData& getContext() const IRR_OVERRIDE;
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers.
virtual bool swapBuffers() _IRR_OVERRIDE_;
virtual bool swapBuffers() IRR_OVERRIDE;
protected:
enum EConfigStyle