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

Fix colormaps and stuff.

This commit is contained in:
Themaister 2011-03-07 19:56:40 +01:00
parent f94dc125e5
commit 1cf9381cb0
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
driver.c
View File

@ -220,6 +220,7 @@ static void init_filter(void)
if (*g_settings.video.filter_path == '\0') if (*g_settings.video.filter_path == '\0')
return; return;
SSNES_LOG("Loading bSNES filter from \"%s\"\n", g_settings.video.filter_path);
g_extern.filter.lib = dylib_load(g_settings.video.filter_path); g_extern.filter.lib = dylib_load(g_settings.video.filter_path);
if (!g_extern.filter.lib) if (!g_extern.filter.lib)
{ {
@ -227,8 +228,8 @@ static void init_filter(void)
return; return;
} }
g_extern.filter.psize = dylib_proc(g_extern.filter.lib, "video_size"); g_extern.filter.psize = dylib_proc(g_extern.filter.lib, "filter_size");
g_extern.filter.prender = dylib_proc(g_extern.filter.lib, "video_render"); g_extern.filter.prender = dylib_proc(g_extern.filter.lib, "filter_render");
if (!g_extern.filter.psize || !g_extern.filter.prender) if (!g_extern.filter.psize || !g_extern.filter.prender)
{ {
SSNES_ERR("Failed to find functions in filter...\n"); SSNES_ERR("Failed to find functions in filter...\n");
@ -255,7 +256,7 @@ static void init_filter(void)
g_extern.filter.colormap = malloc(32768 * sizeof(uint32_t)); g_extern.filter.colormap = malloc(32768 * sizeof(uint32_t));
assert(g_extern.filter.colormap); assert(g_extern.filter.colormap);
// TODO: Taken from bSNES source. WTF does this do? // Set up conversion map from 16-bit XBGR1555 to 32-bit RGBA.
for (int i = 0; i < 32768; i++) for (int i = 0; i < 32768; i++)
{ {
unsigned r = (i >> 10) & 31; unsigned r = (i >> 10) & 31;
@ -265,7 +266,7 @@ static void init_filter(void)
r = (r << 3) | (r >> 2); r = (r << 3) | (r >> 2);
g = (g << 3) | (g >> 2); g = (g << 3) | (g >> 2);
b = (b << 3) | (b >> 2); b = (b << 3) | (b >> 2);
g_extern.filter.colormap[i] = (r << 16) | (g << 8) | (b << 0); g_extern.filter.colormap[i] = (r << 24) | (g << 16) | (b << 8);
} }
} }
#endif #endif
@ -345,6 +346,8 @@ void uninit_video_input(void)
if ( driver.input_data != driver.video_data && driver.input ) if ( driver.input_data != driver.video_data && driver.input )
driver.input->free(driver.input_data); driver.input->free(driver.input_data);
deinit_filter();
} }
driver_t driver; driver_t driver;

8
dynamic.c
View File

@ -192,10 +192,14 @@ dylib_t dylib_load(const char *path)
void* dylib_proc(dylib_t lib, const char *proc) void* dylib_proc(dylib_t lib, const char *proc)
{ {
#ifdef _WIN32 #ifdef _WIN32
return GetProcAddress(lib, proc); void *sym = (void*)GetProcAddress(lib, proc);
#else #else
return dlsym(lib, proc); void *sym = dlsym(lib, proc);
#endif #endif
if (!sym)
SSNES_WARN("Failed to load symbol \"%s\"\n", proc);
return sym;
} }
void dylib_close(dylib_t lib) void dylib_close(dylib_t lib)

3
ssnes.c
View File

@ -104,9 +104,8 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height)
unsigned owidth = width; unsigned owidth = width;
unsigned oheight = height; unsigned oheight = height;
g_extern.filter.psize(&owidth, &oheight); g_extern.filter.psize(&owidth, &oheight);
g_extern.filter.prender(g_extern.filter.colormap, g_extern.filter.buffer, g_extern.filter.prender(g_extern.filter.colormap, g_extern.filter.buffer,
g_extern.filter.pitch >> 2, data, (height == 448 || height == 478) ? 512 : 1024, width, height); g_extern.filter.pitch, data, (height == 448 || height == 478) ? 1024 : 2048, width, height);
if (!driver.video->frame(driver.video_data, g_extern.filter.buffer, owidth, oheight, g_extern.filter.pitch, msg)) if (!driver.video->frame(driver.video_data, g_extern.filter.buffer, owidth, oheight, g_extern.filter.pitch, msg))
g_extern.video_active = false; g_extern.video_active = false;
} }