Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Ryan Holtz 2013-01-28 22:01:06 +00:00
parent 30c2ab155e
commit b9002b3e8a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/inpttype.h
View File

@ -644,7 +644,7 @@ void construct_core_types(simple_list<input_type_entry> &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_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_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_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_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) ) INPUT_PORT_DIGITAL_TYPE( 0, UI, UI_LOAD_STATE, "Load State", input_seq(KEYCODE_F7, input_seq::not_code, KEYCODE_LSHIFT) )

14
src/osd/windows/d3dhlsl.c
View File

@ -500,8 +500,12 @@ void hlsl_info::toggle()
{ {
if (!initialized) if (!initialized)
{ {
bool success = create_resources(false); master_enable = !master_enable;
master_enable = (success ? !master_enable : false); bool failed = create_resources(false);
if (failed)
{
master_enable = false;
}
} }
else else
{ {
@ -1059,13 +1063,9 @@ void hlsl_info::init_fsfx_quad(void *vertbuf)
int hlsl_info::create_resources(bool reset) int hlsl_info::create_resources(bool reset)
{ {
initialized = false;
if (!master_enable || !d3dintf->post_fx_available) if (!master_enable || !d3dintf->post_fx_available)
return 0; return 0;
initialized = true;
d3d_info *d3d = (d3d_info *)window->drawdata; d3d_info *d3d = (d3d_info *)window->drawdata;
HRESULT result = (*d3dintf->device.get_render_target)(d3d->device, 0, &backbuffer); 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) if (yiq_decode_name)
osd_free(yiq_decode_name); osd_free(yiq_decode_name);
initialized = true;
return 0; return 0;
} }

2
src/osd/windows/input.c
View File

@ -791,7 +791,7 @@ void windows_osd_interface::customize_input_type_list(simple_list<input_type_ent
// ctrl-alt-F12 to toggle post-processing // ctrl-alt-F12 to toggle post-processing
case IPT_OSD_4: case IPT_OSD_4:
entry->configure_osd("POST_PROCESS", "Toggle Post-Processing"); entry->configure_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; break;
// leave everything else alone // leave everything else alone