From 78f6ff34a5d8839a88c8cf36703cf8afc67139a4 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 24 Jan 2021 13:33:07 +1100 Subject: srcclean in preparation for branching release --- hash/ibm5150.xml | 2 +- hash/wscolor.xml | 168 ++++++------- hash/wswan.xml | 34 +-- plugins/data/data_hiscore.lua | 2 +- plugins/data/data_history.lua | 4 +- src/devices/bus/abcbus/db4106.h | 2 +- src/devices/bus/abcbus/db4107.h | 2 +- src/devices/bus/abcbus/db4112.h | 2 +- src/devices/bus/abcbus/lux4105.cpp | 12 +- src/devices/bus/wswan/rom.cpp | 80 +++--- src/devices/cpu/arm7/arm7.cpp | 2 +- src/devices/cpu/arm7/cecalls.hxx | 2 +- src/devices/cpu/v30mz/v30mz.cpp | 10 +- src/devices/machine/m950x0.cpp | 28 +-- src/devices/machine/m950x0.h | 34 +-- src/devices/machine/sa1110.cpp | 18 +- src/devices/machine/sa1110.h | 276 ++++++++++----------- src/devices/machine/sa1111.cpp | 2 +- src/devices/machine/sa1111.h | 124 ++++----- src/devices/machine/swim1.cpp | 2 +- src/devices/machine/swim2.cpp | 6 +- src/devices/machine/swim2.h | 4 +- src/devices/sound/uda1344.cpp | 16 +- src/devices/sound/uda1344.h | 72 +++--- src/devices/video/sed1356.cpp | 8 +- src/lib/formats/flopimg.cpp | 8 +- src/lib/formats/flopimg.h | 4 +- src/mame/audio/cmi01a.cpp | 4 +- src/mame/audio/wswan.cpp | 2 +- src/mame/drivers/abc1600.cpp | 6 +- src/mame/drivers/bfm_sc4.cpp | 8 +- src/mame/drivers/design.cpp | 10 +- src/mame/drivers/dim68k.cpp | 36 +-- src/mame/drivers/fortecar.cpp | 10 +- src/mame/drivers/funworld.cpp | 90 +++---- src/mame/drivers/galaxian.cpp | 2 +- src/mame/drivers/getaway.cpp | 4 +- src/mame/drivers/jornada.cpp | 16 +- src/mame/drivers/jpmimpct.cpp | 14 +- src/mame/drivers/jpmimpctsw.cpp | 64 ++--- src/mame/drivers/jpmsys5.cpp | 4 +- src/mame/drivers/kaneko16.cpp | 8 +- src/mame/drivers/kingpin.cpp | 4 +- src/mame/drivers/ksys573.cpp | 48 ++-- src/mame/drivers/maygay1b.cpp | 4 +- src/mame/drivers/model3.cpp | 12 +- src/mame/drivers/rtpc.cpp | 2 +- src/mame/drivers/tabe22.cpp | 18 +- src/mame/includes/jpmimpct.h | 2 +- src/mame/layout/j5fairp.lay | 2 +- src/mame/layout/j5popeye.lay | 2 +- src/mame/layout/j6roller10.lay | 2 +- src/mame/layout/j6roller15.lay | 2 +- src/mame/layout/j6roller8.lay | 2 +- src/mame/layout/jpmimpct.lay | 12 +- src/mame/layout/jpmsys5.lay | 14 +- src/mame/machine/k573mcr.cpp | 28 +-- src/osd/eigccarm.h | 1 + .../bgfx/shaders/chains/blurs/fs_smart-blur.sc | 4 +- .../bgfx/shaders/chains/blurs/vs_smart-blur.sc | 2 +- .../shaders/chains/crt-geom/fs_crt-geom-deluxe.sc | 10 +- .../bgfx/shaders/chains/crt-geom/fs_crt-geom.sc | 10 +- .../bgfx/shaders/chains/crt-geom/fs_gaussx.sc | 2 +- .../bgfx/shaders/chains/crt-geom/fs_gaussy.sc | 2 +- .../shaders/chains/crt-geom/fs_phosphor_apply.sc | 2 +- .../bgfx/shaders/chains/crt-geom/varying.def.sc | 2 +- .../bgfx/shaders/chains/crt/vs_crt-caligari.sc | 4 +- .../render/bgfx/shaders/chains/eagle/fs_eagle.sc | 16 +- .../render/bgfx/shaders/chains/eagle/vs_eagle.sc | 4 +- .../bgfx/shaders/chains/hlsl/fs_distortion.sc | 2 +- .../bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc | 6 +- .../bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc | 4 +- .../render/bgfx/shaders/chains/hqx/fs_hq2x.sc | 2 +- .../render/bgfx/shaders/chains/hqx/fs_hq3x.sc | 2 +- .../render/bgfx/shaders/chains/hqx/fs_hq4x.sc | 2 +- .../render/bgfx/shaders/chains/hqx/vs_hq2x.sc | 2 +- .../render/bgfx/shaders/chains/hqx/vs_hq3x.sc | 2 +- .../render/bgfx/shaders/chains/hqx/vs_hq4x.sc | 2 +- .../chains/misc/fs_bob-and-ghost-deinterlace.sc | 6 +- .../shaders/chains/misc/fs_deposterize-pass0.sc | 2 +- .../shaders/chains/misc/fs_deposterize-pass1.sc | 2 +- .../shaders/chains/misc/vs_deposterize-pass0.sc | 4 +- .../shaders/chains/misc/vs_deposterize-pass1.sc | 4 +- .../pillarbox_left_horizontal/fs_gaussian.sc | 2 +- .../chains/pillarbox_left_vertical/fs_gaussian.sc | 2 +- .../pillarbox_right_horizontal/fs_gaussian.sc | 2 +- .../chains/pillarbox_right_vertical/fs_gaussian.sc | 2 +- .../chains/warp/fs_dilation-horizontal-fast.sc | 4 +- .../chains/warp/vs_dilation-horizontal-fast.sc | 8 +- .../bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc | 4 +- .../bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc | 10 +- .../bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc | 10 +- .../bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc | 6 +- .../render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc | 10 +- .../bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc | 10 +- .../render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc | 8 +- .../xbr/super-xbr/fs_custom-jinc2-sharper.sc | 8 +- .../chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc | 6 +- .../chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc | 6 +- .../chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc | 6 +- .../chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc | 6 +- .../chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc | 6 +- .../xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc | 6 +- .../chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc | 6 +- .../chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc | 6 +- .../xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc | 6 +- .../xbr/super-xbr/fs_super-xbr-fast-pass0.sc | 8 +- .../xbr/super-xbr/fs_super-xbr-fast-pass1.sc | 8 +- .../xbr/super-xbr/fs_super-xbr-fast-pass2.sc | 8 +- .../chains/xbr/super-xbr/fs_super-xbr-pass0.sc | 6 +- .../chains/xbr/super-xbr/fs_super-xbr-pass1.sc | 8 +- .../chains/xbr/super-xbr/fs_super-xbr-pass2.sc | 8 +- .../chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc | 4 +- .../xbr/super-xbr/vs_super-xbr-fast-pass0.sc | 4 +- .../xbr/super-xbr/vs_super-xbr-fast-pass1.sc | 4 +- .../xbr/super-xbr/vs_super-xbr-fast-pass2.sc | 4 +- .../chains/xbr/super-xbr/vs_super-xbr-pass0.sc | 4 +- .../chains/xbr/super-xbr/vs_super-xbr-pass1.sc | 4 +- .../chains/xbr/super-xbr/vs_super-xbr-pass2.sc | 4 +- .../chains/xbr/super-xbr/vs_super-xbr-pass3.sc | 4 +- .../bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc | 2 +- .../bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc | 2 +- .../render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc | 2 +- .../chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc | 8 +- .../xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc | 6 +- .../chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc | 6 +- .../xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc | 8 +- .../chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc | 8 +- .../chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc | 8 +- .../xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc | 8 +- .../chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc | 10 +- .../chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc | 4 +- .../xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc | 4 +- .../chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc | 4 +- .../xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc | 4 +- .../chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc | 4 +- .../chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc | 4 +- .../xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc | 4 +- .../chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc | 4 +- .../xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc | 4 +- .../xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc | 4 +- .../xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc | 12 +- .../xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc | 4 +- .../xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc | 8 +- .../xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc | 6 +- .../xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc | 6 +- .../xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc | 10 +- .../xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc | 2 +- .../xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc | 2 +- .../xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc | 2 +- .../xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc | 2 +- .../xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc | 2 +- .../xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc | 2 +- .../xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc | 2 +- .../xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc | 2 +- .../xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc | 4 +- .../xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc | 8 +- .../xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc | 2 +- .../xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc | 2 +- .../xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc | 8 +- .../xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc | 6 +- .../xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc | 4 +- .../xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc | 8 +- .../xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc | 2 +- .../xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc | 2 +- .../xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc | 2 +- .../xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc | 2 +- src/osd/modules/render/bgfx/shaders/fs_screen.sc | 2 +- 168 files changed, 949 insertions(+), 948 deletions(-) diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml index 68293292fe9..7db90084652 100644 --- a/hash/ibm5150.xml +++ b/hash/ibm5150.xml @@ -13949,7 +13949,7 @@ has been replaced with an all-zero block. --> - + Wings of Fury diff --git a/hash/wscolor.xml b/hash/wscolor.xml index 46f7ae7e20f..c3a43936d65 100644 --- a/hash/wscolor.xml +++ b/hash/wscolor.xml @@ -100,27 +100,27 @@ See the wswan software list for the full game list. @@ -327,27 +327,27 @@ See the wswan software list for the full game list. @@ -1484,27 +1484,27 @@ See the wswan software list for the full game list. @@ -1923,27 +1923,27 @@ See the wswan software list for the full game list. diff --git a/hash/wswan.xml b/hash/wswan.xml index dda6bcf55bb..932bb4e0b2e 100644 --- a/hash/wswan.xml +++ b/hash/wswan.xml @@ -742,23 +742,23 @@ The GIZA chip used on a lot of cartridges is a sram voltage switch. diff --git a/plugins/data/data_hiscore.lua b/plugins/data/data_hiscore.lua index db3569fa46e..3bf5467fe9e 100644 --- a/plugins/data/data_hiscore.lua +++ b/plugins/data/data_hiscore.lua @@ -5,7 +5,7 @@ local dat = {} local env = {} local output local curset -local path = emu.subst_env(mame_manager.ui.options.entries.historypath:value():gsub("([^;]+)", "%1/hi2txt")) +local path = emu.subst_env(mame_manager.ui.options.entries.historypath:value():gsub("([^;]+)", "%1/hi2txt")) local htmlentites = { ["amp"] = "&", ["quot"] = utf8.char(34), diff --git a/plugins/data/data_history.lua b/plugins/data/data_history.lua index c5f79875254..fbc6e2048bf 100644 --- a/plugins/data/data_history.lua +++ b/plugins/data/data_history.lua @@ -7,7 +7,7 @@ local function init() local filepath local dbver local fh - + for path in mame_manager.ui.options.entries.historypath:value():gmatch("([^;]+)") do filepath = emu.subst_env(path) .. "/" .. file fh = io.open(filepath, "r") @@ -29,7 +29,7 @@ local function init() end stmt:finalize() - + local stmt = db.prepare("SELECT version FROM version WHERE datfile = ?") db.check("reading history version") stmt:bind_values(file) diff --git a/src/devices/bus/abcbus/db4106.h b/src/devices/bus/abcbus/db4106.h index 3c2e5f0c6b7..74e49631dbe 100644 --- a/src/devices/bus/abcbus/db4106.h +++ b/src/devices/bus/abcbus/db4106.h @@ -23,7 +23,7 @@ // ======================> databoard_4106_device class databoard_4106_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/devices/bus/abcbus/db4107.h b/src/devices/bus/abcbus/db4107.h index 0a69a6c95a9..4ae301084ca 100644 --- a/src/devices/bus/abcbus/db4107.h +++ b/src/devices/bus/abcbus/db4107.h @@ -24,7 +24,7 @@ // ======================> databoard_4107_device class databoard_4107_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/devices/bus/abcbus/db4112.h b/src/devices/bus/abcbus/db4112.h index f98e125e790..c28da004297 100644 --- a/src/devices/bus/abcbus/db4112.h +++ b/src/devices/bus/abcbus/db4112.h @@ -23,7 +23,7 @@ // ======================> abc_databoard_4112_device class abc_databoard_4112_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index f803eec26db..a90dc4d630d 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -43,12 +43,12 @@ Notes: - sector length error in read check after format (breakpoint @ 97ba) - 0C xx INITIALIZE DRIVE CHARACTERISTICS - 01 00 00 00 00 02 RECALIBRATE - 04 00 00 00 05 02 FORMAT UNIT - 08 00 00 00 11 02 READ - ...transfer 8704 (17*512) bytes... - error + 0C xx INITIALIZE DRIVE CHARACTERISTICS + 01 00 00 00 00 02 RECALIBRATE + 04 00 00 00 05 02 FORMAT UNIT + 08 00 00 00 11 02 READ + ...transfer 8704 (17*512) bytes... + error */ diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index 9b1501c885f..034ec926dc4 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -453,20 +453,20 @@ void ws_rom_eeprom_device::write_io(offs_t offset, u16 data, u16 mem_mask) { case 0x06 / 2: /* EEPROM address lower bits port/EEPROM address and command port - 1KBit EEPROM: - Bit 0-5 - EEPROM address bit 1-6 - Bit 6-7 - Command - 00 - Extended command address bit 4-5: - 00 - Write disable - 01 - Write all - 10 - Erase all - 11 - Write enable - 01 - Write - 10 - Read - 11 - Erase - 16KBit EEPROM: - Bit 0-7 - EEPROM address bit 1-8 - */ + 1KBit EEPROM: + Bit 0-5 - EEPROM address bit 1-6 + Bit 6-7 - Command + 00 - Extended command address bit 4-5: + 00 - Write disable + 01 - Write all + 10 - Erase all + 11 - Write enable + 01 - Write + 10 - Read + 11 - Erase + 16KBit EEPROM: + Bit 0-7 - EEPROM address bit 1-8 + */ if (ACCESSING_BITS_0_7) { switch (m_eeprom_mode) @@ -489,23 +489,23 @@ void ws_rom_eeprom_device::write_io(offs_t offset, u16 data, u16 mem_mask) } } /* EEPROM higher bits/command bits port - 1KBit EEPROM: - Bit 0 - Start - Bit 1-7 - Unknown - 16KBit EEPROM: - Bit 0-1 - EEPROM address bit 9-10 - Bit 2-3 - Command - 00 - Extended command address bit 0-1: - 00 - Write disable - 01 - Write all - 10 - Erase all - 11 - Write enable - 01 - Write - 10 - Read - 11 - Erase - Bit 4 - Start - Bit 5-7 - Unknown - */ + 1KBit EEPROM: + Bit 0 - Start + Bit 1-7 - Unknown + 16KBit EEPROM: + Bit 0-1 - EEPROM address bit 9-10 + Bit 2-3 - Command + 00 - Extended command address bit 0-1: + 00 - Write disable + 01 - Write all + 10 - Erase all + 11 - Write enable + 01 - Write + 10 - Read + 11 - Erase + Bit 4 - Start + Bit 5-7 - Unknown + */ if (ACCESSING_BITS_8_15) { switch (m_eeprom_mode) @@ -539,14 +539,14 @@ void ws_rom_eeprom_device::write_io(offs_t offset, u16 data, u16 mem_mask) case 0x08 / 2: /* EEPROM command - Bit 0 - Read complete (read only) - Bit 1 - Write complete (read only) - Bit 2-3 - Unknown - Bit 4 - Read - Bit 5 - Write - Bit 6 - Protect - Bit 7 - Initialize - */ + Bit 0 - Read complete (read only) + Bit 1 - Write complete (read only) + Bit 2-3 - Unknown + Bit 4 - Read + Bit 5 - Write + Bit 6 - Protect + Bit 7 - Initialize + */ if (ACCESSING_BITS_0_7) { if (data & 0x80) // Initialize @@ -686,7 +686,7 @@ void ws_wwitch_device::write_ram(offs_t offset, u16 data, u16 mem_mask) m_flash_mode = COMMAND_MODE; } break; - case 0x80: // Erase (chip or block) + case 0x80: // Erase (chip or block) m_flash_command = data; break; default: // Unknown command diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 5acf84dc2e2..45ef964463f 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -49,7 +49,7 @@ TODO: #include "logmacro.h" #define PRINT_HAPYFSH2 (0) -#define PRINT_CE_KERNEL (0) +#define PRINT_CE_KERNEL (0) /* prototypes of coprocessor functions */ void arm7_dt_r_callback(arm_state *arm, uint32_t insn, uint32_t *prn, uint32_t (*read32)(arm_state *arm, uint32_t addr)); diff --git a/src/devices/cpu/arm7/cecalls.hxx b/src/devices/cpu/arm7/cecalls.hxx index 0b65cc9dc55..839ae5633b2 100644 --- a/src/devices/cpu/arm7/cecalls.hxx +++ b/src/devices/cpu/arm7/cecalls.hxx @@ -3,7 +3,7 @@ /***************************************************************************** * * cecalls.hxx - * + * * Addresses of certain Windows CE kernel calls, for use in debugging * the bring-up of ARM-based Windows CE systems, e.g. Jornada 7xx. * diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp index 2042932b1eb..8e106bd563c 100644 --- a/src/devices/cpu/v30mz/v30mz.cpp +++ b/src/devices/cpu/v30mz/v30mz.cpp @@ -12,10 +12,10 @@ Todo! - Double check cycle timing is 100%. - - Add penalties when BW, BP, SP, IX, IY etc are changed in the immediately - preceding instruction. - - wswan mjkiwame (at 0x40141) has rep in al,$b5 (f3 e4 b5). Should this - repeat the in instruction or is this a bug made by the programmer? + - Add penalties when BW, BP, SP, IX, IY etc are changed in the immediately + preceding instruction. + - wswan mjkiwame (at 0x40141) has rep in al,$b5 (f3 e4 b5). Should this + repeat the in instruction or is this a bug made by the programmer? ****************************************************************************/ @@ -2382,7 +2382,7 @@ void v30mz_cpu_device::execute_run() case 0x20: and_word(); store_ea_rm_word(m_dst); break; case 0x28: sub_word(); store_ea_rm_word(m_dst); break; case 0x30: xor_word(); store_ea_rm_word(m_dst); break; - case 0x38: sub_word(); break; // CMP + case 0x38: sub_word(); break; // CMP } break; diff --git a/src/devices/machine/m950x0.cpp b/src/devices/machine/m950x0.cpp index ce85c48a9b6..9d42166804c 100644 --- a/src/devices/machine/m950x0.cpp +++ b/src/devices/machine/m950x0.cpp @@ -4,30 +4,30 @@ m950x0.cpp - STmicro M95010/20/40 SPI-bus EEPROM + STmicro M95010/20/40 SPI-bus EEPROM - Common characteristics: - - 16-byte page size - - Write protection selectable in quarter, half, or full sizes + Common characteristics: + - 16-byte page size + - Write protection selectable in quarter, half, or full sizes - Part variants with a -DF designation have additional support for an - identification page, which is not currently emulated. + Part variants with a -DF designation have additional support for an + identification page, which is not currently emulated. - Sizes: - M95010 - 1kbit - M95020 - 2kbit - M95040 - 4kbit, slightly altered instructions for 9th address bit + Sizes: + M95010 - 1kbit + M95020 - 2kbit + M95040 - 4kbit, slightly altered instructions for 9th address bit - Current issues: - - Implementation currently operates in a parallel manner, rather than - serial. + Current issues: + - Implementation currently operates in a parallel manner, rather than + serial. ***************************************************************************/ #include "emu.h" #include "m950x0.h" -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(M95010, m95010_device, "m95010", "STmicro M95010 1kbit SPI EEPROM") diff --git a/src/devices/machine/m950x0.h b/src/devices/machine/m950x0.h index c7becdbce74..0eceb6fab21 100644 --- a/src/devices/machine/m950x0.h +++ b/src/devices/machine/m950x0.h @@ -4,7 +4,7 @@ m950x0.h - STmicro M95010/20/40 SPI-bus EEPROM + STmicro M95010/20/40 SPI-bus EEPROM ***************************************************************************/ @@ -46,21 +46,21 @@ protected: enum : uint8_t { - INSN_WRSR0 = 0x01, - INSN_WRITE0 = 0x02, - INSN_READ0 = 0x03, - INSN_WRDI0 = 0x04, - INSN_RDSR0 = 0x05, - INSN_WREN0 = 0x06, - - INSN_WRSR1 = 0x09, - INSN_WRITE1 = 0x0a, - INSN_READ1 = 0x0b, - INSN_WRDI1 = 0x0c, - INSN_RDSR1 = 0x0d, - INSN_WREN1 = 0x0e, - - STATUS_WEL_BIT = 1 + INSN_WRSR0 = 0x01, + INSN_WRITE0 = 0x02, + INSN_READ0 = 0x03, + INSN_WRDI0 = 0x04, + INSN_RDSR0 = 0x05, + INSN_WREN0 = 0x06, + + INSN_WRSR1 = 0x09, + INSN_WRITE1 = 0x0a, + INSN_READ1 = 0x0b, + INSN_WRDI1 = 0x0c, + INSN_RDSR1 = 0x0d, + INSN_WREN1 = 0x0e, + + STATUS_WEL_BIT = 1 }; const bool m_check_a8; @@ -94,4 +94,4 @@ DECLARE_DEVICE_TYPE(M95010, m95010_device) DECLARE_DEVICE_TYPE(M95020, m95020_device) DECLARE_DEVICE_TYPE(M95040, m95040_device) -#endif // MAME_MACHINE_M950X0_H \ No newline at end of file +#endif // MAME_MACHINE_M950X0_H diff --git a/src/devices/machine/sa1110.cpp b/src/devices/machine/sa1110.cpp index 480f9998131..86e17a10d4f 100644 --- a/src/devices/machine/sa1110.cpp +++ b/src/devices/machine/sa1110.cpp @@ -10,7 +10,7 @@ #include "sa1110.h" #define LOG_UNKNOWN (1 << 1) -#define LOG_ICP (1 << 2) +#define LOG_ICP (1 << 2) #define LOG_UART3 (1 << 3) #define LOG_UART3_HF (1 << 4) #define LOG_MCP (1 << 5) @@ -18,16 +18,16 @@ #define LOG_OSTIMER (1 << 7) #define LOG_OSTIMER_HF (1 << 8) #define LOG_RTC (1 << 9) -#define LOG_RTC_HF (1 << 10) +#define LOG_RTC_HF (1 << 10) #define LOG_POWER (1 << 11) -#define LOG_POWER_HF (1 << 12) +#define LOG_POWER_HF (1 << 12) #define LOG_RESET (1 << 13) #define LOG_GPIO (1 << 14) #define LOG_GPIO_HF (1 << 15) #define LOG_INTC (1 << 16) -#define LOG_PPC (1 << 17) -#define LOG_DMA (1 << 18) -#define LOG_UDC (1 << 19) +#define LOG_PPC (1 << 17) +#define LOG_DMA (1 << 18) +#define LOG_UDC (1 << 19) #define LOG_ALL (LOG_UNKNOWN | LOG_ICP | LOG_UART3 | LOG_MCP | LOG_OSTIMER | LOG_RTC | LOG_POWER | LOG_RESET | LOG_GPIO | LOG_INTC | LOG_PPC | LOG_DMA | LOG_UDC) #define VERBOSE (0) @@ -297,7 +297,7 @@ void sa1110_periphs_device::icp_w(offs_t offset, uint32_t data, uint32_t mem_mas //parity_t parity = PARITY_NONE; //if (BIT(data, 0)) //{ - // parity = (BIT(data, 1) ? PARITY_EVEN : PARITY_ODD); + // parity = (BIT(data, 1) ? PARITY_EVEN : PARITY_ODD); //} //set_data_frame(1, BIT(data, 3) ? 8 : 7, parity, stop_bits); @@ -314,7 +314,7 @@ void sa1110_periphs_device::icp_w(offs_t offset, uint32_t data, uint32_t mem_mas //const uint8_t old = m_uart_regs.utcr[1] & 0x0f; COMBINE_DATA(&m_icp_regs.uart.utcr[1]); //if ((m_uart_regs.utcr[1] & 0x0f) != old) - // icp_uart_recalculate_divisor(); + // icp_uart_recalculate_divisor(); break; } case REG_UTCR2: @@ -324,7 +324,7 @@ void sa1110_periphs_device::icp_w(offs_t offset, uint32_t data, uint32_t mem_mas //const uint8_t old = m_uart_regs.utcr[2] & 0xff; COMBINE_DATA(&m_icp_regs.uart.utcr[2]); //if ((m_uart_regs.utcr[2] & 0xff) != old) - // icp_uart_recalculate_divisor(); + // icp_uart_recalculate_divisor(); break; } case REG_UTCR3: diff --git a/src/devices/machine/sa1110.h b/src/devices/machine/sa1110.h index 7693e09dfa3..3ef8e79042b 100644 --- a/src/devices/machine/sa1110.h +++ b/src/devices/machine/sa1110.h @@ -156,26 +156,26 @@ protected: // register offsets enum { - UDC_BASE_ADDR = 0x80000000, - REG_UDCCR = (0x00000000 >> 2), - REG_UDCAR = (0x00000004 >> 2), - REG_UDCOMP = (0x00000008 >> 2), - REG_UDCIMP = (0x0000000c >> 2), - REG_UDCCS0 = (0x00000010 >> 2), - REG_UDCCS1 = (0x00000014 >> 2), - REG_UDCCS2 = (0x00000018 >> 2), - REG_UDCD0 = (0x0000001c >> 2), - REG_UDCWC = (0x00000020 >> 2), - REG_UDCDR = (0x00000028 >> 2), - REG_UDCSR = (0x00000030 >> 2), - - ICP_BASE_ADDR = 0x80030000, - REG_UTCR4 = (0x00000010 >> 2), - REG_HSCR0 = (0x00000060 >> 2), - REG_HSCR1 = (0x00000064 >> 2), - REG_HSDR = (0x0000006c >> 2), - REG_HSSR0 = (0x00000074 >> 2), - REG_HSSR1 = (0x00000078 >> 2), + UDC_BASE_ADDR = 0x80000000, + REG_UDCCR = (0x00000000 >> 2), + REG_UDCAR = (0x00000004 >> 2), + REG_UDCOMP = (0x00000008 >> 2), + REG_UDCIMP = (0x0000000c >> 2), + REG_UDCCS0 = (0x00000010 >> 2), + REG_UDCCS1 = (0x00000014 >> 2), + REG_UDCCS2 = (0x00000018 >> 2), + REG_UDCD0 = (0x0000001c >> 2), + REG_UDCWC = (0x00000020 >> 2), + REG_UDCDR = (0x00000028 >> 2), + REG_UDCSR = (0x00000030 >> 2), + + ICP_BASE_ADDR = 0x80030000, + REG_UTCR4 = (0x00000010 >> 2), + REG_HSCR0 = (0x00000060 >> 2), + REG_HSCR1 = (0x00000064 >> 2), + REG_HSDR = (0x0000006c >> 2), + REG_HSSR0 = (0x00000074 >> 2), + REG_HSSR1 = (0x00000078 >> 2), UART_BASE_ADDR = 0x80050000, REG_UTCR0 = (0x00000000 >> 2), @@ -247,73 +247,73 @@ protected: REG_ICFP = (0x00000010 >> 2), REG_ICPR = (0x00000020 >> 2), - PPC_BASE_ADDR = 0x90060000, - REG_PPDR = (0x00000000 >> 2), - REG_PPSR = (0x00000004 >> 2), - REG_PPAR = (0x00000008 >> 2), - REG_PSDR = (0x0000000c >> 2), - REG_PPFR = (0x00000010 >> 2), - - DMA_BASE_ADDR = 0xb0000000, - REG_DDAR = (0x00000000 >> 2), - REG_DSSR = (0x00000004 >> 2), - REG_DCSR = (0x00000008 >> 2), - REG_DSR = (0x0000000c >> 2), - REG_DBSA = (0x00000010 >> 2), - REG_DBTA = (0x00000014 >> 2), - REG_DBSB = (0x00000018 >> 2), - REG_DBTB = (0x0000001c >> 2) + PPC_BASE_ADDR = 0x90060000, + REG_PPDR = (0x00000000 >> 2), + REG_PPSR = (0x00000004 >> 2), + REG_PPAR = (0x00000008 >> 2), + REG_PSDR = (0x0000000c >> 2), + REG_PPFR = (0x00000010 >> 2), + + DMA_BASE_ADDR = 0xb0000000, + REG_DDAR = (0x00000000 >> 2), + REG_DSSR = (0x00000004 >> 2), + REG_DCSR = (0x00000008 >> 2), + REG_DSR = (0x0000000c >> 2), + REG_DBSA = (0x00000010 >> 2), + REG_DBTA = (0x00000014 >> 2), + REG_DBSB = (0x00000018 >> 2), + REG_DBTB = (0x0000001c >> 2) }; // register contents enum : uint32_t { - UDCCR_UDD_BIT = 0, - UDCCR_UDA_BIT = 1, - UDCCR_RESM_BIT = 2, - UDCCR_EIM_BIT = 3, - UDCCR_RIM_BIT = 4, - UDCCR_TIM_BIT = 5, - UDCCR_SUSM_BIT = 6, - UDCCR_WRITE_MASK = 0x7d, - - UDCAR_WRITE_MASK = 0x7f, - - UDCOMP_WRITE_MASK = 0xff, - - UDCIMP_WRITE_MASK = 0xff, - - UDCCS0_OPR_BIT = 0, - UDCCS0_IPR_BIT = 1, - UDCCS0_SST_BIT = 2, - UDCCS0_FST_BIT = 3, - UDCCS0_DE_BIT = 4, - UDCCS0_SE_BIT = 5, - UDCCS0_SO_BIT = 6, - UDCCS0_SSE_BIT = 7, - - UDCCS1_RFS_BIT = 0, - UDCCS1_RPC_BIT = 1, - UDCCS1_RPE_BIT = 2, - UDCCS1_SST_BIT = 3, - UDCCS1_FST_BIT = 4, - UDCCS1_RNE_BIT = 5, - - UDCCS2_TFS_BIT = 0, - UDCCS2_TPC_BIT = 1, - UDCCS2_TPE_BIT = 2, - UDCCS2_TUR_BIT = 3, - UDCCS2_SST_BIT = 4, - UDCCS2_FST_BIT = 5, - - UDCWC_WRITE_MASK = 0x0f, - - UDCSR_EIR_BIT = 0, - UDCSR_RIR_BIT = 1, - UDCSR_TIR_BIT = 2, - UDCSR_SUSIR_BIT = 3, - UDCSR_RESIR_BIT = 4, - UDCSR_RSTIR_BIT = 5, + UDCCR_UDD_BIT = 0, + UDCCR_UDA_BIT = 1, + UDCCR_RESM_BIT = 2, + UDCCR_EIM_BIT = 3, + UDCCR_RIM_BIT = 4, + UDCCR_TIM_BIT = 5, + UDCCR_SUSM_BIT = 6, + UDCCR_WRITE_MASK = 0x7d, + + UDCAR_WRITE_MASK = 0x7f, + + UDCOMP_WRITE_MASK = 0xff, + + UDCIMP_WRITE_MASK = 0xff, + + UDCCS0_OPR_BIT = 0, + UDCCS0_IPR_BIT = 1, + UDCCS0_SST_BIT = 2, + UDCCS0_FST_BIT = 3, + UDCCS0_DE_BIT = 4, + UDCCS0_SE_BIT = 5, + UDCCS0_SO_BIT = 6, + UDCCS0_SSE_BIT = 7, + + UDCCS1_RFS_BIT = 0, + UDCCS1_RPC_BIT = 1, + UDCCS1_RPE_BIT = 2, + UDCCS1_SST_BIT = 3, + UDCCS1_FST_BIT = 4, + UDCCS1_RNE_BIT = 5, + + UDCCS2_TFS_BIT = 0, + UDCCS2_TPC_BIT = 1, + UDCCS2_TPE_BIT = 2, + UDCCS2_TUR_BIT = 3, + UDCCS2_SST_BIT = 4, + UDCCS2_FST_BIT = 5, + + UDCWC_WRITE_MASK = 0x0f, + + UDCSR_EIR_BIT = 0, + UDCSR_RIR_BIT = 1, + UDCSR_TIR_BIT = 2, + UDCSR_SUSIR_BIT = 3, + UDCSR_RESIR_BIT = 4, + UDCSR_RSTIR_BIT = 5, UART3_FIFO_PRE = 8, UART3_FIFO_FRE = 9, @@ -326,8 +326,8 @@ protected: UTCR3_TIE_BIT = 4, UTCR3_LBM_BIT = 5, - UTCR4_HSE_BIT = 0, - UTCR4_LPM_BIT = 1, + UTCR4_HSE_BIT = 0, + UTCR4_LPM_BIT = 1, UTSR0_TFS_BIT = 0, UTSR0_RFS_BIT = 1, @@ -343,36 +343,36 @@ protected: UTSR1_FRE_BIT = 4, UTSR1_ROR_BIT = 5, - HSCR0_ITR_BIT = 0, - HSCR0_LBM_BIT = 1, - HSCR0_TUS_BIT = 2, - HSCR0_TXE_BIT = 3, - HSCR0_RXE_BIT = 4, - HSCR0_RIE_BIT = 5, - HSCR0_TIE_BIT = 6, - HSCR0_AME_BIT = 7, - - HSCR2_TXP_BIT = 18, - HSCR2_RXP_BIT = 19, - - HSDR_EOF_BIT = 8, - HSDR_CRE_BIT = 9, - HSDR_ROR_BIT = 10, - - HSSR0_EIF_BIT = 0, - HSSR0_TUR_BIT = 1, - HSSR0_RAB_BIT = 2, - HSSR0_TFS_BIT = 3, - HSSR0_RFS_BIT = 4, - HSSR0_FRE_BIT = 5, - - HSSR1_RSY_BIT = 0, - HSSR1_TBY_BIT = 1, - HSSR1_RNE_BIT = 2, - HSSR1_TNF_BIT = 3, - HSSR1_EOF_BIT = 4, - HSSR1_CRE_BIT = 5, - HSSR1_ROR_BIT = 6, + HSCR0_ITR_BIT = 0, + HSCR0_LBM_BIT = 1, + HSCR0_TUS_BIT = 2, + HSCR0_TXE_BIT = 3, + HSCR0_RXE_BIT = 4, + HSCR0_RIE_BIT = 5, + HSCR0_TIE_BIT = 6, + HSCR0_AME_BIT = 7, + + HSCR2_TXP_BIT = 18, + HSCR2_RXP_BIT = 19, + + HSDR_EOF_BIT = 8, + HSDR_CRE_BIT = 9, + HSDR_ROR_BIT = 10, + + HSSR0_EIF_BIT = 0, + HSSR0_TUR_BIT = 1, + HSSR0_RAB_BIT = 2, + HSSR0_TFS_BIT = 3, + HSSR0_RFS_BIT = 4, + HSSR0_FRE_BIT = 5, + + HSSR1_RSY_BIT = 0, + HSSR1_TBY_BIT = 1, + HSSR1_RNE_BIT = 2, + HSSR1_TNF_BIT = 3, + HSSR1_EOF_BIT = 4, + HSSR1_CRE_BIT = 5, + HSSR1_ROR_BIT = 6, MCCR0_ASD_BIT = 0, MCCR0_ASD_MASK = 0x0000007f, @@ -443,25 +443,25 @@ protected: RTSR_HZE_BIT = 3, RTSR_HZE_MASK = (1 << RTSR_HZE_BIT), - DDAR_RW_BIT = 0, - DDAR_E_BIT = 1, - DDAR_BS_BIT = 2, - DDAR_DW_BIT = 3, - DDAR_DA0_BIT = 4, - DDAR_DA0_MASK = 0x000000f0, - DDAR_DA8_BIT = 8, - DDAR_DA8_MASK = 0xffffff00, - - DSR_RUN_BIT = 0, - DSR_IE_BIT = 1, - DSR_ERROR_BIT = 2, - DSR_DONEA_BIT = 3, - DSR_STRTA_BIT = 4, - DSR_DONEB_BIT = 5, - DSR_STRTB_BIT = 6, - DSR_BIU_BIT = 7, - - DBT_MASK = 0x00001fff + DDAR_RW_BIT = 0, + DDAR_E_BIT = 1, + DDAR_BS_BIT = 2, + DDAR_DW_BIT = 3, + DDAR_DA0_BIT = 4, + DDAR_DA0_MASK = 0x000000f0, + DDAR_DA8_BIT = 8, + DDAR_DA8_MASK = 0xffffff00, + + DSR_RUN_BIT = 0, + DSR_IE_BIT = 1, + DSR_ERROR_BIT = 2, + DSR_DONEA_BIT = 3, + DSR_STRTA_BIT = 4, + DSR_DONEB_BIT = 5, + DSR_STRTB_BIT = 6, + DSR_BIU_BIT = 7, + + DBT_MASK = 0x00001fff }; // interrupt bits @@ -715,9 +715,9 @@ protected: uint32_t dbt[2]; }; - udc_regs m_udc_regs; + udc_regs m_udc_regs; uart_regs m_uart_regs; - icp_regs m_icp_regs; + icp_regs m_icp_regs; mcp_regs m_mcp_regs; ssp_regs m_ssp_regs; ostimer_regs m_ostmr_regs; @@ -726,9 +726,9 @@ protected: uint32_t m_rcsr; gpio_regs m_gpio_regs; intc_regs m_intc_regs; - ppc_regs m_ppc_regs; - dma_regs m_dma_regs[6]; - uint8_t m_dma_active_mask; + ppc_regs m_ppc_regs; + dma_regs m_dma_regs[6]; + uint8_t m_dma_active_mask; required_device m_maincpu; required_device m_uart3_irqs; diff --git a/src/devices/machine/sa1111.cpp b/src/devices/machine/sa1111.cpp index 4fbd5545355..e58d8250187 100644 --- a/src/devices/machine/sa1111.cpp +++ b/src/devices/machine/sa1111.cpp @@ -21,7 +21,7 @@ #define LOG_GPIO (1 << 10) #define LOG_INTC (1 << 11) #define LOG_CARD (1 << 12) -#define LOG_AUDIO_DMA (1 << 13) +#define LOG_AUDIO_DMA (1 << 13) #define LOG_ALL (LOG_UNKNOWN | LOG_SBI | LOG_SK | LOG_USB | LOG_AUDIO | LOG_SSP | LOG_TRACK | LOG_MOUSE | LOG_GPIO | LOG_INTC | LOG_CARD) #define VERBOSE (0) diff --git a/src/devices/machine/sa1111.h b/src/devices/machine/sa1111.h index 1524900be20..3804c06a30c 100644 --- a/src/devices/machine/sa1111.h +++ b/src/devices/machine/sa1111.h @@ -346,19 +346,19 @@ protected: SASCR_RDD_BIT = 17, SASCR_STO_BIT = 18, - SASR_TNF_BIT = 0, - SASR_RNE_BIT = 1, - SASR_BSY_BIT = 2, - SASR_TFS_BIT = 3, - SASR_RFS_BIT = 4, - SASR_TUR_BIT = 5, - SASR_ROR_BIT = 6, - SASR_TFL_BIT = 8, + SASR_TNF_BIT = 0, + SASR_RNE_BIT = 1, + SASR_BSY_BIT = 2, + SASR_TFS_BIT = 3, + SASR_RFS_BIT = 4, + SASR_TUR_BIT = 5, + SASR_ROR_BIT = 6, + SASR_TFL_BIT = 8, SASR_TFL_MASK = 0x00000f00, SASR_RFL_BIT = 12, SASR_RFL_MASK = 0x0000f000, - SASR_SEND_BIT = 16, - SASR_RECV_BIT = 17, + SASR_SEND_BIT = 16, + SASR_RECV_BIT = 17, SASR0_L3WD_BIT = 16, SASR0_L3RD_BIT = 17, @@ -376,14 +376,14 @@ protected: SADTCS_TDSTA_BIT = 4, SADTCS_TDBDB_BIT = 5, SADTCS_TDSTB_BIT = 6, - SADTCS_TBIU_BIT = 7, + SADTCS_TBIU_BIT = 7, SADRCS_RDEN_BIT = 0, SADRCS_RDBDA_BIT = 3, SADRCS_RDSTA_BIT = 4, SADRCS_RDBDB_BIT = 5, SADRCS_RDSTB_BIT = 6, - SADRCS_RBIU_BIT = 7, + SADRCS_RBIU_BIT = 7, SAITR_TFS_BIT = 0, SAITR_RFS_BIT = 1, @@ -480,56 +480,56 @@ protected: // interrupt lines enum : uint32_t { - INT_GPA0 = 0, - INT_GPA1 = 1, - INT_GPA2 = 2, - INT_GPA3 = 3, - INT_GPB0 = 4, - INT_GPB1 = 5, - INT_GPB2 = 6, - INT_GPB3 = 7, - INT_GPB4 = 8, - INT_GPB5 = 9, - INT_GPC0 = 10, - INT_GPC1 = 11, - INT_GPC2 = 12, - INT_GPC3 = 13, - INT_GPC4 = 14, - INT_GPC5 = 15, - INT_GPC6 = 16, - INT_GPC7 = 17, - INT_MSTX = 18, - INT_MSRX = 19, - INT_MSERR = 20, - INT_TPTX = 21, - INT_TPRX = 22, - INT_TPERR = 23, - INT_SSPTX = 24, - INT_SSPRX = 25, - INT_SSPROR = 26, - INT_AUDTXA = 32, - INT_AUDRXA = 33, - INT_AUDTXB = 34, - INT_AUDRXB = 35, - INT_AUDTFS = 36, - INT_AUDRFS = 37, - INT_AUDTUR = 38, - INT_AUDROR = 39, - INT_AUDDTS = 40, - INT_AUDRDD = 41, - INT_AUDSTO = 42, - INT_USBPWR = 43, - INT_USBHCIM = 44, - INT_USBHCIBUF = 45, - INT_USBHCIWAKE = 46, - INT_USBHCIMFC = 47, - INT_USBRESUME = 48, - INT_S0RDY = 49, - INT_S1RDY = 50, - INT_S0CD = 51, - INT_S1CD = 52, - INT_S0BVD = 53, - INT_S1BVD = 54 + INT_GPA0 = 0, + INT_GPA1 = 1, + INT_GPA2 = 2, + INT_GPA3 = 3, + INT_GPB0 = 4, + INT_GPB1 = 5, + INT_GPB2 = 6, + INT_GPB3 = 7, + INT_GPB4 = 8, + INT_GPB5 = 9, + INT_GPC0 = 10, + INT_GPC1 = 11, + INT_GPC2 = 12, + INT_GPC3 = 13, + INT_GPC4 = 14, + INT_GPC5 = 15, + INT_GPC6 = 16, + INT_GPC7 = 17, + INT_MSTX = 18, + INT_MSRX = 19, + INT_MSERR = 20, + INT_TPTX = 21, + INT_TPRX = 22, + INT_TPERR = 23, + INT_SSPTX = 24, + INT_SSPRX = 25, + INT_SSPROR = 26, + INT_AUDTXA = 32, + INT_AUDRXA = 33, + INT_AUDTXB = 34, + INT_AUDRXB = 35, + INT_AUDTFS = 36, + INT_AUDRFS = 37, + INT_AUDTUR = 38, + INT_AUDROR = 39, + INT_AUDDTS = 40, + INT_AUDRDD = 41, + INT_AUDSTO = 42, + INT_USBPWR = 43, + INT_USBHCIM = 44, + INT_USBHCIBUF = 45, + INT_USBHCIWAKE = 46, + INT_USBHCIMFC = 47, + INT_USBRESUME = 48, + INT_S0RDY = 49, + INT_S1RDY = 50, + INT_S0CD = 51, + INT_S1CD = 52, + INT_S0BVD = 53, + INT_S1BVD = 54 }; struct sbi_regs diff --git a/src/devices/machine/swim1.cpp b/src/devices/machine/swim1.cpp index 331c25f62aa..9c49fd94dad 100644 --- a/src/devices/machine/swim1.cpp +++ b/src/devices/machine/swim1.cpp @@ -160,7 +160,7 @@ u8 swim1_device::ism_read(offs_t offset) return m_ism_mode; default: - // logerror("read %s\n", names[offset & 7]); + // logerror("read %s\n", names[offset & 7]); break; } return 0xff; diff --git a/src/devices/machine/swim2.cpp b/src/devices/machine/swim2.cpp index 582a97a58b2..9e504c0d7f9 100644 --- a/src/devices/machine/swim2.cpp +++ b/src/devices/machine/swim2.cpp @@ -231,7 +231,7 @@ void swim2_device::write(offs_t offset, u8 data) if(fifo_push(M_CRC) && !m_error) m_error |= 0x04; break; - + case 3: { // param static const char *const pname[4] = { "late", "time0", "early", "time1" @@ -394,7 +394,7 @@ void swim2_device::sync() cycles = 0; break; } - } + } if(m_tss_output & 0xc) { bool bit; @@ -525,7 +525,7 @@ void swim2_device::sync() } } } - } + } } } diff --git a/src/devices/machine/swim2.h b/src/devices/machine/swim2.h index bddcd7b49d1..20df1671131 100644 --- a/src/devices/machine/swim2.h +++ b/src/devices/machine/swim2.h @@ -51,7 +51,7 @@ private: u16 m_fifo[2], m_sr; u16 m_crc, m_mfm_sync_counter; u32 m_half_cycles_before_change; - + u64 m_last_sync; u64 m_flux_write_start; std::array m_flux_write; @@ -61,7 +61,7 @@ private: u64 time_to_cycles(const attotime &tm) const; attotime cycles_to_time(u64 cycles) const; - + void fifo_clear(); bool fifo_push(u16 data); u16 fifo_pop(); diff --git a/src/devices/sound/uda1344.cpp b/src/devices/sound/uda1344.cpp index 8cc08d936b7..183ba51fd36 100644 --- a/src/devices/sound/uda1344.cpp +++ b/src/devices/sound/uda1344.cpp @@ -2,21 +2,21 @@ // copyright-holders:Ryan Holtz /*************************************************************************** - Philips UDA1344 Stereo Audio Codec skeleton + Philips UDA1344 Stereo Audio Codec skeleton ****************************************************************************/ #include "emu.h" #include "sound/uda1344.h" -#define LOG_ADDR (1 << 1) -#define LOG_STATUS_REG (1 << 2) -#define LOG_DATA_REG (1 << 3) -#define LOG_INPUT (1 << 4) -#define LOG_OVERRUNS (1 << 5) -#define LOG_ALL (LOG_ADDR | LOG_STATUS_REG | LOG_DATA_REG | LOG_INPUT | LOG_OVERRUNS) +#define LOG_ADDR (1 << 1) +#define LOG_STATUS_REG (1 << 2) +#define LOG_DATA_REG (1 << 3) +#define LOG_INPUT (1 << 4) +#define LOG_OVERRUNS (1 << 5) +#define LOG_ALL (LOG_ADDR | LOG_STATUS_REG | LOG_DATA_REG | LOG_INPUT | LOG_OVERRUNS) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/sound/uda1344.h b/src/devices/sound/uda1344.h index 6d9041442c7..7bb07856df7 100644 --- a/src/devices/sound/uda1344.h +++ b/src/devices/sound/uda1344.h @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /*************************************************************************** - Philips UDA1344 Stereo Audio Codec skeleton + Philips UDA1344 Stereo Audio Codec skeleton ****************************************************************************/ @@ -41,41 +41,41 @@ protected: enum : uint8_t { - CHIP_ADDR_MASK = 0xfc, - CHIP_ADDR = 0x14, - - REG_TYPE_MASK = 0xc0, - REG_TYPE_BIT = 6, - - VOLUME_REG = 0x00, - VOLUME_REG_MASK = 0x3f, - - EQUALIZER_REG = 0x01, - EQUALIZER_REG_MASK = 0x3f, - EQUALIZER_BB_MASK = 0x3c, - EQUALIZER_BB_BIT = 2, - EQUALIZER_TR_MASK = 0x03, - EQUALIZER_TR_BIT = 0, - - FILTER_REG = 0x02, - FILTER_REG_MASK = 0x1f, - FILTER_DE_MASK = 0x18, - FILTER_DE_BIT = 3, - FILTER_MT_BIT = 2, - FILTER_MODE_MASK = 0x03, - FILTER_MODE_BIT = 0, - - POWER_REG = 0x03, - POWER_REG_MASK = 0x03, - POWER_ADC_BIT = 1, - POWER_DAC_BIT = 0, - - STATUS_REG_MASK = 0x3f, - STATUS_SC_MASK = 0x30, - STATUS_SC_BIT = 4, - STATUS_IF_MASK = 0x0e, - STATUS_IF_BIT = 1, - STATUS_DC_BIT = 0 + CHIP_ADDR_MASK = 0xfc, + CHIP_ADDR = 0x14, + + REG_TYPE_MASK = 0xc0, + REG_TYPE_BIT = 6, + + VOLUME_REG = 0x00, + VOLUME_REG_MASK = 0x3f, + + EQUALIZER_REG = 0x01, + EQUALIZER_REG_MASK = 0x3f, + EQUALIZER_BB_MASK = 0x3c, + EQUALIZER_BB_BIT = 2, + EQUALIZER_TR_MASK = 0x03, + EQUALIZER_TR_BIT = 0, + + FILTER_REG = 0x02, + FILTER_REG_MASK = 0x1f, + FILTER_DE_MASK = 0x18, + FILTER_DE_BIT = 3, + FILTER_MT_BIT = 2, + FILTER_MODE_MASK = 0x03, + FILTER_MODE_BIT = 0, + + POWER_REG = 0x03, + POWER_REG_MASK = 0x03, + POWER_ADC_BIT = 1, + POWER_DAC_BIT = 0, + + STATUS_REG_MASK = 0x3f, + STATUS_SC_MASK = 0x30, + STATUS_SC_BIT = 4, + STATUS_IF_MASK = 0x0e, + STATUS_IF_BIT = 1, + STATUS_DC_BIT = 0 }; sound_stream *m_stream; diff --git a/src/devices/video/sed1356.cpp b/src/devices/video/sed1356.cpp index e27eae12c78..ccc60d94a95 100644 --- a/src/devices/video/sed1356.cpp +++ b/src/devices/video/sed1356.cpp @@ -8,9 +8,9 @@ - Currently hard-coded for use with the Jornada 720 driver. - Register contents are correctly stored, logged and masked, but register handling is otherwise largely non-present. - - There is the potential for endian issues, and it will be - dealt with once the Jornada 720 driver makes heavier use of - BitBLT operations or other operations relevant to endianness. + - There is the potential for endian issues, and it will be + dealt with once the Jornada 720 driver makes heavier use of + BitBLT operations or other operations relevant to endianness. **********************************************************************/ @@ -31,7 +31,7 @@ #define LOG_LUT_WR (1 << 11) #define LOG_MPLUG_RD (1 << 12) #define LOG_MPLUG_WR (1 << 13) -#define LOG_LCD_RD_HF (1 << 14) +#define LOG_LCD_RD_HF (1 << 14) #define LOG_ALL (LOG_MISC_RD | LOG_MISC_WR | LOG_LCD_RD | LOG_LCD_WR | LOG_CRT_RD | LOG_CRT_WR | LOG_BITBLT_RD | LOG_BITBLT_WR | LOG_BITBLT_OP | LOG_LUT_RD \ | LOG_LUT_WR | LOG_MPLUG_RD | LOG_MPLUG_WR) diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp index d6f8e00cf17..0bdec18d201 100644 --- a/src/lib/formats/flopimg.cpp +++ b/src/lib/formats/flopimg.cpp @@ -2845,7 +2845,7 @@ void floppy_image_format_t::build_mac_track_gcr(int track, int head, floppy_imag 30318342 / 429, 30318342 / 472, 30318342 / 525, - 30318342 / 590 + 30318342 / 590 }; static const std::array notag{}; @@ -2960,10 +2960,10 @@ std::vector> floppy_image_format_t::extract_sectors_from_tr if(hstate == 0xd5aa96) hpos.push_back(pos == nib.size() - 1 ? 0 : pos+1); } - + for(uint32_t pos : hpos) { uint8_t h[7]; - + for(auto &e : h) { e = nib[pos]; pos ++; @@ -2975,7 +2975,7 @@ std::vector> floppy_image_format_t::extract_sectors_from_tr uint8_t v3 = gcr6bw_tb[h[3]]; uint8_t tr = gcr6bw_tb[h[0]] | (v2 & 1 ? 0x40 : 0x00); uint8_t se = gcr6bw_tb[h[1]]; - // uint8_t si = v2 & 0x20 ? 1 : 0; + // uint8_t si = v2 & 0x20 ? 1 : 0; // uint8_t ds = v3 & 0x20 ? 1 : 0; // uint8_t fmt = v3 & 0x1f; uint8_t c1 = (tr^se^v2^v3) & 0x3f; diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h index 07f39cb521a..a471167dbfe 100644 --- a/src/lib/formats/flopimg.h +++ b/src/lib/formats/flopimg.h @@ -372,8 +372,8 @@ protected: /*! @brief Test if a variant is present in the variant vector @param variants the variant vector - @param variant the variant to test - @result true if variant is in variants + @param variant the variant to test + @result true if variant is in variants */ static bool has_variant(const std::vector &variants, uint32_t variant); diff --git a/src/mame/audio/cmi01a.cpp b/src/mame/audio/cmi01a.cpp index c80486013bc..cd5764356d4 100644 --- a/src/mame/audio/cmi01a.cpp +++ b/src/mame/audio/cmi01a.cpp @@ -146,10 +146,10 @@ void cmi01a_device::sound_stream_update(sound_stream &stream, std::vector> 8), 32768); } -// if (m_channel == 5) printf("\n"); +// if (m_channel == 5) printf("\n"); m_segment_cnt = (m_segment_cnt & ~mask) | addr; } diff --git a/src/mame/audio/wswan.cpp b/src/mame/audio/wswan.cpp index 35c9e5f54d6..85c7e1766bc 100644 --- a/src/mame/audio/wswan.cpp +++ b/src/mame/audio/wswan.cpp @@ -263,7 +263,7 @@ u16 wswan_sound_device::port_r(offs_t offset, u16 mem_mask) (m_audio4_noise ? 0x80 : 0x00) | (m_mono ? 0x0100 : 0x00) | (m_output_volume << 9) | (m_external_stereo ? 0x0800 : 0x00) | - (m_external_speaker ? 0x00 : 0x00); // TODO 0x80 is set when external speaker is connected + (m_external_speaker ? 0x00 : 0x00); // TODO 0x80 is set when external speaker is connected case 0x92 / 2: return m_noise_shift; case 0x94 / 2: diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 393e0977bf7..ef23b47413b 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -35,9 +35,9 @@ TODO: - sas/format/format in abcenix tries to access the SASI card using a memory location mapped for task 0, when the process is run as task 1 - - MAC task/page/segment addressing failure? - - MAC page/segment RAM write strobe decoding failure? - - CPU does not enter supervisor mode when needed? + - MAC task/page/segment addressing failure? + - MAC page/segment RAM write strobe decoding failure? + - CPU does not enter supervisor mode when needed? [:mac] ':3f' (0009E) ff800:4f TASK 0 SEGMENT 15 PAGE 15 MEM 7f800-7ffff 1ff800 [:mac] ':3f' (0009E) ff801:ff TASK 0 SEGMENT 15 PAGE 15 MEM 7f800-7ffff 1ff800 diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index 93fe02f97eb..7697adf530e 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -218,7 +218,7 @@ The game card contains the program roms, sound rom and YMZ280B with a gal and optional RTC The GAL is only dumped for highroller, not sure if other boards have a different part. - + Adder 4 video board adds an additional card with a MC68340PV25E (25.175Mhz) ------------------------------- @@ -1834,10 +1834,10 @@ ROM_START( sc4hrolr ) // uses RTC on romcard ROM_REGION( 0x100000, "ymz", 0 ) ROM_LOAD( "b3a_highroller.bin", 0x0000, 0x100000, CRC(38ce5435) SHA1(e159420e7929fa048f3b2393f761eeed2e1cf3b7) ) - ROM_REGION( 0x100000, "gals", 0 ) + ROM_REGION( 0x100000, "gals", 0 ) ROM_LOAD( "75585129.ic1.bin", 0x0000, 0x000117, CRC(2454bb33) SHA1(610cde14caef3f2d02f0076b924e015077c3832b) ) /* protected gal16v8 on romcard */ - - ROM_END + + ROM_END ROM_START( ad4skill ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF ) diff --git a/src/mame/drivers/design.cpp b/src/mame/drivers/design.cpp index b69ac79d136..65ab3d8372b 100644 --- a/src/mame/drivers/design.cpp +++ b/src/mame/drivers/design.cpp @@ -274,11 +274,11 @@ void design6_state::design6(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); CD4099(config, "outlatch0"); -// outlatch0.q_out_cb<0>() // enable coin return motor 1 -// outlatch0.q_out_cb<1>() // enable coin return motor 2 -// outlatch0.q_out_cb<2>() // enable coin return motor 3 -// outlatch0.q_out_cb<3>() // master enable coin return motor? -// outlatch0.q_out_cb<6>() // ? +// outlatch0.q_out_cb<0>() // enable coin return motor 1 +// outlatch0.q_out_cb<1>() // enable coin return motor 2 +// outlatch0.q_out_cb<2>() // enable coin return motor 3 +// outlatch0.q_out_cb<3>() // master enable coin return motor? +// outlatch0.q_out_cb<6>() // ? cd4099_device &outlatch1(CD4099(config, "outlatch1")); outlatch1.q_out_cb<5>().set("vfd", FUNC(roc10937_device::data)); diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 6b7ea5b2171..61182a6b060 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -27,23 +27,23 @@ OUTPUT: all bits = Centronics data - Colors (from COLORDEM.BAS) - 0 = black - 1 = dark blue - 2 = red - 3 = magenta - 4 = brown - 5 = grey - 6 = orange - 7 = pink - 8 = dark aqua - 9 = blue - A = grey 2 - B = light blue - C = green - D = aqua - E = yellow - F = white + Colors (from COLORDEM.BAS) + 0 = black + 1 = dark blue + 2 = red + 3 = magenta + 4 = brown + 5 = grey + 6 = orange + 7 = pink + 8 = dark aqua + 9 = blue + A = grey 2 + B = light blue + C = green + D = aqua + E = yellow + F = white ****************************************************************************/ @@ -134,7 +134,7 @@ void dim68k_state::dim68k_palette(palette_device &palette) palette.set_pen_color(12, rgb_t(0x19, 0xd7, 0x00)); /* Light Green */ palette.set_pen_color(13, rgb_t(0x58, 0xf4, 0xbf)); /* Aquamarine */ palette.set_pen_color(14, rgb_t(0xbf, 0xe3, 0x08)); /* Yellow */ - palette.set_pen_color(15, rgb_t(0xff, 0xff, 0xff)); /* White */ + palette.set_pen_color(15, rgb_t(0xff, 0xff, 0xff)); /* White */ }; u16 dim68k_state::dim68k_fdc_r() diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index dce5b7e51fa..673825224c1 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -16,10 +16,10 @@ Special thanks to Grull Osgo for his exhaustive reverse engineering that allowed to recreate - the original default serial EEPROM contents for the english set, critical to get it working. + the original default serial EEPROM contents for the english set, critical to get it working. Special thanks to Rob Ragon for dump the spanish set, and all the tests on the real hardware. - + ------------------------------------------------------------------------------------------------- Notes: @@ -601,7 +601,7 @@ possible hopper registers D1DC ---- ---x (inv) D1EA ---- ---x D1EC ---- ---x - + */ @@ -701,7 +701,7 @@ GFXDECODE_END void fortecrd_state::machine_reset() { - // apparently there's a random fill in there (checked thru trojan) + // apparently there's a random fill in there (checked thru trojan) for (int i = 0; i < m_vram.bytes(); i++) m_vram[i] = machine().rand(); } @@ -753,7 +753,7 @@ void fortecrd_state::fortecrd(machine_config &config) SPEAKER(config, "mono").front_center(); - ay8910_device &aysnd(AY8910(config, "aysnd", AY_CLOCK)); // 1.5 MHz, measured + ay8910_device &aysnd(AY8910(config, "aysnd", AY_CLOCK)); // 1.5 MHz, measured aysnd.port_a_write_callback().set(FUNC(fortecrd_state::ayporta_w)); aysnd.port_b_write_callback().set(FUNC(fortecrd_state::ayportb_w)); aysnd.add_route(ALL_OUTPUTS, "mono", 0.50); diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 9c8c37c075f..f27b801839d 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -587,7 +587,7 @@ This is a Bulgarian Jolly Card pseudo-clone, with cyrillic charset. ЗАБАВНИ КАРТИ means "Fun cards" / "Cards for fun". - + The game has encrypted GFX. Same style as blue TAB board. This is a timed game. You coin for an amount of playing time. @@ -618,51 +618,51 @@ You'll see the following counters and menu: КАРЕ С ЖОКЕР 0 (five of a kind) - КЕНТ ФЛЕШ РОЯЛ 0 (royal flush) - КЕНТ ФЛЕШ 0 (straight flush) - КАРЕ 0 (poker) - ФУЛ 0 (full house) - ФЛЕШ 0 (flush) - КЕНТА 0 (straight) - ТРОЙКА 0 (three of a kind) - 2 ДВОЙКИ 0 (two pairs) - ГОЛЯМА ДВОЙКИ 0 (high pair) + КЕНТ ФЛЕШ РОЯЛ 0 (royal flush) + КЕНТ ФЛЕШ 0 (straight flush) + КАРЕ 0 (poker) + ФУЛ 0 (full house) + ФЛЕШ 0 (flush) + КЕНТА 0 (straight) + ТРОЙКА 0 (three of a kind) + 2 ДВОЙКИ 0 (two pairs) + ГОЛЯМА ДВОЙКИ 0 (high pair) - ВРЕМЕ: Натиснете бутон Стоп3 - TIME: Press the Stop3 button + ВРЕМЕ: Натиснете бутон Стоп3 + TIME: Press the Stop3 button - Изиграно време, мин. : 00 - Played time, min. : 00 + Изиграно време, мин. : 00 + Played time, min. : 00 - Платено време, мин. : 00 - Paid time, min. : 00 + Платено време, мин. : 00 + Paid time, min. : 00 - НАСТРОЙКА: Натиснете бутони Стоп2 и Стоп4 - SETUP: Press the Stop2 and Stop4 buttons + НАСТРОЙКА: Натиснете бутони Стоп2 и Стоп4 + SETUP: Press the Stop2 and Stop4 buttons - Бутон Стоп1 -- Време за една игра, мин. (1-99, 5 by default) - Stop1 Button -- Time for one game, min. (1-99, 5 by default) + Бутон Стоп1 -- Време за една игра, мин. (1-99, 5 by default) + Stop1 Button -- Time for one game, min. (1-99, 5 by default) - Бутон Стоп2 -- Залог (1-99, 10 by default) - Stop2 button - Bet (1-99, 10 by default) + Бутон Стоп2 -- Залог (1-99, 10 by default) + Stop2 button - Bet (1-99, 10 by default) - Бутон Стоп3 -- Ниво на трудност (0-3, 2 by default) - Stop3 button -- Level of difficulty (0-3, 2 by default) + Бутон Стоп3 -- Ниво на трудност (0-3, 2 by default) + Stop3 button -- Level of difficulty (0-3, 2 by default) - ИЗХОД: Натиснете бутон Старт - EXIT: Press the Start button + ИЗХОД: Натиснете бутон Старт + EXIT: Press the Start button - НУЛИРАНЕ: Стоп1 нулира часовника - RESET: Stop1 resets the clock + НУЛИРАНЕ: Стоп1 нулира часовника + RESET: Stop1 resets the clock - ИЗЧИСТВАНЕ: Натиснете 2 с. бутон Изчистване - CLEAR: Press the Cancel button for 2 seconds + ИЗЧИСТВАНЕ: Натиснете 2 с. бутон Изчистване + CLEAR: Press the Cancel button for 2 seconds - ИЗХОД: Натиснете бутон Старт - EXIT: Press the Start button + ИЗХОД: Натиснете бутон Старт + EXIT: Press the Start button --------------------------------------------------------------------- @@ -1436,10 +1436,10 @@ static INPUT_PORTS_START( jolycdcy ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) PORT_NAME(u8"Running / Credits (Навъртане)") // НАВЪРТАНЕ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME(u8"Stop 1 (Стоп 1)") // СТОП 1 PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL ) PORT_NAME(u8"Cancel (Изчистване) / Autostop (Автостоп) / Take (Качване)") // ИЗЧИСТВАНЕ / АВТОСТОП / КАЧВАНЕ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME(u8"Start (Старт) / Double (Дублиране)") // СТАРТ / ДУБЛИРАНЕ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME(u8"Stop 5 (Стоп 5) / Half Gamble (Половин Хазарт)") // СТОП 5 / ПОЛОВИН ХАЗАРТ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME(u8"Turnover (Оборот)") // ОБОРОТ (turnover) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME(u8"Setup (Настройка)") // НАСТРОЙКА (setup) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME(u8"Start (Старт) / Double (Дублиране)") // СТАРТ / ДУБЛИРАНЕ + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME(u8"Stop 5 (Стоп 5) / Half Gamble (Половин Хазарт)") // СТОП 5 / ПОЛОВИН ХАЗАРТ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME(u8"Turnover (Оборот)") // ОБОРОТ (turnover) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME(u8"Setup (Настройка)") // НАСТРОЙКА (setup) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD4 ) PORT_NAME(u8"Stop 4 (Стоп 4) / Big (Голяма)") // СТОП 4 / ГОЛЯМА PORT_START("IN1") @@ -1447,13 +1447,13 @@ static INPUT_PORTS_START( jolycdcy ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME(u8"Stop 3 (Стоп 3)") // СТОП 3 PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 1") PORT_CODE(KEYCODE_A) // present on the test mode, but erased - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 2") PORT_CODE(KEYCODE_S) // normally coin2. present on the test mode, but erased. + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 1") PORT_CODE(KEYCODE_A) // present on the test mode, but erased + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 2") PORT_CODE(KEYCODE_S) // normally coin2. present on the test mode, but erased. PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 3") PORT_CODE(KEYCODE_D) // normally keyout. present on the test mode as "K'bo?". + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 3") PORT_CODE(KEYCODE_D) // normally keyout. present on the test mode as "K'bo?". PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 4") PORT_CODE(KEYCODE_F) // normally coin1. present on the test mode, but erased. + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("test 4") PORT_CODE(KEYCODE_F) // normally coin1. present on the test mode, but erased. PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1463,7 +1463,7 @@ static INPUT_PORTS_START( jolycdcy ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8") // only works with credits inserted + PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8") // only works with credits inserted PORT_DIPSETTING( 0x01, "Normal Play" ) PORT_DIPSETTING( 0x00, "Test Mode" ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7") @@ -3083,12 +3083,12 @@ static INPUT_PORTS_START( clubcard ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper SW") PORT_CODE(KEYCODE_H) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coin B") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coin B") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("Coin A") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("Coin A") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3469,7 +3469,7 @@ void funworld_state::gratispk(machine_config &config) void funworld_state::clubcard(machine_config &config) { -// fw1stpal(config); // 'alla Royal Card. Card deck wrong colors. +// fw1stpal(config); // 'alla Royal Card. Card deck wrong colors. fw2ndpal(config); // proper colors. R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz. @@ -4654,7 +4654,7 @@ ROM_END Bulgarian Jolly Card clone with cyrillic charset. ЗАБАВНИ КАРТИ means "Fun cards" / "Cards for fun". - + Encrypted GFX. Same style as blue TAB board. This is a timed game. You coin for an amount of playing time. diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index d303372a46e..d0c65e59b84 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -13203,7 +13203,7 @@ ROM_START( namenayo ) ROM_LOAD( "1.2d.2763", 0x0000, 0x2000, CRC(9830b4be) SHA1(541e59e892fbe46df24b68ab3cafea8a09f59f47) ) ROM_LOAD( "2.2f.2763", 0x2000, 0x2000, CRC(cfaeb2de) SHA1(76c0019bf7815b056332d634ee1daec2e29407df) ) ROM_LOAD( "4.2j.2763", 0x6000, 0x1000, CRC(4c3e8d42) SHA1(da7a77744953fcc3c3f1c03e86f5c6e589ddd545) ) // Scene 6 - ROM_CONTINUE(0x5000,0x1000) // Scene 4,5 + ROM_CONTINUE(0x5000,0x1000) // Scene 4,5 ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_LOAD( "s1.5c.2732", 0x0000, 0x1000, CRC(31d4ebc1) SHA1(2f217daecb46228002b3981892b9cfe9ded6908b) ) diff --git a/src/mame/drivers/getaway.cpp b/src/mame/drivers/getaway.cpp index 63ef28d765a..89b53c70ae2 100644 --- a/src/mame/drivers/getaway.cpp +++ b/src/mame/drivers/getaway.cpp @@ -20,7 +20,7 @@ TODO: - several unknowns in the video emulation: - score layer is a simplification hack, it is unknown how it should really cope RMW-wise against main layer. It also has wrong colors (different color - base or overlay artwork, with extra bit output for taking priority?). + base or overlay artwork, with extra bit output for taking priority?). The score background color should change from white(or is it cyan?) to red after Extended Play, the score digits themselves should always be black; - According to flyers, screen sides should have a green background color, @@ -201,7 +201,7 @@ void getaway_state::io_w(offs_t offset, u8 data) [0x07] ???w wwww transfer width, in 8 pixel units - Notice that 0xff is set on POST, either full clear or NOP + Notice that 0xff is set on POST, either full clear or NOP [0x08] hhhh hhhh transfer height, in scanline units diff --git a/src/mame/drivers/jornada.cpp b/src/mame/drivers/jornada.cpp index 85046d298ee..9201a4d2b2f 100644 --- a/src/mame/drivers/jornada.cpp +++ b/src/mame/drivers/jornada.cpp @@ -4,12 +4,12 @@ HP Jornada PDA skeleton driver - To boot: - - Start MAME with the debugger enabled - - Use the following breakpoint command: bp 13E2C,R3==3 && R1==10 - - Close the debugger and allow the machine to run - - When the breakpoint is hit, use the following command: R3=0 - - Close the debugger, booting will proceed + To boot: + - Start MAME with the debugger enabled + - Use the following breakpoint command: bp 13E2C,R3==3 && R1==10 + - Close the debugger and allow the machine to run + - When the breakpoint is hit, use the following command: R3=0 + - Close the debugger, booting will proceed ***************************************************************************/ @@ -59,8 +59,8 @@ public: enum : uint8_t { - MCU_TXDUMMY = 0x11, - MCU_TXDUMMY2 = 0x88 + MCU_TXDUMMY = 0x11, + MCU_TXDUMMY2 = 0x88 }; diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index ab335927955..55fcd9695c0 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -515,7 +515,7 @@ void jpmimpct_video_state::slides_video_w(offs_t offset, uint16_t data, uint16_t /* Some Input Switch numbers according to test modes - + DSW 0x01 = Switch 0 DSW 0x02 = 1 DSW 0x04 = 1 @@ -562,7 +562,7 @@ void jpmimpct_state::common_map(address_map& map) map(0x00480032, 0x00480033).portr("COIN_SENSE"); map(0x00480034, 0x00480035).r(FUNC(jpmimpct_state::ump_r)); - map(0x00480060, 0x00480067).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); + map(0x00480060, 0x00480067).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x00480080, 0x00480081).w(FUNC(jpmimpct_state::upd7759_w)); map(0x00480082, 0x00480083).w(FUNC(jpmimpct_state::volume_w)); @@ -606,7 +606,7 @@ void jpmimpct_state::impact_non_video_map(address_map &map) common_map(map); map(0x00480040, 0x00480041).r(FUNC(jpmimpct_state::optos_r)); - + // are these genuine reads, or just code going wrong prior to them happening? map(0x00480086, 0x0048009f).r(FUNC(jpmimpct_state::prot_1_r)); map(0x004801dc, 0x004801dd).r(FUNC(jpmimpct_state::prot_1_r)); @@ -738,7 +738,7 @@ INPUT_PORTS_START( jpmimpct_inputs ) // others show error "5.5 MODE OF PLAY INVALID", or "91 00 Illegal Mode" // games that don't require keys either expect them not to be fitted // or will simply ignore them - PORT_START("J10_0") + PORT_START("J10_0") PORT_CONFNAME( 0x0f, 0x08, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -746,7 +746,7 @@ INPUT_PORTS_START( jpmimpct_inputs ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "8 GBP Cash" ) - PORT_CONFSETTING( 0x09, "8 GBP Token" ) + PORT_CONFSETTING( 0x09, "8 GBP Token" ) PORT_CONFSETTING( 0x08, "10 GBP Cash" ) PORT_CONFSETTING( 0x07, "5 GBP" ) PORT_CONFSETTING( 0x06, "15 GBP" ) @@ -921,8 +921,8 @@ INPUT_PORTS_START( jpmimpct_inputs ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x00, "PAYCOIN_LEVEL: 0x80 (100p cash full)") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START("TEST_DEMO") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME( "Test/Demo" ) diff --git a/src/mame/drivers/jpmimpctsw.cpp b/src/mame/drivers/jpmimpctsw.cpp index da81c4b83a9..65440df4cc8 100644 --- a/src/mame/drivers/jpmimpctsw.cpp +++ b/src/mame/drivers/jpmimpctsw.cpp @@ -7,7 +7,7 @@ /* NOTE: some games are built on top of other games, and have leftover VFD messages in cases where the new machines lacked any VFD display - + in such cases the lamping will clearly be different, and some of the VFD messages might be corrupt, where parts of them have been erased. @@ -222,7 +222,7 @@ INPUT_PORTS_START( j6_stake_5_10_20_25_30 ) INPUT_PORTS_END INPUT_PORTS_START( j6_stake_10 ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x70, 0x60, "Stake Key" ) PORT_CONFSETTING( 0x00, "0x00" ) PORT_CONFSETTING( 0x10, "0x10" ) @@ -248,7 +248,7 @@ INPUT_PORTS_START( j6_stake_25 ) INPUT_PORTS_END INPUT_PORTS_START( j6_stake_5_10 ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x70, 0x60, "Stake Key" ) PORT_CONFSETTING( 0x00, "0x00" ) PORT_CONFSETTING( 0x10, "0x10" ) @@ -312,8 +312,8 @@ INPUT_PORTS_START( j6_stake_not_fitted ) PORT_CONFSETTING( 0x70, "0x70" ) INPUT_PORTS_END -INPUT_PORTS_START( j6_jackpot_5 ) - PORT_MODIFY("J10_0") +INPUT_PORTS_START( j6_jackpot_5 ) + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x07, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -333,8 +333,8 @@ INPUT_PORTS_START( j6_jackpot_5 ) PORT_CONFSETTING( 0x00, "0x00" ) INPUT_PORTS_END -INPUT_PORTS_START( j6_jackpot_15 ) - PORT_MODIFY("J10_0") +INPUT_PORTS_START( j6_jackpot_15 ) + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x06, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -354,8 +354,8 @@ INPUT_PORTS_START( j6_jackpot_15 ) PORT_CONFSETTING( 0x00, "0x00" ) INPUT_PORTS_END -INPUT_PORTS_START( j6_jackpot_25 ) - PORT_MODIFY("J10_0") +INPUT_PORTS_START( j6_jackpot_25 ) + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x05, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -384,7 +384,7 @@ INPUT_PORTS_START( j6_jackpot_8t_10 ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "0x0a" ) - PORT_CONFSETTING( 0x09, "8 GBP Token" ) + PORT_CONFSETTING( 0x09, "8 GBP Token" ) PORT_CONFSETTING( 0x08, "10 GBP Cash" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "0x06" ) @@ -418,7 +418,7 @@ INPUT_PORTS_START( j6_jackpot_5_15 ) INPUT_PORTS_END INPUT_PORTS_START( j6_jackpot_8_8t_10_15 ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x08, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -426,7 +426,7 @@ INPUT_PORTS_START( j6_jackpot_8_8t_10_15 ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "8 GBP Cash" ) - PORT_CONFSETTING( 0x09, "8 GBP Token" ) + PORT_CONFSETTING( 0x09, "8 GBP Token" ) PORT_CONFSETTING( 0x08, "10 GBP Cash" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "15 GBP" ) @@ -439,7 +439,7 @@ INPUT_PORTS_START( j6_jackpot_8_8t_10_15 ) INPUT_PORTS_END INPUT_PORTS_START( j6_jackpot_8_8t ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x0a, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -447,7 +447,7 @@ INPUT_PORTS_START( j6_jackpot_8_8t ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "8 GBP Cash" ) - PORT_CONFSETTING( 0x09, "8 GBP Token" ) + PORT_CONFSETTING( 0x09, "8 GBP Token" ) PORT_CONFSETTING( 0x08, "0x08" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "0x06" ) @@ -502,7 +502,7 @@ INPUT_PORTS_START( j6_jackpot_not_fitted ) INPUT_PORTS_END INPUT_PORTS_START( j6_jackpot_not_fitted_10 ) // where not fitted is valid (but then stake key has no effect) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x08, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -510,7 +510,7 @@ INPUT_PORTS_START( j6_jackpot_not_fitted_10 ) // where not fitted is valid (but PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "0x0a" ) - PORT_CONFSETTING( 0x09, "0x09" ) + PORT_CONFSETTING( 0x09, "0x09" ) PORT_CONFSETTING( 0x08, "10 GBP Cash" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "0x06" ) @@ -523,7 +523,7 @@ INPUT_PORTS_START( j6_jackpot_not_fitted_10 ) // where not fitted is valid (but INPUT_PORTS_END INPUT_PORTS_START( j6_jackpot_8c ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x0a, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -531,7 +531,7 @@ INPUT_PORTS_START( j6_jackpot_8c ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "8 GBP Cash" ) - PORT_CONFSETTING( 0x09, "0x09" ) + PORT_CONFSETTING( 0x09, "0x09" ) PORT_CONFSETTING( 0x08, "0x08" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "0x06" ) @@ -544,7 +544,7 @@ INPUT_PORTS_START( j6_jackpot_8c ) INPUT_PORTS_END INPUT_PORTS_START( j6_jackpot_10 ) - PORT_MODIFY("J10_0") + PORT_MODIFY("J10_0") PORT_CONFNAME( 0x0f, 0x08, "Jackpot / Prize Key" ) PORT_CONFSETTING( 0x0f, "Not Fitted" ) PORT_CONFSETTING( 0x0e, "0x0e" ) @@ -552,7 +552,7 @@ INPUT_PORTS_START( j6_jackpot_10 ) PORT_CONFSETTING( 0x0c, "0x0c" ) PORT_CONFSETTING( 0x0b, "0x0b" ) PORT_CONFSETTING( 0x0a, "0x0a" ) - PORT_CONFSETTING( 0x09, "0x09" ) + PORT_CONFSETTING( 0x09, "0x09" ) PORT_CONFSETTING( 0x08, "10 GBP Cash" ) PORT_CONFSETTING( 0x07, "0x07" ) PORT_CONFSETTING( 0x06, "0x06" ) @@ -1012,7 +1012,7 @@ INPUT_PORTS_START( j6guab ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Knock Out") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Strikes") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Nudges") - + PORT_MODIFY("J9_0") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Exchange") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Collect") @@ -1140,7 +1140,7 @@ INPUT_PORTS_START( j6impls ) PORT_MODIFY("J9_2") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON9 ) // PORT_NAME("Hopper Dump SW") -// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON11 ) // PORT_NAME("Cash / Token Sw") +// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON11 ) // PORT_NAME("Cash / Token Sw") INPUT_PORTS_END @@ -1613,14 +1613,14 @@ INPUT_PORTS_START( j6wildw ) PORT_INCLUDE( j6_stake_20 ) PORT_MODIFY("J10_2") // other buttons uncertain, possibly a different pair of hi/lo? - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON11 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON11 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Hi") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON9 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Lo") - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON7 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_MODIFY("J9_0") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Collect") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Nudge 3") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Nudge 2") @@ -2977,7 +2977,7 @@ INPUT_PORTS_START( j6luckla ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_MODIFY("J9_0") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Nudge 4/Lo") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Nudge 3/Hi") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Nudge 2") @@ -8793,7 +8793,7 @@ ROM_START( j6redarwj ) j6redarw_sound ROM_END -ROM_START( j6redarww ) +ROM_START( j6redarww ) ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF ) // invalid pairing? ROM_LOAD( "redarrow.p1", 0x000000, 0x020000, CRC(e47fdd2c) SHA1(1cbce6e38cacad4c0ec617e38522ef81feaeb296) ) @@ -12079,7 +12079,7 @@ GAME( 199?, j6tutti, 0, impact_nonvideo, jpmimpct_non_video_input // ************************************************************************************************************* // JPM + others games with 'Bacta 6 Standard Codes' for errors -// these include some of the 'Classic' reissues +// these include some of the 'Classic' reissues // ************************************************************************************************************* GAME( 199?, j6acehi, 0, impact_nonvideo, j6acehi, jpmimpct_state, empty_init, ROT0, "Ace", "Aces High (Ace) (IMPACT)", GAME_FLAGS ) @@ -12093,7 +12093,7 @@ GAMEL( 199?, j6arcadee, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state GAMEL( 199?, j6arcadeg, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 2, Protocol)", GAME_FLAGS, layout_j6arcadee ) GAMEL( 199?, j6arcadeh, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 3, Protocol)", GAME_FLAGS, layout_j6arcadee ) GAMEL( 199?, j6arcadei, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 4, Protocol)", GAME_FLAGS, layout_j6arcadee ) // gives error 71 00 even with datapak attached? -GAMEL( 199?, j6arcadej, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 5, Protocol)", GAME_FLAGS, layout_j6arcadee ) +GAMEL( 199?, j6arcadej, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 5, Protocol)", GAME_FLAGS, layout_j6arcadee ) GAMEL( 199?, j6arcadek, j6arcade, impact_nonvideo, j6arcade, jpmimpct_state, empty_init, ROT0, "JPM", "Arcadia (JPM) (IMPACT) (V10, set 6, Protocol)", GAME_FLAGS, layout_j6arcadee ) GAMEL( 199?, j6colcsh, 0, impact_nonvideo, j6colcsh, jpmimpct_state, empty_init, ROT0, "JPM", "Coliseum Cash (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6colcsh ) @@ -12183,7 +12183,7 @@ GAMEL( 199?, j6casclal, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state GAMEL( 199?, j6casclam, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 14)", GAME_FLAGS, layout_j6casclaf ) // ERROR 91 01 GAMEL( 199?, j6casclan, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 15)", GAME_FLAGS, layout_j6casclaf ) GAMEL( 199?, j6casclao, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 16)", GAME_FLAGS, layout_j6casclaf ) // ERROR 16 00 Note Acceptor Fault -GAMEL( 199?, j6casclap, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 17)", GAME_FLAGS, layout_j6casclaf ) // ERROR 16 00 +GAMEL( 199?, j6casclap, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 17)", GAME_FLAGS, layout_j6casclaf ) // ERROR 16 00 GAMEL( 199?, j6casclaq, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 18)", GAME_FLAGS, layout_j6casclaf ) GAMEL( 199?, j6casclar, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 19)", GAME_FLAGS, layout_j6casclaf ) // ERROR 91 01 GAMEL( 199?, j6casclas, j6cascla, impact_nonvideo, j6cascla, jpmimpct_state, empty_init, ROT0, "JPM", "Casino Crazy Classic Club (JPM) (IMPACT) (set 20)", GAME_FLAGS, layout_j6casclaf ) @@ -12481,7 +12481,7 @@ GAME( 199?, j6supbrkf, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state GAME( 199?, j6supbrkg, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state, empty_init, ROT0, "JPM", "Super Breakout (JPM) (IMPACT) (set 8)", GAME_FLAGS ) GAME( 199?, j6supbrkh, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state, empty_init, ROT0, "JPM", "Super Breakout (JPM) (IMPACT) (set 9)", GAME_FLAGS ) GAME( 199?, j6supbrki, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state, empty_init, ROT0, "JPM", "Super Breakout (JPM) (IMPACT) (set 10)", GAME_FLAGS ) -GAME( 199?, j6supbrkj, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state, empty_init, ROT0, "JPM", "Super Breakout (JPM) (IMPACT) (set 11)", GAME_FLAGS ) // ERROR 71 00 +GAME( 199?, j6supbrkj, j6supbrk, impact_nonvideo, j6supbrk, jpmimpct_state, empty_init, ROT0, "JPM", "Super Breakout (JPM) (IMPACT) (set 11)", GAME_FLAGS ) // ERROR 71 00 GAMEL( 199?, j6swpdrp, 0, impact_nonvideo, j6swpdrp, jpmimpct_state, empty_init, ROT0, "JPM", "Swop Till Ya Drop (JPM) (IMPACT)", GAME_FLAGS, layout_j6swpdrp ) diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index b067666878d..a37e0ebe4d9 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -434,10 +434,10 @@ void jpmsys5_state::jpm_sys5_common_map(address_map &map) map(0x046080, 0x046083).rw("acia6850_1", FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0x046084, 0x046085).r(FUNC(jpmsys5_state::unknown_port_r)); -// map(0x04608c, 0x04608f).r(FUNC(jpmsys5_state::unk_r)); +// map(0x04608c, 0x04608f).r(FUNC(jpmsys5_state::unk_r)); map(0x04608c, 0x04608f).rw("acia6850_2", FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); - + map(0x0460c0, 0x0460c1).nopw(); map(0x048000, 0x048001).rw(FUNC(jpmsys5_state::unk_48000_r), FUNC(jpmsys5_state::unk_48000_w)); diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index a6561fe7818..2e13b80c37f 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -1535,8 +1535,8 @@ static INPUT_PORTS_START( shogwarr ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - // dip defaults confirmed by manual ("Bolr (sic) face indicate standard setting") - // including Demo Sounds + // dip defaults confirmed by manual ("Bolr (sic) face indicate standard setting") + // including Demo Sounds PORT_START("DSW1") /* from the MCU - 102e15.b <- 200059.b */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -1555,9 +1555,9 @@ static INPUT_PORTS_START( shogwarr ) PORT_DIPSETTING( 0x08, "7" ) PORT_DIPSETTING( 0x00, "8 Hard" ) PORT_DIPNAME( 0x40, 0x40, "Can Join During Game" ) PORT_DIPLOCATION("SW1:7") - // 1p vs 2p is allowed only at title screen with a single credit by pressing 2p start. akin to an "event mode" + // 1p vs 2p is allowed only at title screen with a single credit by pressing 2p start. akin to an "event mode" PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) // "impossible", vs.play 1 credit, game over aftewards - // "normal mode" + // "normal mode" PORT_DIPSETTING( 0x40, DEF_STR( On ) ) // "possible", vs.play 2 credits, winner plays against CPU afterwards PORT_DIPNAME( 0x80, 0x80, "Continue Coin" ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index e0416570c34..f3a72a58b26 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -145,9 +145,9 @@ void kingpin_state::kingpin_io_map(address_map &map) map(0x20, 0x21).rw("tms9928a", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write)); map(0x30, 0x30).w(FUNC(kingpin_state::output1_w)); map(0x40, 0x40).w(FUNC(kingpin_state::output2_w)); -// map(0x50, 0x50) +// map(0x50, 0x50) map(0x60, 0x60).w(FUNC(kingpin_state::sound_nmi_w)); -// map(0x70, 0x70) +// map(0x70, 0x70) } void kingpin_state::kingpin_sound_map(address_map &map) diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index 4278316e09e..15fff145bf7 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -815,7 +815,7 @@ void ksys573_state::gbbchmp_map(address_map& map) bool ksys573_state::jvs_is_valid_packet() { - if (m_jvs_input_idx_w < 5) { + if (m_jvs_input_idx_w < 5) { // A valid packet will have at the very least // - sync (0xe0) // - node number (non-zero) @@ -823,35 +823,35 @@ bool ksys573_state::jvs_is_valid_packet() // - at least 1 byte in the request message // - checksum return false; - } + } if (m_jvs_input_buffer[0] != 0xe0 || m_jvs_input_buffer[1] == 0x00) { return false; } - int command_size = m_jvs_input_buffer[2] + 3; - if (m_jvs_input_idx_w < command_size) { + int command_size = m_jvs_input_buffer[2] + 3; + if (m_jvs_input_idx_w < command_size) { return false; - } + } - uint8_t checksum = 0; - for (int i = 1; i < command_size - 1; i++) { + uint8_t checksum = 0; + for (int i = 1; i < command_size - 1; i++) { checksum += m_jvs_input_buffer[i]; - } + } - return checksum == m_jvs_input_buffer[command_size - 1]; + return checksum == m_jvs_input_buffer[command_size - 1]; } void ksys573_state::jvs_input_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - m_jvs_input_buffer[m_jvs_input_idx_w++] = data & 0xff; - m_jvs_input_buffer[m_jvs_input_idx_w++] = data >> 8; + m_jvs_input_buffer[m_jvs_input_idx_w++] = data & 0xff; + m_jvs_input_buffer[m_jvs_input_idx_w++] = data >> 8; if (m_jvs_input_buffer[0] != 0xe0) { m_jvs_input_idx_w = 0; } - if (jvs_is_valid_packet()) { + if (jvs_is_valid_packet()) { LOGJVS("jvs_input_w( %08x, %08x, %02x %02x )\n", offset, mem_mask, data & 0xff, data >> 8 ); for (int i = 0; i < m_jvs_input_idx_w; i++) LOGJVS("%02x ", m_jvs_input_buffer[i]); @@ -864,15 +864,15 @@ void ksys573_state::jvs_input_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_jvs_input_idx_r = 0; m_jvs_input_buffer[0] = 0; - } + } } uint16_t ksys573_state::jvs_input_r(offs_t offset, uint16_t mem_mask) { - uint16_t data = m_jvs_input_buffer[m_jvs_input_idx_r++]; - data |= m_jvs_input_buffer[m_jvs_input_idx_r++] << 8; + uint16_t data = m_jvs_input_buffer[m_jvs_input_idx_r++]; + data |= m_jvs_input_buffer[m_jvs_input_idx_r++] << 8; - return data; + return data; } uint16_t ksys573_state::port_in2_jvs_r(offs_t offset, uint16_t mem_mask) @@ -882,21 +882,21 @@ uint16_t ksys573_state::port_in2_jvs_r(offs_t offset, uint16_t mem_mask) return m_in2->read(); } - if (m_jvs_output_len_w <= 0) { + if (m_jvs_output_len_w <= 0) { return 0; - } + } - uint16_t data = m_jvs_output_buffer[m_jvs_output_idx_w] | (m_jvs_output_buffer[m_jvs_output_idx_w+1] << 8); - m_jvs_output_idx_w += 2; + uint16_t data = m_jvs_output_buffer[m_jvs_output_idx_w] | (m_jvs_output_buffer[m_jvs_output_idx_w+1] << 8); + m_jvs_output_idx_w += 2; - if (m_jvs_output_idx_w >= m_jvs_output_len_w) { + if (m_jvs_output_idx_w >= m_jvs_output_len_w) { m_jvs_output_idx_w = 0; m_jvs_output_len_w = 0; - } + } - LOGJVS("m_jvs_output_r %08x %08x | %02x %02x | %02x\n", offset, mem_mask, data & 0xff, data >> 8, m_jvs_output_idx_w); + LOGJVS("m_jvs_output_r %08x %08x | %02x %02x | %02x\n", offset, mem_mask, data & 0xff, data >> 8, m_jvs_output_idx_w); - return data; + return data; } READ_LINE_MEMBER( ksys573_state::jvs_rx_r ) diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index ef6904f5cec..a7e953d66e0 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -7,12 +7,12 @@ This only loads the basic stuff - there needs to be more done to make this run. There are 3 Mainboards, original M1 uses 2x TMP82C79P's, M1A and M1B use 1x TMP82C79P and 1x 80c51 microcontroller with a 12MHz crystal - + There are 3 sound options, 1: AY3-8930 on the mainboard. 2: "Digital Sound Board" sound ROM + NEC D7759 on the romcard. 3: "E.S.P. Board" sound ROMS + OKI M6376, + NEC C1892 - + ** later ESP boards also have a sub-board marked "RAM Protection Board" diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 283b5a2b8f8..9712734ecd4 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -6454,12 +6454,12 @@ void model3_state::init_srally2() /* void model3_state::init_srally2pa() { - init_model3_20(); + init_model3_20(); - uint32_t *rom = (uint32_t*)memregion("user1")->base(); - rom[(0x3ba44^4)/4] = 0x60000000; // Unemulated JTAG stuff, see srally2 - rom[(0x3ba48^4)/4] = 0x60000000; - rom[(0x3ba4c^4)/4] = 0x60000000; + uint32_t *rom = (uint32_t*)memregion("user1")->base(); + rom[(0x3ba44^4)/4] = 0x60000000; // Unemulated JTAG stuff, see srally2 + rom[(0x3ba48^4)/4] = 0x60000000; + rom[(0x3ba4c^4)/4] = 0x60000000; } */ @@ -6497,7 +6497,7 @@ void model3_state::init_swtrilgp() rom[(0x886e0^4)/4] = 0x60000000; // Unemulated JTAG stuff, see srally2 rom[(0x886e4^4)/4] = 0x60000000; rom[(0x886e8^4)/4] = 0x60000000; - + rom[(0x0292c^4)/4] = 0x60000000; // skip force feedback setup rom[(0x02998^4)/4] = 0x60000000; } diff --git a/src/mame/drivers/rtpc.cpp b/src/mame/drivers/rtpc.cpp index e3f0bb5d1b5..eb9cd5c8b97 100644 --- a/src/mame/drivers/rtpc.cpp +++ b/src/mame/drivers/rtpc.cpp @@ -275,7 +275,7 @@ template void rtpc_state::iocc_pio_map(address_map &map) /* FLOPPY_FORMATS_MEMBER(rtpc_state::floppy_formats) - FLOPPY_PC_FORMAT + FLOPPY_PC_FORMAT FLOPPY_FORMATS_END */ diff --git a/src/mame/drivers/tabe22.cpp b/src/mame/drivers/tabe22.cpp index 35524d15c9e..e075a67d185 100644 --- a/src/mame/drivers/tabe22.cpp +++ b/src/mame/drivers/tabe22.cpp @@ -8,22 +8,22 @@ Hardware: - P8085AH - - SCN2674B with SCB2675T + - SCN2674B with SCB2675T - SCN2681 - P8251A - 3x HM6264LP-12 (8k) - 3x HM6116LP-2 (2k) - - XTAL: 3.6864 MHz, 10.0000 MHz, 21.7566 MHz, 35.8344 MHz + - XTAL: 3.6864 MHz, 10.0000 MHz, 21.7566 MHz, 35.8344 MHz TODO: - Dump keyboard controller and emulate it (currently HLE'd) - - NVRAM / memory layout - - Needs a hack to send out data on the RS232 port: - Set $f7a3 = 0 after startup + - NVRAM / memory layout + - Needs a hack to send out data on the RS232 port: + Set $f7a3 = 0 after startup Notes: - - The hardware has some similarities to cit220.cpp - - Everything here is guessed (including the system name), no docs available + - The hardware has some similarities to cit220.cpp + - Everything here is guessed (including the system name), no docs available ***************************************************************************/ @@ -257,12 +257,12 @@ void tabe22_state::tabe22(machine_config &config) m_vram_bank->set_data_width(8); m_vram_bank->set_stride(0x1000); -// NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); +// NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_color(rgb_t::amber()); m_screen->set_raw(21.7566_MHz_XTAL, 918, 0, 720, 395, 0, 378); // 80 column mode -// m_screen->set_raw(35.8344_MHz_XTAL, 1494, 0, 1188, 395, 0, 378); // 132 column mode +// m_screen->set_raw(35.8344_MHz_XTAL, 1494, 0, 1188, 395, 0, 378); // 132 column mode m_screen->set_screen_update(m_avdc, FUNC(scn2674_device::screen_update)); PALETTE(config, m_palette, FUNC(tabe22_state::palette), 4); diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index 71b32e0f448..fbcf8a82c6d 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -76,7 +76,7 @@ public: void impact_nonvideo_altreels(machine_config &config); DECLARE_INPUT_CHANGED_MEMBER(coin_changed); - template DECLARE_READ_LINE_MEMBER( coinsense_r ) { return (m_coinstate >> N) & 1; } + template DECLARE_READ_LINE_MEMBER( coinsense_r ) { return (m_coinstate >> N) & 1; } DECLARE_READ_LINE_MEMBER(hopper_b_0_r); DECLARE_READ_LINE_MEMBER(hopper_b_3_r); diff --git a/src/mame/layout/j5fairp.lay b/src/mame/layout/j5fairp.lay index f6a2dbcdb8c..aedb17d8872 100644 --- a/src/mame/layout/j5fairp.lay +++ b/src/mame/layout/j5fairp.lay @@ -2843,7 +2843,7 @@ diff --git a/src/mame/layout/j5popeye.lay b/src/mame/layout/j5popeye.lay index ffe968607c6..8dd82792f8c 100644 --- a/src/mame/layout/j5popeye.lay +++ b/src/mame/layout/j5popeye.lay @@ -3539,7 +3539,7 @@ diff --git a/src/mame/layout/j6roller10.lay b/src/mame/layout/j6roller10.lay index de123da4fb9..9be7925dae9 100644 --- a/src/mame/layout/j6roller10.lay +++ b/src/mame/layout/j6roller10.lay @@ -3522,7 +3522,7 @@ - + diff --git a/src/mame/layout/j6roller15.lay b/src/mame/layout/j6roller15.lay index d400bc2ba3a..4d114ae65f7 100644 --- a/src/mame/layout/j6roller15.lay +++ b/src/mame/layout/j6roller15.lay @@ -5533,7 +5533,7 @@ - + diff --git a/src/mame/layout/j6roller8.lay b/src/mame/layout/j6roller8.lay index 299b71b60b9..4a241ecc82a 100644 --- a/src/mame/layout/j6roller8.lay +++ b/src/mame/layout/j6roller8.lay @@ -3522,7 +3522,7 @@ - + diff --git a/src/mame/layout/jpmimpct.lay b/src/mame/layout/jpmimpct.lay index 58a54d07ff0..dc888bf4c7c 100644 --- a/src/mame/layout/jpmimpct.lay +++ b/src/mame/layout/jpmimpct.lay @@ -37,27 +37,27 @@ license:CC0 - + - + - + - + - + @@ -65,7 +65,7 @@ license:CC0 - + diff --git a/src/mame/layout/jpmsys5.lay b/src/mame/layout/jpmsys5.lay index 16de6e3db6e..931dce6f7a9 100644 --- a/src/mame/layout/jpmsys5.lay +++ b/src/mame/layout/jpmsys5.lay @@ -43,20 +43,20 @@ license:CC0 - + - + - + - + @@ -68,16 +68,16 @@ license:CC0 - + - + - + diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp index 19fa5669799..a29a0f55cc5 100644 --- a/src/mame/machine/k573mcr.cpp +++ b/src/mame/machine/k573mcr.cpp @@ -27,20 +27,20 @@ |-------------------------------| Notes: - DIP8 - 8-position DIP switch - CN61 - BS8PSHF1AA 8 pin connector, connects to memory card harness - CN62 - BS8PSHF1AA 8 pin connector - CN63 - 6P-SHVQ labeled "0", GE885-JB security dongle is connected here - CN64 - 6P-SHVQ labeled "1" - CN65 - B4PS-VH, 4 pin power connector - CN67 - BS15PSHF1AA, 15-pin connector, unpopulated - USB-A - USB-A connector - USB-B - USB-B connector, connects to USB on System 573 motherboard - ADM485JR - Analog Devices ADM485 low power EIA RS-485 transceiver - TMPR3904AF - Toshiba TMPR3904AF RISC Microprocessor - XCS05/10 - XILINX XCS10XL VQ100AKP9909 A2026631A - DRAM4M - Silicon Magic 66 MHz C9742 SM81C256K16CJ-35, 256K x 16 EDO DRAM - EP4M16 - ROM labeled "855-A01" + DIP8 - 8-position DIP switch + CN61 - BS8PSHF1AA 8 pin connector, connects to memory card harness + CN62 - BS8PSHF1AA 8 pin connector + CN63 - 6P-SHVQ labeled "0", GE885-JB security dongle is connected here + CN64 - 6P-SHVQ labeled "1" + CN65 - B4PS-VH, 4 pin power connector + CN67 - BS15PSHF1AA, 15-pin connector, unpopulated + USB-A - USB-A connector + USB-B - USB-B connector, connects to USB on System 573 motherboard + ADM485JR - Analog Devices ADM485 low power EIA RS-485 transceiver + TMPR3904AF - Toshiba TMPR3904AF RISC Microprocessor + XCS05/10 - XILINX XCS10XL VQ100AKP9909 A2026631A + DRAM4M - Silicon Magic 66 MHz C9742 SM81C256K16CJ-35, 256K x 16 EDO DRAM + EP4M16 - ROM labeled "855-A01" */ #include "emu.h" diff --git a/src/osd/eigccarm.h b/src/osd/eigccarm.h index 9458dff7c99..27d79c4a5c6 100644 --- a/src/osd/eigccarm.h +++ b/src/osd/eigccarm.h @@ -260,6 +260,7 @@ _count_leading_zeros(uint32_t value) } #endif + /*------------------------------------------------- count_leading_ones - return the number of leading one bits in a 32-bit value diff --git a/src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc b/src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc index 78229ec9c49..4c688c4d6f4 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0 /* Hyllian Smart-Blur Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -61,4 +61,4 @@ void main() } gl_FragColor = vec4(E, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc b/src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc index c82d7c82bec..1b967f894d4 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0 /* Hyllian Smart-Blur Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc index c5cfcbf2cdc..a060de88ddd 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc @@ -163,7 +163,7 @@ void main() // Of all the pixels that are mapped onto the texel we are // currently rendering, which pixel are we currently rendering? vec2 ratio_scale = xy * u_tex_size0.xy - vec2_splat(0.5); - + #ifdef OVERSAMPLE float filter = fwidth(ratio_scale.y); #endif @@ -179,7 +179,7 @@ void main() // Prevent division by zero. coeffs = FIX(coeffs); - + // Lanczos2 kernel. coeffs = 2.0 * sin(coeffs) * sin(coeffs / 2.0) / (coeffs * coeffs); @@ -193,7 +193,7 @@ void main() TEX2D(xy)*coeffs.y + TEX2D(xy +vec2(v_one.x, 0.0))*coeffs.z + TEX2D(xy + vec2(2.0 * v_one.x, 0.0))*coeffs.w , 0.0, 1.0); - + vec4 col2 = clamp(TEX2D(xy + vec2(-v_one.x, v_one.y))*coeffs.x + TEX2D(xy + vec2(0.0, v_one.y))*coeffs.y + TEX2D(xy + v_one)*coeffs.z + @@ -222,7 +222,7 @@ void main() // halation and corners vec3 blur = pow(texture2D(blur_texture,xy0).rgb, vec3_splat(CRTgamma.x)); mul_res = mix(mul_res, blur, halation.x) * vec3_splat(cval); - + // Convert the image gamma for display on our output device. mul_res = pow(mul_res, vec3_splat(1.0 / monitorgamma.x)); @@ -230,6 +230,6 @@ void main() xy = v_texCoord.xy * u_quad_dims.xy / u_tex_size1.xy; vec3 mask = texture2D(mask_texture, xy).rgb; mask = mix(vec3_splat(1.0), mask, aperture_strength.x); - + gl_FragColor = vec4(mul_res*mask, col.a); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc index 919ba46d0ab..658e745cf14 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc @@ -158,7 +158,7 @@ void main() // Of all the pixels that are mapped onto the texel we are // currently rendering, which pixel are we currently rendering? vec2 ratio_scale = xy * u_tex_size0.xy - vec2_splat(0.5); - + #ifdef OVERSAMPLE float filter = fwidth(ratio_scale.y); #endif @@ -174,7 +174,7 @@ void main() // Prevent division by zero. coeffs = FIX(coeffs); - + // Lanczos2 kernel. coeffs = 2.0 * sin(coeffs) * sin(coeffs / 2.0) / (coeffs * coeffs); @@ -188,7 +188,7 @@ void main() TEX2D(xy)*coeffs.y + TEX2D(xy +vec2(v_one.x, 0.0))*coeffs.z + TEX2D(xy + vec2(2.0 * v_one.x, 0.0))*coeffs.w , 0.0, 1.0); - + vec4 col2 = clamp(TEX2D(xy + vec2(-v_one.x, v_one.y))*coeffs.x + TEX2D(xy + vec2(0.0, v_one.y))*coeffs.y + TEX2D(xy + v_one)*coeffs.z + @@ -218,10 +218,10 @@ void main() mul_res = pow(mul_res, vec3_splat(1.0 / monitorgamma.x)); // Color the texel. - + xy = v_texCoord.xy * u_quad_dims.xy / u_tex_size1.xy; vec3 mask = texture2D(mask_texture, xy).rgb; mask = mix(vec3_splat(1.0), mask, aperture_strength.x); - + gl_FragColor = vec4(mul_res*mask, col.a); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc index f45d1d5df81..6c7c2c8560c 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc @@ -24,6 +24,6 @@ void main() sum += TEX2D(v_texCoord + vec2(+4.0 * onex, 0.0)) * vec3_splat(v_coeffs.w); float norm = 1.0 / (1.0 + 2.0*(v_coeffs.x+v_coeffs.y+v_coeffs.z+v_coeffs.w)); - + gl_FragColor = vec4( pow(sum*vec3_splat(norm), vec3_splat(1.0/u_gamma.x)), 1.0 ); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc index 107d1d7a5bb..f6044f4d8f9 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc @@ -24,6 +24,6 @@ void main() sum += TEX2D(v_texCoord + vec2(0.0, +4.0 * oney)) * vec3_splat(v_coeffs.w); float norm = 1.0 / (1.0 + 2.0*(v_coeffs.x+v_coeffs.y+v_coeffs.z+v_coeffs.w)); - + gl_FragColor = vec4( pow(sum*vec3_splat(norm), vec3_splat(1.0/u_gamma.x)), 1.0 ); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc index 7244bef7f55..507bbd05064 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc @@ -23,6 +23,6 @@ void main() cphos *= vec3_splat( u_phosphor_amplitude.x * pow(t,-u_phosphor_power.x) ); vec3 col = pow(cscrn + cphos, vec3_splat(1.0/u_gamma.x)); - + gl_FragColor = vec4(col, 1.0); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc index 034ca88185b..8ba2cef453e 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc @@ -1,6 +1,6 @@ vec2 v_texCoord : TEXCOORD0 = vec2(0.0, 0.0); vec3 v_stretch : TEXCOORD1 = vec3(0.0,0.0,0.0); -vec2 v_sinangle : TEXCOORD2 = vec2(0.0,0.0); +vec2 v_sinangle : TEXCOORD2 = vec2(0.0,0.0); vec2 v_cosangle : TEXCOORD3 = vec2(0.0,0.0); vec2 v_one : TEXCOORD4 = vec2(0.0,0.0); vec4 v_coeffs : TEXCOORD5 = vec4(0.0,0.0,0.0,0.0); diff --git a/src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc b/src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc index 37a119ec7d4..6dead210d9e 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc @@ -37,9 +37,9 @@ void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_texcoord0 = a_texcoord0; - + onex = vec2(1.0 / u_source_size.x, 0.0); oney = vec2(0.0, 1.0 / u_source_size.y); - + v_color0 = a_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc index a07a848ffbd..5219614c794 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc @@ -7,7 +7,7 @@ $input v_color0, texCoord, t1, t2, t3, t4, t5, t6, t7, t8 /* Copied from the Dosbox source code */ /* Copyright (C) 2002-2007 The DOSBox Team */ /* License: GNU-GPL */ -/* Adapted by guest(r) on 16.4.2007 */ +/* Adapted by guest(r) on 16.4.2007 */ #include "common.sh" @@ -32,10 +32,10 @@ float GET_RESULT(float A, float B, float C, float D) float r = 0.0; if (A == C) x += 1.0; else if (B == C) y += 1.0; if (A == D) x += 1.0; else if (B == D) y += 1.0; - if (x <= 1.0) r += 1.0; + if (x <= 1.0) r += 1.0; if (y <= 1.0) r -= 1.0; return r; -} +} void main() { @@ -43,7 +43,7 @@ void main() // Reading the texels - vec3 C0 = texture2D(decal, t1.xy).xyz; + vec3 C0 = texture2D(decal, t1.xy).xyz; vec3 C1 = texture2D(decal, t1.zw).xyz; vec3 C2 = texture2D(decal, t2.xy).xyz; vec3 D3 = texture2D(decal, t2.zw).xyz; @@ -62,7 +62,7 @@ void main() vec3 p00,p10,p01,p11; - // reducing float3 to float + // reducing float3 to float float c0 = reduce(C0); float c1 = reduce(C1); float c2 = reduce(C2); float c3 = reduce(C3); float c4 = reduce(C4); float c5 = reduce(C5); @@ -76,7 +76,7 @@ void main() /* Copied from the Dosbox source code */ /* Copyright (C) 2002-2007 The DOSBox Team */ /* License: GNU-GPL */ - /* Adapted by guest(r) on 16.4.2007 */ + /* Adapted by guest(r) on 16.4.2007 */ if (c4 != c8) { if (c7 == c5) @@ -158,8 +158,8 @@ void main() } } } - + p10 = (fp.x < 0.50) ? (fp.y < 0.50 ? p00 : p10) : (fp.y < 0.50 ? p01: p11); - + gl_FragColor = vec4(p10.rgb, 1.0); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc index d233629a036..1ab076dfa73 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc @@ -8,7 +8,7 @@ $output v_color0, texCoord, t1, t2, t3, t4, t5, t6, t7, t8 /* Copied from the Dosbox source code */ /* Copyright (C) 2002-2007 The DOSBox Team */ /* License: GNU-GPL */ -/* Adapted by guest(r) on 16.4.2007 */ +/* Adapted by guest(r) on 16.4.2007 */ #include "common.sh" @@ -19,7 +19,7 @@ void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_color0 = a_color0; - + vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy; float dx = ps.x; float dy = ps.y; diff --git a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc index 36f4fa9eaad..47201c0661d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc @@ -183,7 +183,7 @@ void main() // corner distortion at least by the amount of the image distorition float distortCornerAmount = max(u_distort_corner.x, u_distortion.x + u_cubic_distortion.x); - float roundCornerAmount = u_round_corner.x * 0.5; + float roundCornerAmount = u_round_corner.x * 0.5; float smoothBorderAmount = u_smooth_border.x * 0.5; vec2 TexelDims = vec2(1.0 / u_target_dims.x, 1.0 / u_target_dims.y); diff --git a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc index b196674a094..60b54381ec3 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc @@ -52,7 +52,7 @@ void main() vec4 PI = vec4(3.1415927, 3.1415927, 3.1415927, 3.1415927); vec4 PI2 = vec4(6.2831854, 6.2831854, 6.2831854, 6.2831854); - + vec4 Fc_y1 = (u_cc_value.xxxx - u_notch_width.xxxx * onehalf) * TimePerSample; vec4 Fc_y2 = (u_cc_value.xxxx + u_notch_width.xxxx * onehalf) * TimePerSample; vec4 Fc_y3 = u_y_freq_response.xxxx * TimePerSample; @@ -69,7 +69,7 @@ void main() vec4 Fc_y2_pi2 = Fc_y2 * PI2; vec4 Fc_y3_pi2 = Fc_y3 * PI2; vec4 PI2Length = PI2 / SampleCount; - + vec4 W = PI2 * u_cc_value.xxxx * u_scan_time.xxxx; vec4 WoPI = W / PI; @@ -120,7 +120,7 @@ void main() IAccum = IAccum + C * cos(WT) * FilterI; QAccum = QAccum + C * sin(WT) * FilterQ; } - + vec3 YIQ = vec3( (YAccum.r + YAccum.g + YAccum.b + YAccum.a), (IAccum.r + IAccum.g + IAccum.b + IAccum.a) * 2.0, diff --git a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc index 61964c10c30..e94eeff6962 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc @@ -58,7 +58,7 @@ void main() const float PI = 3.1415927; const float PI2 = 6.2831854; - + float W = PI2 * u_cc_value.x * u_scan_time.x; float WoPI = W / PI; @@ -69,4 +69,4 @@ void main() vec4 TW = T * W; gl_FragColor = Y + I * cos(TW) + Q * sin(TW); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc index 38f81111567..479ed825a8b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc @@ -57,7 +57,7 @@ void main() mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9)); vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8)); - + vec2 index; index.x = dot(pattern[0], vec3( 1.0, 2.0, 4.0)) + dot(pattern[1], vec3( 8.0, 0.0, 16.0)) + diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc index a29c2c00da8..1d35cec01e6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc @@ -57,7 +57,7 @@ void main() mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9)); vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8)); - + vec2 index; index.x = dot(pattern[0], vec3( 1.0, 2.0, 4.0)) + dot(pattern[1], vec3( 8.0, 0.0, 16.0)) + diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc index e6c0e1c2aaa..6f25b0e9cc3 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc @@ -57,7 +57,7 @@ void main() mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9)); vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8)); - + vec2 index; index.x = dot(pattern[0], vec3( 1.0, 2.0, 4.0)) + dot(pattern[1], vec3( 8.0, 0.0, 16.0)) + diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc index a77ac7006f7..dcff07b17f5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc @@ -13,7 +13,7 @@ void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_color0 = a_color0; - + vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy; float dx = ps.x; float dy = ps.y; diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc index a77ac7006f7..dcff07b17f5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc @@ -13,7 +13,7 @@ void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_color0 = a_color0; - + vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy; float dx = ps.x; float dy = ps.y; diff --git a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc index a77ac7006f7..dcff07b17f5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc @@ -13,7 +13,7 @@ void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); v_color0 = a_color0; - + vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy; float dx = ps.x; float dy = ps.y; diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc index 45d38a0e020..d69e9a8f7bc 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc @@ -7,7 +7,7 @@ $input v_color0, v_texcoord0 Bob-and-ghost Deinterlacing Author: hunterk License: Public domain - + Note: This shader is designed to work with the typical interlaced output from an emulator, which displays both even and odd fields twice. As such, it is inappropriate for general video use unless the video has already been similarly woven beforehand. */ @@ -30,7 +30,7 @@ void main() float y; // assume anything with a vertical resolution greater than 400 lines is interlaced - if (u_tex_size0.y > 400.0) + if (u_tex_size0.y > 400.0) { y = u_tex_size0.y * v_texcoord0.y;// FIXME + IN.frame_count; res = pow(vec4(texture2D(s0, v_texcoord0 + vec2(0.0, one_pixel.y))), exponent); @@ -50,6 +50,6 @@ void main() { res = vec4(pow(texture2D(s0, v_texcoord0), exponent)); } - + gl_FragColor = vec4(pow((res + color) / 2.0, inv_exponent)); } diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc index cbff9f450e8..3e58af492c6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc @@ -5,7 +5,7 @@ $input v_color0, v_texcoord0, v_texcoord1 /* Hyllian's Deposterize Shader - Pass0 - + Copyright (C) 2011/2016 Hyllian/Jararaca - sergiogdb@gmail.com */ diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc index c6e0e87b018..8fdd168a262 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc @@ -5,7 +5,7 @@ $input v_color0, v_texcoord0, v_texcoord1 /* Hyllian's Deposterize Shader - Pass1 - + Copyright (C) 2011/2016 Hyllian/Jararaca - sergiogdb@gmail.com */ diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc index 1c3b3ee592f..f46bf23b063 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's Deposterize Shader - Pass0 vertex shader - + Copyright (C) 2011/2016 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -22,7 +22,7 @@ void main() vec2 ps = vec2(1.0 / u_tex_size0.xy); float dx = ps.x; float dy = ps.y; - + // This line fixes a bug in ATI cards. v_texcoord0 = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4(-dx, 0, dx, 0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc index 7af87394655..486edf97c5c 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's Deposterize Shader - Pass1 vertex shader - + Copyright (C) 2011/2016 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -22,7 +22,7 @@ void main() vec2 ps = vec2(1.0 / u_tex_size0.xy); float dx = ps.x; float dy = ps.y; - + // This line fixes a bug in ATI cards. v_texcoord0 = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xyyy + vec4(0, -dy, 0, dy); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc index 5375561e8ac..cb6ecf95f0d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc @@ -22,7 +22,7 @@ SAMPLER2D(s_tex, 0); void main() { vec4 sum = vec4(0.0, 0.0, 0.0, 0.0); - + vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy; sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133; diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc index 5375561e8ac..cb6ecf95f0d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc @@ -22,7 +22,7 @@ SAMPLER2D(s_tex, 0); void main() { vec4 sum = vec4(0.0, 0.0, 0.0, 0.0); - + vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy; sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133; diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc index 5375561e8ac..cb6ecf95f0d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc @@ -22,7 +22,7 @@ SAMPLER2D(s_tex, 0); void main() { vec4 sum = vec4(0.0, 0.0, 0.0, 0.0); - + vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy; sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133; diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc index 5375561e8ac..cb6ecf95f0d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc @@ -22,7 +22,7 @@ SAMPLER2D(s_tex, 0); void main() { vec4 sum = vec4(0.0, 0.0, 0.0, 0.0); - + vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy; sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133; diff --git a/src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc index 3f03d8e6adb..d4ba6141c82 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_color0 /* Hyllian's dilation-horizontal-fast Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -43,4 +43,4 @@ void main() vec3 res = max(E, max(F, D)); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc index 828dc3078cf..9433c8359be 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's dilation-horizontal-fast Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -41,9 +41,9 @@ void main() vec2 ps = 1.0 / u_tex_size0.xy; float dx = ps.x; float dy = ps.y; - // B - // D E F - // H + // B + // D E F + // H v_texcoord1 = vec4(1.0 / u_tex_size0.xy, 0.0, 0.0); // F H diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc index 72212fa74a7..1963dfcd617 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR-lv1-noblend Shader - + Copyright (C) 2011-2014 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -129,4 +129,4 @@ void main() // final sum and weight normalization gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc index d9e44f0d4c7..988699a2642 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR-lv2-3d Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -176,7 +176,7 @@ void main() vec4 Ci = vec4(0.25, 0.25, 0.25, 0.25); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -231,13 +231,13 @@ void main() vec3 res1 = E.xyz; res1 = mix(res1, mix(H.xyz, F.xyz, px.x), maximos.x); res1 = mix(res1, mix(B.xyz, D.xyz, px.z), maximos.z); - + vec3 res2 = E.xyz; res2 = mix(res2, mix(F.xyz, B.xyz, px.y), maximos.y); res2 = mix(res2, mix(D.xyz, H.xyz, px.w), maximos.w); - + vec3 E_mix = (c_df(E.xyz, res2) >= c_df(E.xyz, res1)) ? vec3(1.0, 1.0, 1.0) : vec3(0.0, 0.0, 0.0); vec3 res = mix(res1, res2, E_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc index 1b47172209e..b4d461cfca0 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0 /* Hyllian's xBR-lv2-lq Shader - + Copyright (C) 2011/2015 Hyllian/Jararaca - sergiogdb@gmail.com Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com @@ -121,7 +121,7 @@ void main() vec4 Ci = vec4(0.25, 0.25, 0.25, 0.25); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -166,13 +166,13 @@ void main() vec3 res1 = E.xyz; res1 = mix(res1, mix(H.xyz, F.xyz, px.x), maximos.x); res1 = mix(res1, mix(B.xyz, D.xyz, px.z), maximos.z); - + vec3 res2 = E.xyz; res2 = mix(res2, mix(F.xyz, B.xyz, px.y), maximos.y); res2 = mix(res2, mix(D.xyz, H.xyz, px.w), maximos.w); - + vec3 E_mix = (c_df(E.xyz, res2) >= c_df(E.xyz, res1)) ? vec3(1.0, 1.0, 1.0) : vec3(0.0, 0.0, 0.0); vec3 res = mix(res1, res2, E_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc index 80d7269349e..3168daf2ba8 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR-lv2-noblend Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -148,7 +148,7 @@ void main() #endif interp_restriction_lv1 = clamp(interp_restriction_lv1, 0.0, 1.0); - + vec4 interp_restriction_lv2_left = vec4(notEqual(e,g)) * vec4(notEqual(d,g)); vec4 interp_restriction_lv2_up = vec4(notEqual(e,c)) * vec4(notEqual(b,c)); @@ -174,4 +174,4 @@ void main() vec3 res = mix(res1, res2, res_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc index 0294c56b84f..75a6dd3296f 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR-lv2 Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -136,10 +136,10 @@ void main() vec4 Ci = vec4(0.25, 0.25, 0.25, 0.25); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); - + vec4 interp_restriction_lv0 = vec4(notEqual(e,f)) * vec4(notEqual(e,h)); vec4 interp_restriction_lv1 = interp_restriction_lv0; @@ -191,7 +191,7 @@ void main() vec3 res1 = E.xyz; res1 = mix(res1, mix(H.xyz, F.xyz, px.x), maximos.x); res1 = mix(res1, mix(B.xyz, D.xyz, px.z), maximos.z); - + vec3 res2 = E.xyz; res2 = mix(res2, mix(F.xyz, B.xyz, px.y), maximos.y); res2 = mix(res2, mix(D.xyz, H.xyz, px.w), maximos.w); @@ -200,4 +200,4 @@ void main() vec3 res = mix(res1, res2, E_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc index 554c222db47..b13606724e5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR-lv3-noblend - Shader - + Copyright (C) 2011/2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -175,7 +175,7 @@ void main() #endif interp_restriction_lv1 = clamp(interp_restriction_lv1, 0.0, 1.0); - + vec4 interp_restriction_lv2_left = vec4(notEqual(e,g)) * vec4(notEqual(d,g)); vec4 interp_restriction_lv2_up = vec4(notEqual(e,c)) * vec4(notEqual(b,c)); vec4 interp_restriction_lv3_left = eq2(g,g0) * vec4(notEqual(d0,g0)); @@ -186,11 +186,11 @@ void main() vec4 one = vec4(1.0, 1.0, 1.0, 1.0); vec4 zero = vec4(0.0, 0.0, 0.0, 0.0); - + vec4 edri = vec4(lessThanEqual(wd1,wd2)) * interp_restriction_lv1; vec4 edr = vec4(lessThan(wd1,wd2)) * interp_restriction_lv1 * ((1.0 - edri.yzwx) + (1.0 - edri.wxyz)); edr = clamp(edr, 0.0, 1.0); - + vec4 hcDiff = df(h,c); vec4 fgDiff = df(f,g); vec4 edr_left = vec4(lessThanEqual(XBR_LV2_COEFFICIENT.xxxx * fgDiff, hcDiff)) * interp_restriction_lv2_left * edr * (1.0 - edri.yzwx) * eq(e,c); @@ -210,4 +210,4 @@ void main() vec3 res = mix(res1, res2, (df12.y >= df12.x) ? one.xyz : zero.xyz); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc index 162461d145b..e6a4eb79edb 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR-lv3 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -154,7 +154,7 @@ void main() vec4 Cw = vec4( 5.0, -1.0, -3.0, 3.0 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao * fp.y + Bo * fp.x); + vec4 fx = (Ao * fp.y + Bo * fp.x); vec4 fx_left = (Ax * fp.y + Bx * fp.x); vec4 fx_up = (Ay * fp.y + By * fp.x); vec4 fx3_left= (Az * fp.y + Bz * fp.x); @@ -189,7 +189,7 @@ void main() vec4 edr = vec4(lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance( h, d, i5, f, i4, b, e, i))) * interp_restriction_lv1; vec4 edr_left = vec4(lessThanEqual(XBR_LV2_COEFFICIENT.xxxx * df(f,g), df(h,c))) * interp_restriction_lv2_left; vec4 edr_up = vec4(greaterThanEqual(df(f,g), XBR_LV2_COEFFICIENT.xxxx * df(h,c))) * interp_restriction_lv2_up; - + vec4 edr3_left = interp_restriction_lv3_left; vec4 edr3_up = interp_restriction_lv3_up; @@ -232,4 +232,4 @@ void main() vec3 res = mix(res1, res2, E_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc index 0abd7ff41c9..fdf14bd393b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_color0 /* Hyllian's jinc windowed-jinc 2-lobe sharper with anti-ringing Shader - + Copyright (C) 2011-2014 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -22,10 +22,10 @@ SAMPLER2D(s_p, 0); This is an approximation of Jinc(x)*Jinc(x*r1/r2) for x < 2.5, where r1 and r2 are the first two zeros of jinc function. For a jinc 2-lobe best approximation, use A=0.5 and B=0.825. - */ + */ // A=0.5, B=0.825 is the best jinc approximation for x<2.5. if B=1.0, it's a lanczos filter. -// Increase A to get more blur. Decrease it to get a sharper picture. +// Increase A to get more blur. Decrease it to get a sharper picture. // B = 0.825 to get rid of dithering. Increase B to get a fine sharpness, though dithering returns. #define halfpi 1.5707963267948966192313216916398 @@ -131,4 +131,4 @@ void main() // final sum and weight normalization gl_FragColor = vec4(color, 1); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc index 8fa47570af5..9e5520740c2 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR 3D Shader - pass0 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -224,4 +224,4 @@ void main() color = block_3d ? color : E.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc index 72009ad3335..2af3f086523 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR 3D Shader - pass0 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -208,4 +208,4 @@ void main() color = block_3d ? color : A; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc index c2656424ed6..1f205de0a1b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR 3D Shader - pass2 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -210,4 +210,4 @@ void main() color = block_3d ? color : A.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc index 8a56a3899a6..389435952a7 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass0 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -214,4 +214,4 @@ void main() color = block_3d ? color : E.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc index 10288b45f5a..1c805080595 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass1 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -207,4 +207,4 @@ void main() color = block_3d ? color : A.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc index 51f2c6ea887..4587dc9cc93 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass1 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -208,4 +208,4 @@ void main() color = block_3d ? color : A.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc index f1566381325..1f9727021d7 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass2 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -223,4 +223,4 @@ void main() color = block_3d ? color : E.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc index 3aa921a0e37..3e06eb4da47 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass3 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -207,4 +207,4 @@ void main() color = block_3d ? color : A.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc index b417613a657..2b119f5d066 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color0 // copyright-holders:Hyllian /* - + ******* Super 4XBR 3D Shader - pass3 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -208,4 +208,4 @@ void main() color = block_3d ? color : A.xyz; gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc index 84fc371a0a7..45bfdb1543b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -161,9 +161,9 @@ void main() vec4 d_mix = d_edge >= 0.0 ? vec4(1.0, 1.0, 1.0, 1.0) : vec4(0.0, 0.0, 0.0, 0.0); vec4 min_sample = min4(E, F, H, I) + anti_ring * mix((P2-H)*(F-P1), (P0-E)*(I-P3), d_mix); vec4 max_sample = max4(E, F, H, I) - anti_ring * mix((P2-H)*(F-P1), (P0-E)*(I-P3), d_mix); - + color = clamp(color, min_sample.xyz, max_sample.xyz); // color = mix(aux, color, 1-2.0*abs(edge_strength-0.5)); gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc index d67c215de66..0248c9f2357 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass1 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -155,5 +155,5 @@ void main() color = clamp(color, min_sample.xyz, max_sample.xyz); // color = mix(aux, color, 1-2.0*abs(edge_strength-0.5)); - gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file + gl_FragColor = vec4(color, 1.0); +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc index 89e82d00a31..546525c861d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass1 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -158,5 +158,5 @@ void main() color = clamp(color, min_sample.xyz, max_sample.xyz); // color = mix(aux, color, 1-2.0*abs(edge_strength-0.5)); - gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file + gl_FragColor = vec4(color, 1.0); +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc index a1158ebecca..ebae083c9c5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -157,4 +157,4 @@ void main() color = clamp(color, min_sample.xyz, max_sample.xyz); gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc index 421fc78b58c..c99b19376cd 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass1 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -174,5 +174,5 @@ void main() vec4 max_sample = max4(E, F, H, I) - anti_ring * mix((P2-H)*(F-P1), (P0-E)*(I-P3), d_mix); color = clamp(color, min_sample.xyz, max_sample.xyz); - gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file + gl_FragColor = vec4(color, 1.0); +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc index c343dc155a2..0ac5170af33 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc @@ -4,9 +4,9 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass1 ******* - + Copyright (c) 2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -166,5 +166,5 @@ void main() vec4 max_sample = max4(E, F, H, I) - anti_ring * mix((P2-H)*(F-P1), (P0-E)*(I-P3), d_mix); color = clamp(color, min_sample.xyz, max_sample.xyz); - gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file + gl_FragColor = vec4(color, 1.0); +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc index ae3b049b57a..1c3ee6a8f23 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color // copyright-holders:Hyllian /* - + ******* Super XBR 3D Shader - pass2 ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc index 67e2a4d6250..5827f1999b8 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc index d76ec041199..60637684154 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass1 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc index 579ee064622..2cfe541e2b8 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass2 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc index f03cc46e2b7..d10c9c24665 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc index 67e2a4d6250..5827f1999b8 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_color0 // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc index 51ffe87fcaa..9ae87c8a7ea 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc index 51ffe87fcaa..9ae87c8a7ea 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc @@ -5,9 +5,9 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_color // copyright-holders:Hyllian /* - + ******* Super XBR Shader - pass0 vertex shader ******* - + Copyright (c) 2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc index 75541985e36..cfc1a7cfc47 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR-lv2-noblend Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc index 5421eaf2955..114f1669ad1 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR-lv3-noblend - Shader - + Copyright (C) 2011/2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc index f4ee1f55ab3..3d72da14478 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR-lv3 - Shader - + Copyright (C) 2011/2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc index 533bfe0f762..6843efd251a 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.7c+ReverseAA (squared) Shader - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -171,7 +171,7 @@ void main() vec3 s = E.xyz; vec3 n3 = H.xyz; vec3 n4 = H5.xyz; - + vec3 aa = n2 - n1; vec3 bb = s - n2; vec3 cc = n3 - s; @@ -192,7 +192,7 @@ void main() s = s1; n3 = F.xyz; n4 = F4.xyz; - + aa = n2 - n1; bb = s - n2; cc = n3 - s; @@ -333,4 +333,4 @@ void main() } gl_FragColor = vec4(res.xyz, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc index ea58584408b..46b2c3d9162 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta1 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -176,7 +176,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -262,4 +262,4 @@ void main() res = mix(res, pix, blend); gl_FragColor = vec4(clamp(GAMMA_OUT(res), 0.0, 1.0), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc index a4e59937d54..cbb6659d0cd 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - Dithering preserved - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -169,7 +169,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -252,4 +252,4 @@ void main() res = mix(res, pix, blend); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc index 254e8d878cb..45113f32e80 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta3 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -182,7 +182,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -223,7 +223,7 @@ void main() m = min(m, sharpness * abs(bb)); m = min(m, sharpness * abs(cc)); t = clamp(t, -m, m); - + vec3 s1 = (2.0 * fp.y - 1.0) * t + s; n1 = D0.xyz; @@ -278,4 +278,4 @@ void main() res = mix(res1, res2, step(c_df(E.xyz, res1), c_df(E.xyz, res2))); gl_FragColor = vec4(clamp(GAMMA_OUT(res), 0.0, 1.0), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc index e3791fed702..efc8c57d752 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - v4 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -175,7 +175,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -216,7 +216,7 @@ void main() m = min(m, sharpness * abs(bb)); m = min(m, sharpness * abs(cc)); t = clamp(t, -m, m); - + vec3 s1 = (2.0 * fp.y - 1.0) * t + s; n1 = D0.xyz; @@ -268,4 +268,4 @@ void main() res = mix(res1, res2, step(c_df(E.xyz, res1), c_df(E.xyz, res2))); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc index 858342d25c6..0beb806443b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8b+ReverseAA (semi-rounded) Shader - v4 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -160,7 +160,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -201,7 +201,7 @@ void main() m = min(m, sharpness * abs(bb)); m = min(m, sharpness * abs(cc)); t = clamp(t, -m, m); - + vec3 s1 = (2.0 * fp.y - 1.0) * t + s; n1 = D0.xyz; @@ -253,4 +253,4 @@ void main() res = mix(res1, res2, step(c_df(E.xyz, res1), c_df(E.xyz, res2))); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc index 1a4ad25e765..4e3c20169ec 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta3 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -182,7 +182,7 @@ void main() vec4 Cy = vec4( 2.0, 0.0, -1.0, 0.5 ); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -223,7 +223,7 @@ void main() m = min(m, sharpness * abs(bb)); m = min(m, sharpness * abs(cc)); t = clamp(t, -m, m); - + vec3 s1 = (2.0 * fp.y - 1.0) * t + s; n1 = D0.xyz; @@ -285,4 +285,4 @@ void main() res = mix(res, pix, blend); gl_FragColor = vec4(clamp(GAMMA_OUT(res), 0.0, 1.0), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc index bf3af2de385..aff101a1212 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's 2xBR v3.7c+ReverseAA (squared) Shader - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -176,7 +176,7 @@ void main() vec3 s = E.xyz; vec3 n3 = H.xyz; vec3 n4 = H5.xyz; - + vec3 aa = n2 - n1; vec3 bb = s - n2; vec3 cc = n3 - s; @@ -189,7 +189,7 @@ void main() m = min(m, 2.0 * abs(cc)); vec3 sim1 = (gt3(abs(bb) * 2.0, threshold) + gt3(abs(cc) * 2.0, threshold) + le3(abs(bb) * 2.0, xx) + le3(abs(cc) * 2.0, xx)); t = clamp(t, -m, m); - + vec3 s1 = (2.0 * fp.y - 1.0) * t + s; n1 = D0.xyz; @@ -197,7 +197,7 @@ void main() s = s1; n3 = F.xyz; n4 = F4.xyz; - + aa = n2 - n1; bb = s - n2; cc = n3 - s; @@ -338,4 +338,4 @@ void main() } gl_FragColor = vec4(res.xyz, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc index 339c44e284c..c09b7b66d1c 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.7c+ReverseAA (squared) Shader - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc index 9d5468107dd..2be09e52908 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta1 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc index 8e73b14f713..2ec42c6585d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - Dithering preserved - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc index b4509adf38c..f40310aa1b9 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta3 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc index b00c03fbce3..e363aba2eb4 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - v4 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc index 2a33ced4126..8f9c58be4c1 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8b+ReverseAA (semi-rounded) Shader - v4 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc index b4509adf38c..f40310aa1b9 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - beta3 - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc index 339c44e284c..c09b7b66d1c 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's 2xBR v3.7c+ReverseAA (squared) Shader - + Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com */ @@ -60,7 +60,7 @@ void main() // G5 H5 I5 // This line fix a bug in ATI cards. - vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); + vec2 texCoord = a_texcoord0 + vec2(0.0000001, 0.0000001); v_texcoord1 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx,-2.0*dy); // A1 B1 C1 v_texcoord2 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, -dy); // A B C v_texcoord3 = v_texcoord0.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc index 5af6ea86cc4..37759601aad 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR LV2 A (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -156,4 +156,4 @@ void main() info.z = dot(edr_up, vec4(8.0, 4.0, 2.0, 1.0)); gl_FragColor = vec4(remapTo01(info, vec3(0.0, 0.0, 0.0), vec3(255.0, 255.0, 255.0)), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc index 668922ec18c..5c1fb0c9d47 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR LV2 Accuracy - pass0 Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -171,4 +171,4 @@ void main() info.w = dot(edri, vec4(8.0, 4.0, 2.0, 1.0)); gl_FragColor = remapTo01(info, vec4(0.0, 0.0, 0.0, 0.0), vec4(255.0, 255.0, 255.0, 255.0)); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc index a32605fca4e..19ebe21366f 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 Accuracy - pass1 Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -85,7 +85,7 @@ vec4 unpack_info(float i) float frac_val = fract(i / 2.0f); info.w = round(frac_val); i = i / 2.0f - frac_val; - + frac_val = fract(i / 2.0f); info.z = round(frac_val); i = i / 2.0f - frac_val; @@ -118,7 +118,7 @@ void main() mat4 h = mat4(H, F, B, D); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -148,13 +148,13 @@ void main() vec4 res1 = E; res1 = mix(res1, mix(H, F, px.x), maximos.x); res1 = mix(res1, mix(B, D, px.z), maximos.z); - + vec4 res2 = E; res2 = mix(res2, mix(F, B, px.y), maximos.y); res2 = mix(res2, mix(D, H, px.w), maximos.w); - + vec3 E_mix = (df1(E, res2) >= df1(E, res1)) ? vec3(1.0, 1.0, 1.0) : vec3(0.0, 0.0, 0.0); vec3 res = mix(res1.xyz, res2.xyz, E_mix); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc index 9f9c2836454..0b51db92660 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR LV2 B (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -157,4 +157,4 @@ void main() info.z = dot(edr_up, vec4(8.0, 4.0, 2.0, 1.0)); gl_FragColor = vec4(remapTo01(info, vec3(0.0, 0.0, 0.0), vec3(255.0, 255.0, 255.0)), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc index e7cc84b299d..c03b2f83af4 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR LV2 C (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -119,15 +119,15 @@ void main() vec4 interp_restriction_lv1 = clamp(vec4(notEqual(e,f)) * vec4(notEqual(e,h)) * ( neq(f,b) * neq(f,c) + neq(h,d) * neq(h,g) + eq(e,i) * (neq(f,f4) * neq(f,i4) + neq(h,h5) * neq(h,i5)) + eq(e,g) + eq(e,c)), vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0)); vec4 interp_restriction_lv2_left = vec4(notEqual(e,g)) * vec4(notEqual(d,g)); vec4 interp_restriction_lv2_up = vec4(notEqual(e,c)) * vec4(notEqual(b,c)); - + vec4 edr = vec4(lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance(h, d, i5, f, i4, b, e, i))) * interp_restriction_lv1; vec4 edr_left = vec4(lessThanEqual(coef * df(f,g), df(h,c))) * interp_restriction_lv2_left * edr; vec4 edr_up = vec4(greaterThanEqual(df(f,g), coef * df(h,c))) * interp_restriction_lv2_up * edr; - + vec3 info; info.x = dot(edr, vec4(8.0, 4.0, 2.0, 1.0)); info.y = dot(edr_left, vec4(8.0, 4.0, 2.0, 1.0)); info.z = dot(edr_up, vec4(8.0, 4.0, 2.0, 1.0)); gl_FragColor = vec4(remapTo01(info, vec3(0.0, 0.0, 0.0), vec3(255.0, 255.0, 255.0)), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc index c168b2622a7..e19f6be1eca 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR LV2 D (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -149,7 +149,7 @@ void main() vec4 interp_restriction_lv2_up = (ne(e,c) * ne(b,c)); interp_restriction_lv1 = clamp(interp_restriction_lv1, 0.0, 1.0); - + vec4 edr = lt(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance(h, d, i5, f, i4, b, e, i)) * interp_restriction_lv1; vec4 edr_left = le(coef * df(f,g), df(h,c)) * interp_restriction_lv2_left * edr; vec4 edr_up = ge(df(f,g), coef * df(h,c)) * interp_restriction_lv2_up * edr; @@ -160,4 +160,4 @@ void main() info.z = dot(vec4(edr_up ), vec4(8.0, 4.0, 2.0, 1.0)); gl_FragColor = vec4(remapTo01(info, vec3(0.0, 0.0, 0.0), vec3(255.0, 255.0, 255.0)), 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc index c46dd90ba0a..4d15482b4c6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 - noblend - pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -94,7 +94,7 @@ vec4 unpack_info(float i) float frac_val = fract(i / 2.0f); info.w = round(frac_val); i = i / 2.0f - frac_val; - + frac_val = fract(i / 2.0f); info.z = round(frac_val); i = i / 2.0f - frac_val; @@ -159,4 +159,4 @@ void main() vec3 res = mix(res1, res2, step(df12.x, df12.y)); gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc index 6316e485725..b5de4e02fbf 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 - pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -57,7 +57,7 @@ vec4 unpack_info(float i) float frac_val = fract(i / 2.0f); info.w = round(frac_val); i = i / 2.0f - frac_val; - + frac_val = fract(i / 2.0f); info.z = round(frac_val); i = i / 2.0f - frac_val; @@ -100,7 +100,7 @@ void main() vec4 Cy = vec4(2.0, 0.0, -1.0, 0.5); // These inequations define the line below which interpolation occurs. - vec4 fx = (Ao*fp.y+Bo*fp.x); + vec4 fx = (Ao*fp.y+Bo*fp.x); vec4 fx_left = (Ax*fp.y+Bx*fp.x); vec4 fx_up = (Ay*fp.y+By*fp.x); @@ -128,7 +128,7 @@ void main() mat4 pix = mat4(mix(E, mix(H, F, px.x), maximo.x), mix(E, mix(F, B, px.y), maximo.y), mix(E, mix(B, D, px.z), maximo.z), mix(E, mix(D, H, px.w), maximo.w)); vec4 pixel = instMul(yuv_weighted, pix); - + vec4 diff = df(pixel,e); vec3 res = pix[0].xyz; @@ -150,4 +150,4 @@ void main() } gl_FragColor = vec4(res, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc index 3a80bf6f7bb..59ffb0a026a 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR LV2 A (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc index 4cd8b064523..5c20062823a 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR LV2 Accuracy - pass0 Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc index c20050aa1f4..fbb10ec9ea5 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 Accuracy - pass1 Shader - + Copyright (C) 2011-2016 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc index 5515f4f4904..afdcf872331 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR LV2 B (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc index 9d0b7161844..ba0da15a70d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR LV2 C (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc index 8f9b4f316d9..bfd5e4a6414 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR LV2 D (squared) - pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc index 86df31a48e4..b85cca1828d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 - noblend - pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc index d678e8b0541..11042eab09a 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR LV2 - pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc index e9328bb4015..4331c2353f6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR level 3 pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -213,4 +213,4 @@ void main() lin0.w, lin1.w, lin2.w, lin3.w)); gl_FragColor = vec4(remapTo01(info, vec4(255.0, 255.0, 255.0, 255.0))); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc index df6d0a72265..407aaf2aaf6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc @@ -5,7 +5,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR level 3 pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -70,7 +70,7 @@ vec4 unpack_info(float i) float frac_val = fract(i / 2.0f); info.w = round(frac_val); i = i / 2.0f - frac_val; - + frac_val = fract(i / 2.0f); info.z = round(frac_val); i = i / 2.0f - frac_val; @@ -124,7 +124,7 @@ void main() info_nr = info_nr / 2.0 - frac_val; info_nr = info_nr / 2.0 - fract(info_nr / 2.0); info_nr = info_nr / 2.0 - fract(info_nr / 2.0); - + frac_val = fract(info_nr / 2.0); float pxr = round(frac_val); info_nr = info_nr / 2.0 - frac_val; @@ -177,4 +177,4 @@ void main() } gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc index d4420512bd4..80dd11d7ad9 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR level 3 pass0 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc index edfd9fa3dd9..7932ba25f15 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc @@ -6,7 +6,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_color0 /* Hyllian's xBR level 3 pass1 Shader - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc index fe2e3188052..1fe133cebfc 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc @@ -6,7 +6,7 @@ $input v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass1 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -43,7 +43,7 @@ const vec4 eq_thresholdold = vec4(15.0, 15.0, 15.0, 15.0); const vec4 eq_threshold = vec4( 2.0, 2.0, 2.0, 2.0); const vec4 eq_threshold3 = vec4(25.0, 25.0, 25.0, 25.0); const vec4 yuv_weight = vec4( 4.0, 1.0, 2.0, 0.0); -const mat4 yuvT = mat4(0.299, -0.169, 0.499, 0.0, 0.587, -0.331, -0.418, 0.0, 0.114, 0.499, -0.0813, 0.0, 0.0, 0.0, 0.0, 0.0); +const mat4 yuvT = mat4(0.299, -0.169, 0.499, 0.0, 0.587, -0.331, -0.418, 0.0, 0.114, 0.499, -0.0813, 0.0, 0.0, 0.0, 0.0, 0.0); const mat4 yuv = mat4(0.299, 0.587, 0.114, 0.0, -0.169, -0.331, 0.499, 0.0, 0.499, -0.418, -0.0813, 0.0, 0.0, 0.0, 0.0, 0.0); const mat4 yuv_weighted = mat4(4.0 * vec4(0.299, 0.587, 0.114, 0.0), 2.0 * vec4(-0.169, -0.331, 0.499, 0.0), vec4(0.499, -0.418, -0.0813, 0.0), vec4(0.0, 0.0, 0.0, 0.0)); const vec4 maximo = vec4(255.0, 255.0, 255.0, 255.0); @@ -111,7 +111,7 @@ vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, v void main() { - vec4 A3 = TEX(-1,-3); vec4 B3 = TEX( 0,-3); vec4 C3 = TEX( 1,-3); + vec4 A3 = TEX(-1,-3); vec4 B3 = TEX( 0,-3); vec4 C3 = TEX( 1,-3); vec4 A1 = TEX(-1,-2); vec4 B1 = TEX( 0,-2); vec4 C1 = TEX( 1,-2); vec4 A2 = TEX(-3,-1); vec4 A0 = TEX(-2,-1); vec4 A = TEX(-1,-1); vec4 B = TEX( 0,-1); vec4 C = TEX( 1,-1); vec4 C4 = TEX( 2,-1); vec4 C6 = TEX( 3,-1); @@ -205,4 +205,4 @@ void main() info.w = (edr4_left.w > 0.0 && edr4_up.w == 0.0) ? 8.0 : ((edr4_up.w > 0.0 && edr4_left.w == 0.0) ? 7.0 : ((edr3_left.w > 0.0 && edr3_up.w == 0.0) ? 6.0 : ((edr3_up.w > 0.0 && edr3_left.w == 0.0) ? 5.0 : ((edr_left.w > 0.0 && edr_up.w == 0.0) ? 4.0 : ((edr_up.w > 0.0 && edr_left.w == 0.0) ? 3.0 : (edr.w > 0.0 ? 2.0 : (edr0.w > 0.0 ? 1.0 : 0.0))))))); gl_FragColor = vec4(remapTo01(info, maximo)); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc index b0e0edf7778..7c2906246e6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc @@ -6,7 +6,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoo /* Hyllian's xBR MultiLevel4 Shader - Pass2 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -225,11 +225,11 @@ void main() vec4 jag9 = clamp(jag91 * jag93 + jag92 * jag94 , 0.0, 1.0); vec4 pe_select = eq(pe, zero) + ((one - nbrs) + jag1) * jag9; - + pe.x = pe_select.x > 0.0 ? pe.x : 1.0; pe.y = pe_select.y > 0.0 ? pe.y : 1.0; pe.z = pe_select.z > 0.0 ? pe.z : 1.0; pe.w = pe_select.w > 0.0 ? pe.w : 1.0; gl_FragColor = vec4(remapTo01(pe, maximo)); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc index 00391c77120..07490274d70 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc @@ -6,7 +6,7 @@ $input v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass3 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -169,4 +169,4 @@ void main() lparam.w = addr.x * 8.0 + addr.y; gl_FragColor = vec4(remapTo01(lparam, low, high)); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc index 535f70a5a7d..c37c512a7f6 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc @@ -6,7 +6,7 @@ $input v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass3 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -62,7 +62,7 @@ vec4 unpack_info(float i) float frac_val = fract(i / 2.0f); info.w = round(frac_val); i = i / 2.0f - frac_val; - + frac_val = fract(i / 2.0f); info.z = round(frac_val); i = i / 2.0f - frac_val; @@ -116,7 +116,7 @@ vec3 color_mix(vec3 c, vec3 color, vec3 E) void main() { float scale_factor = u_target_size.x / u_tex_size1.x; - + vec2 fp = fract(v_texcoord0 * u_tex_size1.xy) - vec2(0.5, 0.5); // pos = pixel position vec4 UL = texture2D(decal, v_texcoord0 + 0.25 * v_texcoord1.xy + 0.25 * v_texcoord1.zw); @@ -161,4 +161,4 @@ void main() color = color_mix(c4, color, E.xyz); gl_FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc index bab183ddd30..1edfd8632ad 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc @@ -7,7 +7,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass1 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc index 71ebf7d574a..92cf6b60b87 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc @@ -7,7 +7,7 @@ $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texco /* Hyllian's xBR MultiLevel4 Shader - Pass2 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc index 19195ba5b27..a6926a41f8b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc @@ -7,7 +7,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass3 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc index bf9f297ec9d..29fec2f1759 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc @@ -7,7 +7,7 @@ $output v_texcoord0, v_texcoord1, v_color0 /* Hyllian's xBR MultiLevel4 Shader - Pass4 - + Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/osd/modules/render/bgfx/shaders/fs_screen.sc b/src/osd/modules/render/bgfx/shaders/fs_screen.sc index 52dac92785c..ab1bff59dee 100644 --- a/src/osd/modules/render/bgfx/shaders/fs_screen.sc +++ b/src/osd/modules/render/bgfx/shaders/fs_screen.sc @@ -6,7 +6,7 @@ $input v_color0, v_texcoord0 #include "common.sh" // Samplers -SAMPLER2D(s_tex, 0); +SAMPLER2D(s_tex, 0); void main() { -- cgit v1.2.3