1
0

Merging r6256 from trunk to ogl-es branch

(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:20:42 +00:00
parent ee3579015b
commit 1efc93d766
196 changed files with 832 additions and 991 deletions

View File

@@ -31,31 +31,31 @@ namespace video
~CNSOGLManager();
// Initialize
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate
void terminate() _IRR_OVERRIDE_;
void terminate() IRR_OVERRIDE;
// Create surface.
bool generateSurface() _IRR_OVERRIDE_;
bool generateSurface() IRR_OVERRIDE;
// Destroy surface.
void destroySurface() _IRR_OVERRIDE_;
void destroySurface() IRR_OVERRIDE;
// Create context.
bool generateContext() _IRR_OVERRIDE_;
bool generateContext() IRR_OVERRIDE;
// Destroy EGL context.
void destroyContext() _IRR_OVERRIDE_;
void destroyContext() IRR_OVERRIDE;
//! Get current context
const SExposedVideoData& getContext() const;
//! Change render context, disable old and activate new defined by videoData
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers.
bool swapBuffers() _IRR_OVERRIDE_;
bool swapBuffers() IRR_OVERRIDE;
private:
SIrrlichtCreationParameters Params;