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/CVideoModeList.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 __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
#define __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
#ifndef IRR_C_VIDEO_MODE_LIST_H_INCLUDED
#define IRR_C_VIDEO_MODE_LIST_H_INCLUDED
#include "IVideoModeList.h"
#include "dimension2d.h"
@@ -22,22 +22,22 @@ namespace video
CVideoModeList();
//! Gets amount of video modes in the list.
virtual s32 getVideoModeCount() const _IRR_OVERRIDE_;
virtual s32 getVideoModeCount() const IRR_OVERRIDE;
//! Returns the screen size of a video mode in pixels.
virtual core::dimension2d<u32> getVideoModeResolution(s32 modeNumber) const _IRR_OVERRIDE_;
virtual core::dimension2d<u32> getVideoModeResolution(s32 modeNumber) const IRR_OVERRIDE;
//! Returns the screen size of an optimal video mode in pixels.
virtual core::dimension2d<u32> getVideoModeResolution(const core::dimension2d<u32>& minSize, const core::dimension2d<u32>& maxSize) const _IRR_OVERRIDE_;
virtual core::dimension2d<u32> getVideoModeResolution(const core::dimension2d<u32>& minSize, const core::dimension2d<u32>& maxSize) const IRR_OVERRIDE;
//! Returns the pixel depth of a video mode in bits.
virtual s32 getVideoModeDepth(s32 modeNumber) const _IRR_OVERRIDE_;
virtual s32 getVideoModeDepth(s32 modeNumber) const IRR_OVERRIDE;
//! Returns current desktop screen resolution.
virtual const core::dimension2d<u32>& getDesktopResolution() const _IRR_OVERRIDE_;
virtual const core::dimension2d<u32>& getDesktopResolution() const IRR_OVERRIDE;
//! Returns the pixel depth of a video mode in bits.
virtual s32 getDesktopDepth() const _IRR_OVERRIDE_;
virtual s32 getDesktopDepth() const IRR_OVERRIDE;
//! adds a new mode to the list
void addMode(const core::dimension2d<u32>& size, s32 depth);
@@ -74,6 +74,4 @@ namespace video
} // end namespace video
} // end namespace irr
#endif