Previous 199869 Revisions Next

r20590 Monday 28th January, 2013 at 22:01:06 UTC by Ryan Holtz
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
[src/osd/windows]d3dhlsl.c input.c

trunk/src/emu/inpttype.h
r20589r20590
644644   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_SHOW_PROFILER,    "Show Profiler",          input_seq(KEYCODE_F11, KEYCODE_LSHIFT) )
645645   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_TOGGLE_UI,        "UI Toggle",              input_seq(KEYCODE_SCRLOCK, input_seq::not_code, KEYCODE_LSHIFT) )
646646   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_PASTE,            "UI Paste Text",          input_seq(KEYCODE_SCRLOCK, KEYCODE_LSHIFT) )
647   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_TOGGLE_DEBUG,     "Toggle Debugger",        input_seq(KEYCODE_F5) )
647   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 )
648648   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_SAVE_STATE,       "Save State",             input_seq(KEYCODE_F7, KEYCODE_LSHIFT) )
649649   INPUT_PORT_DIGITAL_TYPE( 0, UI,      UI_LOAD_STATE,       "Load State",             input_seq(KEYCODE_F7, input_seq::not_code, KEYCODE_LSHIFT) )
650650
trunk/src/osd/windows/d3dhlsl.c
r20589r20590
500500   {
501501      if (!initialized)
502502      {
503         bool success = create_resources(false);
504         master_enable = (success ? !master_enable : false);
503         master_enable = !master_enable;
504         bool failed = create_resources(false);
505         if (failed)
506         {
507            master_enable = false;
508         }
505509      }
506510      else
507511      {
r20589r20590
10591063
10601064int hlsl_info::create_resources(bool reset)
10611065{
1062   initialized = false;
1063
10641066   if (!master_enable || !d3dintf->post_fx_available)
10651067      return 0;
10661068
1067   initialized = true;
1068
10691069   d3d_info *d3d = (d3d_info *)window->drawdata;
10701070
10711071    HRESULT result = (*d3dintf->device.get_render_target)(d3d->device, 0, &backbuffer);
r20589r20590
13041304   if (yiq_decode_name)
13051305      osd_free(yiq_decode_name);
13061306
1307   initialized = true;
1308
13071309   return 0;
13081310}
13091311
trunk/src/osd/windows/input.c
r20589r20590
791791         // ctrl-alt-F12 to toggle post-processing
792792         case IPT_OSD_4:
793793            entry->configure_osd("POST_PROCESS", "Toggle Post-Processing");
794            entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_LCONTROL, KEYCODE_F12);
794            entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_LCONTROL, KEYCODE_F5);
795795            break;
796796
797797         // leave everything else alone

Previous 199869 Revisions Next

© 1997-2024 The MAME Team