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

Removed unneeded color depth checks and fixed some spacing

This commit is contained in:
wowzaman12 2015-03-28 17:48:38 +00:00
parent 843a90632f
commit 6f3699c7aa
2 changed files with 128 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wx/panel.cpp
View File

@ -1025,22 +1025,11 @@ DrawingPanel::DrawingPanel(int _width, int _height) :
} while(0); } while(0);
} else { } else {
scale = builtin_ff_scale(gopts.filter); scale = builtin_ff_scale(gopts.filter);
#ifndef NO_ASM
// while there is a 32->16 frontend for these, it's probably more
// efficient to just use 16 to start with
// unfortunately, this also means that the 32-bit output needs to
// be sensed in lower code
#define out_16 (systemColorDepth == 16 && gopts.filter == FF_PLUGIN)
if(gopts.filter == FF_HQ3X || gopts.filter == FF_HQ4X)
systemColorDepth = 16;
else
#else
#define out_16 (systemColorDepth == 16) #define out_16 (systemColorDepth == 16)
#endif #endif
systemColorDepth = 32; systemColorDepth = 32;
} }
// Intialize color tables // Intialize color tables
if(systemColorDepth == 32) {
#if wxBYTE_ORDER == wxLITTLE_ENDIAN #if wxBYTE_ORDER == wxLITTLE_ENDIAN
systemRedShift = 3; systemRedShift = 3;
systemGreenShift = 11; systemGreenShift = 11;
@ -1052,14 +1041,6 @@ DrawingPanel::DrawingPanel(int _width, int _height) :
systemBlueShift = 11; systemBlueShift = 11;
RGB_LOW_BITS_MASK = 0x01010100; RGB_LOW_BITS_MASK = 0x01010100;
#endif #endif
} else {
// plugins expect RGB in native byte order
systemRedShift = 10;
systemGreenShift = 5;
systemBlueShift = 0;
RGB_LOW_BITS_MASK = 0x0421;
}
// FIXME: should be "true" for GBA carts if lcd mode selected // FIXME: should be "true" for GBA carts if lcd mode selected
// which means this needs to be re-run at pref change time // which means this needs to be re-run at pref change time
utilUpdateSystemColorMaps(false); utilUpdateSystemColorMaps(false);