Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2024-06-22 22:22:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fixed build errors

Browse source
This commit is contained in:
Sour 2022-08-13 17:00:40 -04:00
parent 68b399fb0b
commit 14a266d518
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Core/Debugger/PpuTools.h
View file

@ -5,8 +5,6 @@
#include "Shared/Emulator.h"
class Debugger;
struct GbPpuState;
struct SnesPpuState;
struct ViewerRefreshConfig
{
@ -184,6 +182,17 @@ protected:
bool IsTileHidden(MemoryType memType, uint32_t addr, GetTileViewOptions& options);
uint8_t Rgb555to8Bit(uint8_t color) { return (color << 3) + (color >> 2); }
uint32_t Rgb555ToArgb(uint16_t rgb555)
{
uint8_t b = Rgb555to8Bit(rgb555 >> 10);
uint8_t g = Rgb555to8Bit((rgb555 >> 5) & 0x1F);
uint8_t r = Rgb555to8Bit(rgb555 & 0x1F);
return 0xFF000000 | (r << 16) | (g << 8) | b;
}
public:
PpuTools(Debugger* debugger, Emulator *emu);
@ -221,7 +230,7 @@ template<TileFormat format> uint32_t PpuTools::GetRgbPixelColor(const uint32_t*
{
switch(format) {
case TileFormat::DirectColor:
return SnesDefaultVideoFilter::ToArgb(
return Rgb555ToArgb(
((((colorIndex & 0x07) << 1) | (palette & 0x01)) << 1) |
(((colorIndex & 0x38) | ((palette & 0x02) << 1)) << 4) |
(((colorIndex & 0xC0) | ((palette & 0x04) << 3)) << 7)
@ -241,7 +250,7 @@ template<TileFormat format> uint32_t PpuTools::GetRgbPixelColor(const uint32_t*
return colors[colorIndex];
case TileFormat::Mode7DirectColor:
return SnesDefaultVideoFilter::ToArgb(((colorIndex & 0x07) << 2) | ((colorIndex & 0x38) << 4) | ((colorIndex & 0xC0) << 7));
return Rgb555ToArgb(((colorIndex & 0x07) << 2) | ((colorIndex & 0x38) << 4) | ((colorIndex & 0xC0) << 7));
default:
throw std::runtime_error("unsupported format");

1
Core/Gameboy/Debugger/GbPpuTools.h
View file

@ -4,6 +4,7 @@
class Debugger;
class Emulator;
struct GbPpuState;
class GbPpuTools final : public PpuTools
{

1
Core/SNES/Debugger/SnesPpuTools.h
View file

@ -7,6 +7,7 @@ class Emulator;
struct BaseState;
struct LayerConfig;
struct FrameInfo;
struct SnesPpuState;
struct SnesPpuToolsState
{

1
NuGet.Config
View file

@ -4,5 +4,6 @@
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-nightly/index.json" />
<add key="DockAvaloniaCI" value="https://www.myget.org/F/dock-nightly/api/v2" />
<add key="AvaloniaAll" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
</packageSources>
</configuration>