Rolled back to r5490. Was likely a misunderstanding

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5492 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-07-03 16:37:29 +00:00
parent 3a2a0eede9
commit 380d186d3f
4 changed files with 66 additions and 0 deletions

View File

@ -2622,6 +2622,36 @@ COGLES2Driver::~COGLES2Driver()
return blendTable[factor];
}
GLenum COGLES2Driver::getZBufferBits() const
{
GLenum bits = 0;
switch (Params.ZBufferBits)
{
case 24:
#if defined(GL_OES_depth24)
if (queryOpenGLFeature(COGLES2ExtensionHandler::IRR_OES_depth24))
bits = GL_DEPTH_COMPONENT24_OES;
else
#endif
bits = GL_DEPTH_COMPONENT16;
break;
case 32:
#if defined(GL_OES_depth32)
if (queryOpenGLFeature(COGLES2ExtensionHandler::IRR_OES_depth32))
bits = GL_DEPTH_COMPONENT32_OES;
else
#endif
bits = GL_DEPTH_COMPONENT16;
break;
default:
bits = GL_DEPTH_COMPONENT16;
break;
}
return bits;
}
void COGLES2Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,
GLenum& pixelType, void(**converter)(const void*, s32, void*))
{

View File

@ -308,6 +308,9 @@ namespace video
//! Convert E_BLEND_FACTOR to OpenGL equivalent
GLenum getGLBlend(E_BLEND_FACTOR factor) const;
//! Get ZBuffer bits.
GLenum getZBufferBits() const;
void getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,
GLenum& pixelType, void(**converter)(const void*, s32, void*));

View File

@ -2975,6 +2975,36 @@ GLenum COGLES1Driver::getGLBlend(E_BLEND_FACTOR factor) const
return blendTable[factor];
}
GLenum COGLES1Driver::getZBufferBits() const
{
GLenum bits = 0;
switch (Params.ZBufferBits)
{
case 24:
#if defined(GL_OES_depth24)
if (queryOpenGLFeature(COGLES1ExtensionHandler::IRR_OES_depth24))
bits = GL_DEPTH_COMPONENT24_OES;
else
#endif
bits = GL_DEPTH_COMPONENT16;
break;
case 32:
#if defined(GL_OES_depth32)
if (queryOpenGLFeature(COGLES1ExtensionHandler::IRR_OES_depth32))
bits = GL_DEPTH_COMPONENT32_OES;
else
#endif
bits = GL_DEPTH_COMPONENT16;
break;
default:
bits = GL_DEPTH_COMPONENT16;
break;
}
return bits;
}
void COGLES1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,
GLenum& pixelType, void(**converter)(const void*, s32, void*))
{

View File

@ -285,6 +285,9 @@ namespace video
//! Convert E_BLEND_FACTOR to OpenGL equivalent
GLenum getGLBlend(E_BLEND_FACTOR factor) const;
//! Get ZBuffer bits.
GLenum getZBufferBits() const;
void getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,
GLenum& pixelType, void(**converter)(const void*, s32, void*));