libretro/gambatte-libretro
1
0
Fork 0
mirror of https://github.com/libretro/gambatte-libretro.git synced 2024-11-23 07:49:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move extensions to video to video_libretro.cpp

Browse Source
This commit is contained in:
twinaphex 2015-02-18 04:02:04 +01:00
parent 12987757f9
commit 09bf141072
3 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libgambatte/Makefile.common
View File

@ -10,6 +10,7 @@ SOURCES_CXX := $(CORE_DIR)/cpu.cpp \
$(CORE_DIR)/statesaver.cpp \
$(CORE_DIR)/tima.cpp \
$(CORE_DIR)/video.cpp \
$(CORE_DIR)/video_libretro.cpp \
$(CORE_DIR)/file/file.cpp \
$(CORE_DIR)/mem/cartridge.cpp \
$(CORE_DIR)/mem/cartridge_libretro.cpp \

36
libgambatte/src/video.cpp
View File

@ -23,7 +23,6 @@
namespace gambatte
{
void LCD::setDmgPalette(video_pixel_t *const palette, const video_pixel_t *const dmgColors, const unsigned data)
{
palette[0] = dmgColors[data & 3];
@ -32,41 +31,6 @@ namespace gambatte
palette[3] = dmgColors[data >> 6 & 3];
}
video_pixel_t LCD::gbcToRgb32(const unsigned bgr15)
{
if (colorCorrection)
{
#ifdef VIDEO_RGB565
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return (((r * 13 + g * 2 + b + 8) << 7) & 0xF800) | ((g * 3 + b + 1) >> 1) << 5 | ((r * 3 + g * 2 + b * 11 + 8) >> 4);
#else
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return ((r * 13 + g * 2 + b) >> 1) << 16 | (g * 3 + b) << 9 | (r * 3 + g * 2 + b * 11) >> 1;
#endif
}
else
{
#ifdef VIDEO_RGB565
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return r<<11 | g<<6 | b;
#else
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return r<<16 | g<<8 | b;
#endif
}
}
void LCD::setColorCorrection(bool colorCorrection_)
{

63
libgambatte/src/video_libretro.cpp Normal file
View File

@ -0,0 +1,63 @@
/***************************************************************************
* Copyright (C) 2007 by Sindre Aamås *
* aamas@stud.ntnu.no *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License version 2 as *
* published by the Free Software Foundation. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License version 2 for more details. *
* *
* You should have received a copy of the GNU General Public License *
* version 2 along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "video.h"
#include "savestate.h"
#include <cstring>
#include <algorithm>
namespace gambatte
{
video_pixel_t LCD::gbcToRgb32(const unsigned bgr15)
{
if (colorCorrection)
{
#ifdef VIDEO_RGB565
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return (((r * 13 + g * 2 + b + 8) << 7) & 0xF800) | ((g * 3 + b + 1) >> 1) << 5 | ((r * 3 + g * 2 + b * 11 + 8) >> 4);
#else
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return ((r * 13 + g * 2 + b) >> 1) << 16 | (g * 3 + b) << 9 | (r * 3 + g * 2 + b * 11) >> 1;
#endif
}
else
{
#ifdef VIDEO_RGB565
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return r<<11 | g<<6 | b;
#else
const unsigned r = bgr15 & 0x1F;
const unsigned g = bgr15 >> 5 & 0x1F;
const unsigned b = bgr15 >> 10 & 0x1F;
return r<<16 | g<<8 | b;
#endif
}
}
}