From 4450b532c2cae3b908a0337d705e3b3bda8623a2 Mon Sep 17 00:00:00 2001 From: cutealien Date: Sun, 15 May 2022 15:51:55 +0000 Subject: [PATCH] Amendment to [r6389] Change all CColorConverter functions to work with u32 instead of s32 for sizes Missed it as that part is only use by OGL_ES branch. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6403 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COpenGLCoreTexture.h | 2 +- source/Irrlicht/COpenGLDriver.cpp | 4 ++-- source/Irrlicht/COpenGLDriver.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h index c431ee9a..ccd37704 100644 --- a/source/Irrlicht/COpenGLCoreTexture.h +++ b/source/Irrlicht/COpenGLCoreTexture.h @@ -639,7 +639,7 @@ protected: GLint InternalFormat; GLenum PixelFormat; GLenum PixelType; - void (*Converter)(const void*, s32, void*); + void (*Converter)(const void*, u32, void*); bool LockReadOnly; IImage* LockImage; diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index 2c7469eb..ed6bda9b 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -3612,7 +3612,7 @@ bool COpenGLDriver::queryTextureFormat(ECOLOR_FORMAT format) const GLint dummyInternalFormat; GLenum dummyPixelFormat; GLenum dummyPixelType; - void (*dummyConverter)(const void*, s32, void*); + void (*dummyConverter)(const void*, u32, void*); return getColorFormatParameters(format, dummyInternalFormat, dummyPixelFormat, dummyPixelType, &dummyConverter); } @@ -4201,7 +4201,7 @@ GLenum COpenGLDriver::getZBufferBits() const } bool COpenGLDriver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat, - GLenum& pixelType, void(**converter)(const void*, s32, void*)) const + GLenum& pixelType, void(**converter)(const void*, u32, void*)) const { // NOTE: Converter variable not used here, but don't remove, it's used in the OGL-ES drivers. diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h index 333c626d..90809eae 100644 --- a/source/Irrlicht/COpenGLDriver.h +++ b/source/Irrlicht/COpenGLDriver.h @@ -404,7 +404,7 @@ namespace video GLenum getZBufferBits() const; bool getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat, - GLenum& pixelType, void(**converter)(const void*, s32, void*)) const; + GLenum& pixelType, void(**converter)(const void*, u32, void*)) const; //! Return info about fixed pipeline state. E_OPENGL_FIXED_PIPELINE_STATE getFixedPipelineState() const;