minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-25 10:10:32 +01:00
Code Issues Projects Releases Wiki Activity

Amendment to [r6389] Change all CColorConverter functions to work with u32 instead of s32 for sizes

Browse Source 
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
This commit is contained in:
cutealien 2022-05-15 15:51:55 +00:00
parent 5d27ca38a7
commit 4450b532c2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/COpenGLCoreTexture.h
View File

@ -639,7 +639,7 @@ protected:
GLint InternalFormat; GLint InternalFormat;
GLenum PixelFormat; GLenum PixelFormat;
GLenum PixelType; GLenum PixelType;
void (*Converter)(const void*, s32, void*); void (*Converter)(const void*, u32, void*);
bool LockReadOnly; bool LockReadOnly;
IImage* LockImage; IImage* LockImage;

4
source/Irrlicht/COpenGLDriver.cpp
View File

@ -3612,7 +3612,7 @@ bool COpenGLDriver::queryTextureFormat(ECOLOR_FORMAT format) const
GLint dummyInternalFormat; GLint dummyInternalFormat;
GLenum dummyPixelFormat; GLenum dummyPixelFormat;
GLenum dummyPixelType; GLenum dummyPixelType;
void (*dummyConverter)(const void*, s32, void*); void (*dummyConverter)(const void*, u32, void*);
return getColorFormatParameters(format, dummyInternalFormat, dummyPixelFormat, dummyPixelType, &dummyConverter); 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, 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. // NOTE: Converter variable not used here, but don't remove, it's used in the OGL-ES drivers.

2
source/Irrlicht/COpenGLDriver.h
View File

@ -404,7 +404,7 @@ namespace video
GLenum getZBufferBits() const; GLenum getZBufferBits() const;
bool getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat, 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. //! Return info about fixed pipeline state.
E_OPENGL_FIXED_PIPELINE_STATE getFixedPipelineState() const; E_OPENGL_FIXED_PIPELINE_STATE getFixedPipelineState() const;