MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed issue with CurrentRenderTargetSize vs. CurrentRendertargetSize in OpenGL ES drivers. Thanks cheqnk for report. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5257 dfc29bdd-3216-0410-991c-e03cc46cb475
master
nadro 2016-02-13 11:13:44 +00:00
parent bf419bedf3
commit 9773157768
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/COGLES2Driver.cpp
View File

@ -37,7 +37,7 @@ namespace video
COGLES2Driver::COGLES2Driver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager) :
CNullDriver(io, params.WindowSize), COGLES2ExtensionHandler(), CacheHandler(0), MaterialRenderer2D(0), CurrentRenderMode(ERM_NONE),
ResetRenderStates(true), Transformation3DChanged(true), AntiAlias(params.AntiAlias), OGLES2ShaderPath(params.OGLES2ShaderPath),
CurrentRendertargetSize(0, 0),ColorFormat(ECF_R8G8B8), Params(params), ContextManager(contextManager)
ColorFormat(ECF_R8G8B8), Params(params), ContextManager(contextManager)
{
#ifdef _DEBUG
setDebugName("COGLES2Driver");
@ -2426,16 +2426,6 @@ COGLES2Driver::~COGLES2Driver()
return true;
}
// returns the current size of the screen or rendertarget
const core::dimension2d<u32>& COGLES2Driver::getCurrentRenderTargetSize() const
{
if (CurrentRendertargetSize.Width == 0)
return ScreenSize;
else
return CurrentRendertargetSize;
}
void COGLES2Driver::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
{
GLbitfield mask = 0;

5
source/Irrlicht/COGLES2Driver.h
View File

@ -301,9 +301,6 @@ namespace video
void removeTexture(ITexture* texture) _IRR_OVERRIDE_;
// returns the current size of the screen or rendertarget
virtual const core::dimension2d<u32>& getCurrentRenderTargetSize() const _IRR_OVERRIDE_;
//! Convert E_BLEND_FACTOR to OpenGL equivalent
GLenum getGLBlend(E_BLEND_FACTOR factor) const;
@ -372,8 +369,6 @@ namespace video
core::array<SUserClipPlane> UserClipPlane;
core::dimension2d<u32> CurrentRendertargetSize;
core::stringc VendorName;
core::matrix4 TextureFlipMatrix;

12
source/Irrlicht/COGLESDriver.cpp
View File

@ -31,7 +31,7 @@ namespace video
COGLES1Driver::COGLES1Driver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager) :
CNullDriver(io, params.WindowSize), COGLES1ExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE),
ResetRenderStates(true), Transformation3DChanged(true), AntiAlias(params.AntiAlias), CurrentRendertargetSize(0, 0),
ResetRenderStates(true), Transformation3DChanged(true), AntiAlias(params.AntiAlias),
ColorFormat(ECF_R8G8B8), Params(params), ContextManager(contextManager)
{
#ifdef _DEBUG
@ -2788,16 +2788,6 @@ bool COGLES1Driver::setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SCol
return true;
}
// returns the current size of the screen or rendertarget
const core::dimension2d<u32>& COGLES1Driver::getCurrentRenderTargetSize() const
{
if (CurrentRenderTargetSize.Width == 0)
return ScreenSize;
else
return CurrentRenderTargetSize;
}
void COGLES1Driver::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
{
GLbitfield mask = 0;

5
source/Irrlicht/COGLESDriver.h
View File

@ -319,9 +319,6 @@ namespace video
//! sets the needed renderstates
void setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel);
// returns the current size of the screen or rendertarget
virtual const core::dimension2d<u32>& getCurrentRenderTargetSize() const _IRR_OVERRIDE_;
void createMaterialRenderers();
//! Assign a hardware light to the specified requested light, if any
@ -353,8 +350,6 @@ namespace video
core::array<core::plane3df> UserClipPlane;
core::array<bool> UserClipPlaneEnabled;
core::dimension2d<u32> CurrentRendertargetSize;
core::stringc VendorName;
core::matrix4 TextureFlipMatrix;