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

29
source/Irrlicht/CDepthBuffer.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_Z_BUFFER_H_INCLUDED__
#define __C_Z_BUFFER_H_INCLUDED__
#ifndef IRR_C_Z_BUFFER_H_INCLUDED
#define IRR_C_Z_BUFFER_H_INCLUDED
#include "IDepthBuffer.h"
@@ -23,22 +23,22 @@ namespace video
virtual ~CDepthBuffer();
//! clears the zbuffer
virtual void clear(f32 value, const interlaced_control interlaced) _IRR_OVERRIDE_;
virtual void clear(f32 value, const interlaced_control interlaced) IRR_OVERRIDE;
//! sets the new size of the zbuffer
virtual void setSize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
virtual void setSize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! returns the size of the zbuffer
virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_;
virtual const core::dimension2d<u32>& getSize() const IRR_OVERRIDE;
//! locks the zbuffer
virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; }
virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; }
//! unlocks the zbuffer
virtual void unlock() _IRR_OVERRIDE_ {}
virtual void unlock() IRR_OVERRIDE {}
//! returns pitch of depthbuffer (in bytes)
virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; }
virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; }
private:
@@ -60,22 +60,22 @@ namespace video
virtual ~CStencilBuffer();
//! clears the zbuffer
virtual void clear(u32 value, const interlaced_control interlaced) _IRR_OVERRIDE_;
virtual void clear(u32 value, const interlaced_control interlaced) IRR_OVERRIDE;
//! sets the new size of the zbuffer
virtual void setSize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
virtual void setSize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! returns the size of the zbuffer
virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_;
virtual const core::dimension2d<u32>& getSize() const IRR_OVERRIDE;
//! locks the zbuffer
virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; }
virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; }
//! unlocks the zbuffer
virtual void unlock() _IRR_OVERRIDE_ {}
virtual void unlock() IRR_OVERRIDE {}
//! returns pitch of depthbuffer (in bytes)
virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; }
virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; }
private:
@@ -89,4 +89,3 @@ namespace video
} // end namespace irr
#endif