ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenGL Renderer: 

- Fix polygon coloring bug when converting the framebuffer on big-endian systems. (Disabling textures will show the correct polygon coloring. Endianness bugs remain with texturing enabled.)
This commit is contained in:
rogerman 2013-02-08 23:38:10 +00:00
parent 58d32b05c4
commit 533b810efe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/src/OGLRender.cpp
View File

@ -347,14 +347,14 @@ static const char *fragmentShader_100 = {"\
} \n\ } \n\
"}; "};
FORCEINLINE u32 BGRA8888_32_To_RGBA6665_32Rev(const u32 srcPix) FORCEINLINE u32 BGRA8888_32_To_RGBA6665_32(const u32 srcPix)
{ {
const u32 dstPix = (srcPix >> 2) & 0x3F3F3F3F; const u32 dstPix = (srcPix >> 2) & 0x3F3F3F3F;
return (dstPix & 0x0000FF00) >> 8 | // R return (dstPix & 0x0000FF00) << 16 | // R
(dstPix & 0x00FF0000) >> 8 | // G (dstPix & 0x00FF0000) | // G
(dstPix & 0xFF000000) >> 8 | // B (dstPix & 0xFF000000) >> 16 | // B
((dstPix >> 1) & 0x000000FF) << 24; // A ((dstPix >> 1) & 0x000000FF); // A
} }
FORCEINLINE u32 BGRA8888_32Rev_To_RGBA6665_32Rev(const u32 srcPix) FORCEINLINE u32 BGRA8888_32Rev_To_RGBA6665_32Rev(const u32 srcPix)
@ -819,7 +819,7 @@ void OpenGLRenderer::ConvertFramebuffer(const u32 *__restrict srcBuffer, u32 *ds
// Use the correct endian format since OpenGL uses the native endian of // Use the correct endian format since OpenGL uses the native endian of
// the architecture it is running on. // the architecture it is running on.
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
*dst++ = BGRA8888_32_To_RGBA6665_32Rev(srcBuffer[i]); *dst++ = BGRA8888_32_To_RGBA6665_32(srcBuffer[i]);
#else #else
*dst++ = BGRA8888_32Rev_To_RGBA6665_32Rev(srcBuffer[i]); *dst++ = BGRA8888_32Rev_To_RGBA6665_32Rev(srcBuffer[i]);
#endif #endif

2
desmume/src/OGLRender.h
View File

@ -388,7 +388,7 @@ extern CACHE_ALIGN GLfloat material_8bit_to_float[256];
extern CACHE_ALIGN GLuint dsDepthToD24S8_LUT[32768]; extern CACHE_ALIGN GLuint dsDepthToD24S8_LUT[32768];
extern const GLfloat divide5bitBy31_LUT[32]; extern const GLfloat divide5bitBy31_LUT[32];
FORCEINLINE u32 BGRA8888_32_To_RGBA6665_32Rev(const u32 srcPix); FORCEINLINE u32 BGRA8888_32_To_RGBA6665_32(const u32 srcPix);
FORCEINLINE u32 BGRA8888_32Rev_To_RGBA6665_32Rev(const u32 srcPix); FORCEINLINE u32 BGRA8888_32Rev_To_RGBA6665_32Rev(const u32 srcPix);
bool IsVersionSupported(unsigned int checkVersionMajor, unsigned int checkVersionMinor, unsigned int checkVersionRevision); bool IsVersionSupported(unsigned int checkVersionMajor, unsigned int checkVersionMinor, unsigned int checkVersionRevision);