From 6be086cf7ef6d7481c4d926d3ddcf2c7c74b0b5e Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Tue, 2 Sep 2014 02:08:13 +0000 Subject: [PATCH] SDL: remove dead code from SDL2 renderer, fix laserdisc crash with SDL2 -video accel rendering. [R. Belmont] --- src/osd/sdl/draw13.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/osd/sdl/draw13.c b/src/osd/sdl/draw13.c index b0ff9d134bf..028c357a284 100644 --- a/src/osd/sdl/draw13.c +++ b/src/osd/sdl/draw13.c @@ -206,7 +206,7 @@ static copy_info blit_info_default[] = ENTRY(YUY16, YUY2, 2, 0, yuv16_yuy2), ENTRY(YUY16, YVYU, 2, 0, yuv16_yvyu), ENTRY(YUY16, ARGB8888, 4, 0, yuv16_argb32), - ENTRY(YUY16, RGB888, 4, 0, yuv16pal_argb32), + ENTRY(YUY16, RGB888, 4, 0, yuv16_argb32), ENTRY(YUY16_PALETTED, UYVY, 2, 0, yuv16pal_uyvy), ENTRY(YUY16_PALETTED, YUY2, 2, 0, yuv16pal_yuy2), @@ -265,25 +265,6 @@ static copy_info blit_info_default[] = { -1 }, }; -static copy_info blit_info_16bpp[] = -{ - /* no rotation */ - ENTRY(PALETTE16, RGB555, 2, 0, pal16_argb1555), - ENTRY(PALETTE16, ARGB1555, 2, 0, pal16_argb1555), - - ENTRY(RGB15_PALETTED, RGB555, 2, 0, rgb15pal_argb1555), - ENTRY(RGB15_PALETTED, ARGB1555, 2, 0, rgb15pal_argb1555), - - /* rotation */ - ENTRY(PALETTE16, RGB555, 2, 1, rot_pal16_argb1555), - ENTRY(PALETTE16, ARGB1555, 2, 1, rot_pal16_argb1555), - - ENTRY(RGB15_PALETTED, RGB555, 2, 1, rot_rgb15pal_argb1555), - ENTRY(RGB15_PALETTED, ARGB1555, 2, 1, rot_rgb15pal_argb1555), - -{ -1 }, -}; - static copy_info *blit_info[SDL_TEXFORMAT_LAST+1]; static struct @@ -497,12 +478,8 @@ int drawsdl2_init(running_machine &machine, sdl_draw_info *callbacks) osd_printf_verbose("Using SDL native texturing driver (SDL 2.0+)\n"); expand_copy_info(blit_info_default); - //FIXME: -opengl16 should be -opengl -prefer16bpp - //if (video_config.prefer16bpp_tex) - expand_copy_info(blit_info_16bpp); // Load the GL library now - else MT will fail - stemp = downcast(machine.options()).gl_lib(); if (stemp != NULL && strcmp(stemp, SDLOPTVAL_AUTO) == 0) stemp = NULL;