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

23
source/Irrlicht/CGLXManager.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_GLX_MANAGER_H_INCLUDED__
#define __C_GLX_MANAGER_H_INCLUDED__
#ifndef IRR_C_GLX_MANAGER_H_INCLUDED
#define IRR_C_GLX_MANAGER_H_INCLUDED
#include "IrrCompileConfig.h"
@@ -34,31 +34,31 @@ namespace video
~CGLXManager();
// Initialize
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate
virtual void terminate() _IRR_OVERRIDE_;
virtual void terminate() IRR_OVERRIDE;
// Create surface.
virtual bool generateSurface() _IRR_OVERRIDE_;
virtual bool generateSurface() IRR_OVERRIDE;
// Destroy surface.
virtual void destroySurface() _IRR_OVERRIDE_;
virtual void destroySurface() IRR_OVERRIDE;
// Create context.
virtual bool generateContext() _IRR_OVERRIDE_;
virtual bool generateContext() IRR_OVERRIDE;
// Destroy context.
virtual void destroyContext() _IRR_OVERRIDE_;
virtual void destroyContext() IRR_OVERRIDE;
//! Get current context
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;
virtual const SExposedVideoData& getContext() const IRR_OVERRIDE;
//! Change render context, disable old and activate new defined by videoData
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;
XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo
@@ -76,4 +76,3 @@ namespace video
#endif
#endif