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

Remove warnings in ES1 and ES2 getColorFormatParameters functions as was done in OpenGL before. 

(warnings are now produced instead of places calling those functions).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5540 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-08-30 13:27:27 +00:00
parent 7bd44b9733
commit b5d46535e7
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Irrlicht/COGLES2Driver.cpp
View File

@ -2792,9 +2792,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_DEPTH_COMPONENT;
pixelType = GL_UNSIGNED_INT;
}
else
#endif
os::Printer::log("ECF_D32 color format is not supported", ELL_ERROR);
break;
case ECF_D24S8:
#ifdef GL_OES_packed_depth_stencil
@ -2804,9 +2802,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_DEPTH_STENCIL_OES;
pixelType = GL_UNSIGNED_INT_24_8_OES;
}
else
#endif
os::Printer::log("ECF_D24S8 color format is not supported", ELL_ERROR);
break;
case ECF_R8:
#if defined(GL_EXT_texture_rg)
@ -2816,9 +2812,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RED_EXT;
pixelType = GL_UNSIGNED_BYTE;
}
else
#endif
os::Printer::log("ECF_R8 color format is not supported", ELL_ERROR);
break;
case ECF_R8G8:
#if defined(GL_EXT_texture_rg)
@ -2828,15 +2822,11 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RG_EXT;
pixelType = GL_UNSIGNED_BYTE;
}
else
#endif
os::Printer::log("ECF_R8G8 color format is not supported", ELL_ERROR);
break;
case ECF_R16:
os::Printer::log("ECF_R16 color format is not supported", ELL_ERROR);
break;
case ECF_R16G16:
os::Printer::log("ECF_R16G16 color format is not supported", ELL_ERROR);
break;
case ECF_R16F:
#if defined(GL_OES_texture_half_float) && defined(GL_EXT_texture_rg)
@ -2848,9 +2838,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RED_EXT;
pixelType = GL_HALF_FLOAT_OES ;
}
else
#endif
os::Printer::log("ECF_R16F color format is not supported", ELL_ERROR);
break;
case ECF_G16R16F:
#if defined(GL_OES_texture_half_float) && defined(GL_EXT_texture_rg)
@ -2862,9 +2850,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RG_EXT;
pixelType = GL_HALF_FLOAT_OES ;
}
else
#endif
os::Printer::log("ECF_G16R16F color format is not supported", ELL_ERROR);
break;
case ECF_A16B16G16R16F:
#if defined(GL_OES_texture_half_float)
@ -2874,9 +2860,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RGBA;
pixelType = GL_HALF_FLOAT_OES ;
}
else
#endif
os::Printer::log("ECF_A16B16G16R16F color format is not supported", ELL_ERROR);
break;
case ECF_R32F:
#if defined(GL_OES_texture_float) && defined(GL_EXT_texture_rg)
@ -2888,9 +2872,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RED_EXT;
pixelType = GL_FLOAT;
}
else
#endif
os::Printer::log("ECF_R32F color format is not supported", ELL_ERROR);
break;
case ECF_G32R32F:
#if defined(GL_OES_texture_float) && defined(GL_EXT_texture_rg)
@ -2902,9 +2884,7 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RG_EXT;
pixelType = GL_FLOAT;
}
else
#endif
os::Printer::log("ECF_G32R32F color format is not supported", ELL_ERROR);
break;
case ECF_A32B32G32R32F:
#if defined(GL_OES_texture_float)
@ -2914,12 +2894,9 @@ COGLES2Driver::~COGLES2Driver()
pixelFormat = GL_RGBA;
pixelType = GL_FLOAT ;
}
else
#endif
os::Printer::log("ECF_A32B32G32R32F color format is not supported", ELL_ERROR);
break;
default:
os::Printer::log("Unsupported texture format", ELL_ERROR);
break;
}

15
source/Irrlicht/COGLESDriver.cpp
View File

@ -3168,9 +3168,7 @@ bool COGLES1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& intern
pixelFormat = GL_DEPTH_COMPONENT;
pixelType = GL_UNSIGNED_INT;
}
else
#endif
os::Printer::log("ECF_D32 color format is not supported", ELL_ERROR);
break;
case ECF_D24S8:
#ifdef GL_OES_packed_depth_stencil
@ -3181,42 +3179,29 @@ bool COGLES1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& intern
pixelFormat = GL_DEPTH_STENCIL_OES;
pixelType = GL_UNSIGNED_INT_24_8_OES;
}
else
#endif
os::Printer::log("ECF_D24S8 color format is not supported", ELL_ERROR);
break;
case ECF_R8:
os::Printer::log("ECF_R8 color format is not supported", ELL_ERROR);
break;
case ECF_R8G8:
os::Printer::log("ECF_R8G8 color format is not supported", ELL_ERROR);
break;
case ECF_R16:
os::Printer::log("ECF_R16 color format is not supported", ELL_ERROR);
break;
case ECF_R16G16:
os::Printer::log("ECF_R16G16 color format is not supported", ELL_ERROR);
break;
case ECF_R16F:
os::Printer::log("ECF_R16F color format is not supported", ELL_ERROR);
break;
case ECF_G16R16F:
os::Printer::log("ECF_G16R16F color format is not supported", ELL_ERROR);
break;
case ECF_A16B16G16R16F:
os::Printer::log("ECF_A16B16G16R16F color format is not supported", ELL_ERROR);
break;
case ECF_R32F:
os::Printer::log("ECF_R32F color format is not supported", ELL_ERROR);
break;
case ECF_G32R32F:
os::Printer::log("ECF_G32R32F color format is not supported", ELL_ERROR);
break;
case ECF_A32B32G32R32F:
os::Printer::log("ECF_A32B32G32R32F color format is not supported", ELL_ERROR);
break;
default:
os::Printer::log("Unsupported texture format", ELL_ERROR);
break;
}