Commit b600a805 authored by hybrid's avatar hybrid

Fix warnings and duplicated variables

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4155 dfc29bdd-3216-0410-991c-e03cc46cb475
parent f598f786
...@@ -251,8 +251,6 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device) ...@@ -251,8 +251,6 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
const bool pixel_format_supported = (wglExtensions.find("WGL_ARB_pixel_format") != -1); const bool pixel_format_supported = (wglExtensions.find("WGL_ARB_pixel_format") != -1);
const bool multi_sample_supported = ((wglExtensions.find("WGL_ARB_multisample") != -1) || const bool multi_sample_supported = ((wglExtensions.find("WGL_ARB_multisample") != -1) ||
(wglExtensions.find("WGL_EXT_multisample") != -1) || (wglExtensions.find("WGL_3DFX_multisample") != -1) ); (wglExtensions.find("WGL_EXT_multisample") != -1) || (wglExtensions.find("WGL_3DFX_multisample") != -1) );
const bool framebuffer_srgb_supported = ((wglExtensions.find("WGL_ARB_framebuffer_sRGB") != -1) ||
(wglExtensions.find("WGL_EXT_framebuffer_sRGB") != -1) );
#ifdef _DEBUG #ifdef _DEBUG
os::Printer::log("WGL_extensions", wglExtensions); os::Printer::log("WGL_extensions", wglExtensions);
#endif #endif
......
...@@ -502,7 +502,7 @@ namespace video ...@@ -502,7 +502,7 @@ namespace video
const ITexture* operator[](int stage) const const ITexture* operator[](int stage) const
{ {
if (stage<MATERIAL_MAX_TEXTURES) if ((u32)stage<MATERIAL_MAX_TEXTURES)
return CurrentTexture[stage]; return CurrentTexture[stage];
else else
return 0; return 0;
......
...@@ -248,6 +248,8 @@ void COpenGLExtensionHandler::dumpFramebufferFormats() const ...@@ -248,6 +248,8 @@ void COpenGLExtensionHandler::dumpFramebufferFormats() const
memset(vals,0,sizeof(vals)); memset(vals,0,sizeof(vals));
#define tmplog(x,y) os::Printer::log(x, core::stringc(y).c_str()) #define tmplog(x,y) os::Printer::log(x, core::stringc(y).c_str())
const BOOL res = wglGetPixelFormatAttribiv_ARB(hdc,i,0,nums,atts,vals); const BOOL res = wglGetPixelFormatAttribiv_ARB(hdc,i,0,nums,atts,vals);
if (FALSE==res)
continue;
tmplog("Pixel format ",i); tmplog("Pixel format ",i);
u32 j=0; u32 j=0;
tmplog("Draw to window " , vals[j]); tmplog("Draw to window " , vals[j]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment