From b9002b3e8a8becad04d9ad5bedcd69744757c20d Mon Sep 17 00:00:00 2001 From: Ryan Holtz Date: Mon, 28 Jan 2013 22:01:06 +0000 Subject: [PATCH] Fix HLSL toggle and move it to Ctrl+Alt+F5. Next time someone touches the HLSL code without knowing what they're doing, I remove it entirely. (nw) --- src/emu/inpttype.h | 2 +- src/osd/windows/d3dhlsl.c | 14 ++++++++------ src/osd/windows/input.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h index 9b383536aba..2da91b8e501 100644 --- a/src/emu/inpttype.h +++ b/src/emu/inpttype.h @@ -644,7 +644,7 @@ void construct_core_types(simple_list &typelist) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_SHOW_PROFILER, "Show Profiler", input_seq(KEYCODE_F11, KEYCODE_LSHIFT) ) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_TOGGLE_UI, "UI Toggle", input_seq(KEYCODE_SCRLOCK, input_seq::not_code, KEYCODE_LSHIFT) ) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_PASTE, "UI Paste Text", input_seq(KEYCODE_SCRLOCK, KEYCODE_LSHIFT) ) - INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_TOGGLE_DEBUG, "Toggle Debugger", input_seq(KEYCODE_F5) ) + INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_TOGGLE_DEBUG, "Toggle Debugger", input_seq(KEYCODE_F5), input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LALT ) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_SAVE_STATE, "Save State", input_seq(KEYCODE_F7, KEYCODE_LSHIFT) ) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_LOAD_STATE, "Load State", input_seq(KEYCODE_F7, input_seq::not_code, KEYCODE_LSHIFT) ) diff --git a/src/osd/windows/d3dhlsl.c b/src/osd/windows/d3dhlsl.c index a69f7922c26..06f9894a026 100644 --- a/src/osd/windows/d3dhlsl.c +++ b/src/osd/windows/d3dhlsl.c @@ -500,8 +500,12 @@ void hlsl_info::toggle() { if (!initialized) { - bool success = create_resources(false); - master_enable = (success ? !master_enable : false); + master_enable = !master_enable; + bool failed = create_resources(false); + if (failed) + { + master_enable = false; + } } else { @@ -1059,13 +1063,9 @@ void hlsl_info::init_fsfx_quad(void *vertbuf) int hlsl_info::create_resources(bool reset) { - initialized = false; - if (!master_enable || !d3dintf->post_fx_available) return 0; - initialized = true; - d3d_info *d3d = (d3d_info *)window->drawdata; HRESULT result = (*d3dintf->device.get_render_target)(d3d->device, 0, &backbuffer); @@ -1304,6 +1304,8 @@ int hlsl_info::create_resources(bool reset) if (yiq_decode_name) osd_free(yiq_decode_name); + initialized = true; + return 0; } diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index 88529bb663f..36aad03a087 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -791,7 +791,7 @@ void windows_osd_interface::customize_input_type_list(simple_listconfigure_osd("POST_PROCESS", "Toggle Post-Processing"); - entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_LCONTROL, KEYCODE_F12); + entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_LCONTROL, KEYCODE_F5); break; // leave everything else alone