diff options
author | 2013-01-28 22:01:06 +0000 | |
---|---|---|
committer | 2013-01-28 22:01:06 +0000 | |
commit | b9002b3e8a8becad04d9ad5bedcd69744757c20d (patch) | |
tree | 439688b2d16512c0a05638b6f82ff109119a5456 /src/osd/windows/d3dhlsl.c | |
parent | 30c2ab155ed696c794f708bfd4d39c62b425e4c6 (diff) |
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)
Diffstat (limited to 'src/osd/windows/d3dhlsl.c')
-rw-r--r-- | src/osd/windows/d3dhlsl.c | 14 |
1 files changed, 8 insertions, 6 deletions
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; } |