From be14994ab48122410dbdfbeeff40e31f539fccbd Mon Sep 17 00:00:00 2001 From: "Westley M. Martinez" Date: Fri, 16 Dec 2016 16:32:25 -0800 Subject: Update presets for new persistence shaders. --- ini/presets/gameboy.ini | 2 +- ini/presets/gba.ini | 2 +- ini/presets/lcd-matrix.ini | 2 +- ini/presets/lcd.ini | 2 +- ini/presets/raster.ini | 4 +++- ini/presets/vector-mono.ini | 3 ++- ini/presets/vector.ini | 4 +++- 7 files changed, 12 insertions(+), 7 deletions(-) (limited to 'ini/presets') diff --git a/ini/presets/gameboy.ini b/ini/presets/gameboy.ini index 088af358ee1..a95ef2a453c 100644 --- a/ini/presets/gameboy.ini +++ b/ini/presets/gameboy.ini @@ -31,7 +31,7 @@ offset 0.0,0.10,0.05 scale 0.9,0.8,1.0 power 1.4,1.2,1.8 floor 0.0,0.0,0.0 -phosphor_life 0.65,0.65,0.65 +lcd_persistence 0.04 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/gba.ini b/ini/presets/gba.ini index d895acafd6c..c39a627099e 100644 --- a/ini/presets/gba.ini +++ b/ini/presets/gba.ini @@ -31,7 +31,7 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_life 0.5,0.5,0.5 +lcd_persistence 0.03,0.03,0.03 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/lcd-matrix.ini b/ini/presets/lcd-matrix.ini index 7c97229d9f4..7728e1cf281 100644 --- a/ini/presets/lcd-matrix.ini +++ b/ini/presets/lcd-matrix.ini @@ -31,7 +31,7 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_life 0.5,0.5,0.5 +lcd_persistence 0.03,0.03,0.03 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/lcd.ini b/ini/presets/lcd.ini index d895acafd6c..c39a627099e 100644 --- a/ini/presets/lcd.ini +++ b/ini/presets/lcd.ini @@ -31,7 +31,7 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_life 0.5,0.5,0.5 +lcd_persistence 0.03,0.03,0.03 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/raster.ini b/ini/presets/raster.ini index 8f852cf5a10..8f141e875fc 100644 --- a/ini/presets/raster.ini +++ b/ini/presets/raster.ini @@ -37,7 +37,9 @@ offset -0.30,-0.20,-0.05 scale 1.15,1.05,0.90 power 0.90,0.90,1.15 floor 0.025,0.025,0.025 -phosphor_life 0.25,0.25,0.25 +phosphor_mode 2 +phosphor_beta 1.8,1.8,1.8 +phosphor_gamma 50,50,50 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector-mono.ini b/ini/presets/vector-mono.ini index 00ff7978f5d..33e4c3096f3 100644 --- a/ini/presets/vector-mono.ini +++ b/ini/presets/vector-mono.ini @@ -37,7 +37,8 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_life 0.5,0.5,0.5 +phosphor_mode 1 +phosphor_tau 0.026,0.026,0.026 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector.ini b/ini/presets/vector.ini index ea41036f3e5..1748476c385 100644 --- a/ini/presets/vector.ini +++ b/ini/presets/vector.ini @@ -40,7 +40,9 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_life 0.5,0.5,0.5 +phosphor_mode 2 +phosphor_beta 1.8,1.8,1.8 +phosphor_gamma 50,50,50 # # NTSC POST-PROCESSING OPTIONS -- cgit v1.2.3 From c7cc38199abb28e4983ecd940825f5bf930702ad Mon Sep 17 00:00:00 2001 From: "Westley M. Martinez" Date: Fri, 30 Dec 2016 16:24:31 -0800 Subject: Tweak phosphor parameter scaling, update presets. --- ini/presets/raster.ini | 4 ++-- ini/presets/vector-mono.ini | 5 +++-- ini/presets/vector.ini | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'ini/presets') diff --git a/ini/presets/raster.ini b/ini/presets/raster.ini index 8f141e875fc..702f071060b 100644 --- a/ini/presets/raster.ini +++ b/ini/presets/raster.ini @@ -38,8 +38,8 @@ scale 1.15,1.05,0.90 power 0.90,0.90,1.15 floor 0.025,0.025,0.025 phosphor_mode 2 -phosphor_beta 1.8,1.8,1.8 -phosphor_gamma 50,50,50 +phosphor_time 0.050,0.005,0.005 +phosphor_beta 1.0,0.5,0.5 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector-mono.ini b/ini/presets/vector-mono.ini index 33e4c3096f3..1886785c0bd 100644 --- a/ini/presets/vector-mono.ini +++ b/ini/presets/vector-mono.ini @@ -37,8 +37,9 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -phosphor_mode 1 -phosphor_tau 0.026,0.026,0.026 +phosphor_mode 2 +phosphor_time 0.05,0.05,0.05 +phosphor_beta 1.0,1.0,1.0 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector.ini b/ini/presets/vector.ini index 1748476c385..c1b57de84a9 100644 --- a/ini/presets/vector.ini +++ b/ini/presets/vector.ini @@ -41,8 +41,8 @@ scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 phosphor_mode 2 -phosphor_beta 1.8,1.8,1.8 -phosphor_gamma 50,50,50 +phosphor_time 0.050,0.005,0.005 +phosphor_beta 1.0,0.5,0.5 # # NTSC POST-PROCESSING OPTIONS -- cgit v1.2.3 From 91172125deac5dd200225daa48039010be4e0eab Mon Sep 17 00:00:00 2001 From: "Westley M. Martinez" Date: Mon, 2 Jan 2017 15:42:33 -0800 Subject: Add LCD ghosting shader for Direct3D hlsl/ghosting.fx: Add LCD ghosting shader hlsl/phosphor.fx: Remove LCD logic ini/presets/gameboy.ini, ini/presets/gba.ini, ini/presets/lcd-matrix.ini, ini/presets/lcd.ini, ini/presets/raster.ini, ini/presets/vector.ini: Update presets src/osd/modules/render/d3d/d3dhlsl.cpp, src/osd/modules/render/d3d/d3dhlsl.h: Add LCD shader and sliders. Allow sliders to be adjusted for R, G, and B components. src/osd/windows/winmain.cpp, src/osd/windows/winmain.h: Add LCD ghosting options.# Please enter the commit message for your changes. Lines starting --- ini/presets/gameboy.ini | 3 ++- ini/presets/gba.ini | 3 ++- ini/presets/lcd-matrix.ini | 3 ++- ini/presets/lcd.ini | 3 ++- ini/presets/raster.ini | 4 ++-- ini/presets/vector.ini | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'ini/presets') diff --git a/ini/presets/gameboy.ini b/ini/presets/gameboy.ini index a95ef2a453c..3ac98f98ee0 100644 --- a/ini/presets/gameboy.ini +++ b/ini/presets/gameboy.ini @@ -31,7 +31,8 @@ offset 0.0,0.10,0.05 scale 0.9,0.8,1.0 power 1.4,1.2,1.8 floor 0.0,0.0,0.0 -lcd_persistence 0.04 +lcd_rise_time 0.25,0.25,0.25 +lcd_fall_time 0.1,0.1,0.1 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/gba.ini b/ini/presets/gba.ini index c39a627099e..1be2a736d4e 100644 --- a/ini/presets/gba.ini +++ b/ini/presets/gba.ini @@ -31,7 +31,8 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -lcd_persistence 0.03,0.03,0.03 +lcd_rise_time 0.05,0.05,0.05 +lcd_fall_time 0.1,0.1,0.1 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/lcd-matrix.ini b/ini/presets/lcd-matrix.ini index 7728e1cf281..7103ae5bc8f 100644 --- a/ini/presets/lcd-matrix.ini +++ b/ini/presets/lcd-matrix.ini @@ -31,7 +31,8 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -lcd_persistence 0.03,0.03,0.03 +lcd_rise_time 0.25,0.25,0.25 +lcd_fall_time 0.1,0.1,0.1 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/lcd.ini b/ini/presets/lcd.ini index c39a627099e..1be2a736d4e 100644 --- a/ini/presets/lcd.ini +++ b/ini/presets/lcd.ini @@ -31,7 +31,8 @@ offset 0.0,0.0,0.0 scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 -lcd_persistence 0.03,0.03,0.03 +lcd_rise_time 0.05,0.05,0.05 +lcd_fall_time 0.1,0.1,0.1 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/raster.ini b/ini/presets/raster.ini index 702f071060b..c566fbe15ff 100644 --- a/ini/presets/raster.ini +++ b/ini/presets/raster.ini @@ -38,8 +38,8 @@ scale 1.15,1.05,0.90 power 0.90,0.90,1.15 floor 0.025,0.025,0.025 phosphor_mode 2 -phosphor_time 0.050,0.005,0.005 -phosphor_beta 1.0,0.5,0.5 +phosphor_time 0.050,0.018,0.018 +phosphor_beta 1.0,0.7,0.7 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector.ini b/ini/presets/vector.ini index c1b57de84a9..c2d41cf5cb6 100644 --- a/ini/presets/vector.ini +++ b/ini/presets/vector.ini @@ -41,8 +41,8 @@ scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 phosphor_mode 2 -phosphor_time 0.050,0.005,0.005 -phosphor_beta 1.0,0.5,0.5 +phosphor_time 0.050,0.018,0.018 +phosphor_beta 1.0,0.7,0.7 # # NTSC POST-PROCESSING OPTIONS -- cgit v1.2.3 From 2b95c8e50bbfa22320ca8ddd04d3d94052a5c4ed Mon Sep 17 00:00:00 2001 From: "Westley M. Martinez" Date: Wed, 4 Jan 2017 17:44:46 -0800 Subject: Change cached texture format to floating point. hlsl/phosphor.fx: Remove hacks ini/presets/raster.ini, ini/presets/vector-mono.ini, ini/presets/vector.ini: Tweak presets src/osd/modules/render/d3d/d3dcomm.h, src/osd/modules/render/d3d/d3dhlsl.cpp, src/osd/modules/render/drawd3d.cpp: Change cache texture format to floating point for precise for phosphor and ghosting shaders. --- ini/presets/raster.ini | 4 ++-- ini/presets/vector-mono.ini | 2 +- ini/presets/vector.ini | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ini/presets') diff --git a/ini/presets/raster.ini b/ini/presets/raster.ini index c566fbe15ff..6d3edf3889f 100644 --- a/ini/presets/raster.ini +++ b/ini/presets/raster.ini @@ -38,8 +38,8 @@ scale 1.15,1.05,0.90 power 0.90,0.90,1.15 floor 0.025,0.025,0.025 phosphor_mode 2 -phosphor_time 0.050,0.018,0.018 -phosphor_beta 1.0,0.7,0.7 +phosphor_time 0.005,0.050,0.050 +phosphor_beta 1.0,1.0,1.0 # # NTSC POST-PROCESSING OPTIONS diff --git a/ini/presets/vector-mono.ini b/ini/presets/vector-mono.ini index 1886785c0bd..2778bc69d7a 100644 --- a/ini/presets/vector-mono.ini +++ b/ini/presets/vector-mono.ini @@ -38,7 +38,7 @@ scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 phosphor_mode 2 -phosphor_time 0.05,0.05,0.05 +phosphor_time 0.01,0.01,0.01 phosphor_beta 1.0,1.0,1.0 # diff --git a/ini/presets/vector.ini b/ini/presets/vector.ini index c2d41cf5cb6..7f1c887919e 100644 --- a/ini/presets/vector.ini +++ b/ini/presets/vector.ini @@ -41,8 +41,8 @@ scale 1.0,1.0,1.0 power 1.0,1.0,1.0 floor 0.0,0.0,0.0 phosphor_mode 2 -phosphor_time 0.050,0.018,0.018 -phosphor_beta 1.0,0.7,0.7 +phosphor_time 0.005,0.050,0.050 +phosphor_beta 1.0,1.0,1.0 # # NTSC POST-PROCESSING OPTIONS -- cgit v1.2.3