Previous 199869 Revisions Next

r45075 Sunday 21st February, 2016 at 06:55:00 UTC by Miodrag Milanović
Merge pull request #631 from dlabi/master

Sord m5: bug fixes [Ales Dlabac]
[/trunk].gitignore
[bgfx/chains]test.json*
[bgfx/effects]gui_add.json* gui_blend.json* gui_multiply.json* gui_opaque.json* screen_add.json* screen_blend.json* screen_multiply.json* screen_opaque.json*
[language/Chinese (Traditional)]strings.mo strings.po
[scripts/src]emu.lua
[scripts/src/osd]modules.lua sdl.lua windows.lua
[shaders/dx11]fs_gui.bin* fs_line.bin fs_quad.bin fs_quad_texture.bin fs_screen.bin* vs_gui.bin* vs_line.bin vs_quad.bin vs_quad_texture.bin vs_screen.bin*
[shaders/dx9]fs_gui.bin* fs_line.bin fs_quad.bin fs_quad_texture.bin fs_screen.bin* vs_gui.bin* vs_line.bin vs_quad.bin vs_quad_texture.bin vs_screen.bin*
[shaders/gles]fs_gui.bin* fs_line.bin fs_quad.bin fs_quad_texture.bin fs_screen.bin* vs_gui.bin* vs_line.bin vs_quad.bin vs_quad_texture.bin vs_screen.bin*
[shaders/glsl]fs_gui.bin* fs_line.bin fs_quad.bin fs_quad_texture.bin fs_screen.bin* vs_gui.bin* vs_line.bin vs_quad.bin vs_quad_texture.bin vs_screen.bin*
[shaders/metal]fs_gui.bin* fs_line.bin fs_quad.bin fs_quad_texture.bin fs_screen.bin* vs_gui.bin* vs_line.bin vs_quad.bin vs_quad_texture.bin vs_screen.bin*
[src/emu]clifront.cpp clifront.h language.cpp* language.h*
[src/emu/ui]custui.cpp custui.h menu.cpp sliders.cpp sliders.h ui.cpp ui.h
[src/mame]mess.cpp
[src/mame/drivers]esqkt.cpp pc9801.cpp
[src/mame/machine]esqlcd.h
[src/osd]osdepend.h
[src/osd/modules]osdwindow.cpp* osdwindow.h
[src/osd/modules/lib]osdobj_common.cpp osdobj_common.h
[src/osd/modules/render]d3dtarget.h* draw13.cpp draw13.h* drawbgfx.cpp drawbgfx.h drawd3d.cpp drawd3d.h drawgdi.cpp drawgdi.h* drawnone.cpp drawnone.h* drawogl.cpp drawogl.h* drawsdl.cpp drawsdl.h* sdlglcontext.h* winglcontext.h*
[src/osd/modules/render/bgfx]blendreader.cpp* blendreader.h* chain.cpp* chain.h* chainentry.cpp* chainentry.h* chainentryreader.cpp* chainentryreader.h* chainreader.cpp* chainreader.h* cullreader.cpp* cullreader.h* depthreader.cpp* depthreader.h* effect.cpp* effect.h* effectmanager.cpp* effectmanager.h* effectreader.cpp* effectreader.h* fs_gui.sc* fs_line.sc fs_quad.sc fs_quad_texture.sc fs_screen.sc* inputpair.cpp* inputpair.h* parameter.cpp* parameter.h* paramreader.cpp* paramreader.h* shadermanager.cpp* shadermanager.h* slider.cpp* slider.h* sliderreader.cpp* sliderreader.h* statereader.cpp* statereader.h* target.cpp* target.h* targetmanager.cpp* targetmanager.h* texture.cpp* texture.h* texturemanager.cpp* texturemanager.h* uniform.cpp* uniform.h* uniformreader.cpp* uniformreader.h* vs_gui.sc* vs_line.sc vs_quad.sc vs_quad_texture.sc vs_screen.sc* writereader.cpp* writereader.h*
[src/osd/modules/render/d3d]d3d9intf.cpp d3dcomm.h d3dhlsl.cpp d3dhlsl.h d3dintf.h
[src/osd/sdl]video.cpp video.h window.cpp window.h
[src/osd/windows]video.cpp video.h window.cpp window.h winmain.cpp winmain.h

trunk/.gitignore
r253586r253587
44!/3rdparty/
55!/benchmarks/
66!/artwork/
7!/bgfx/
78!/docs/
89!/hash/
910!/hlsl/
trunk/bgfx/chains/test.json
r0r253587
1{   "name": "Test Shader Chain"
2   "author": "Ryan Holtz"
3   "sliders": [
4      { "type": "bool",  "name": "adjustments", "text": "Enable Adjustments", "default": false },
5      { "type": "float", "name": "ratio_amount", "text": "Ratio Amount", "default": 0, "max": 1, "min": 0 },
6
7      { "type": "color", "name": "red_ratios", "text": "Red Amount",   "default": [ 1, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
8      { "type": "color", "name": "grn_ratios", "text": "Green Amount", "default": [ 0, 1, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
9      { "type": "color", "name": "blu_ratios", "text": "Blue Amount",  "default": [ 0, 0, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
10      { "type": "color", "name": "tint": "text": "Tint", "default": [ 1, 1, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] }
11      { "type": "color", "name": "phosphor", "text": "Phosphor Amount",  "default": [ 0, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0 ,0 ] },
12      { "type": "vec2",  "name": "shift", "text": "Frame Shift", "default": [ 0, 0 ], "max": [ 25, 25 ], "min": [ -25, -25 ] }
13   ]
14   "parameters": [
15      { "name": "alternating", "type": "frame_mask", "period": 2 }
16   ]
17   "targets": [
18      {   "name": "native",
19         "screen": true,
20      },
21      {   "name": "previous",
22         "screen": true,
23         "prescale": true
24      }
25   ]
26   "passes": [
27      {   "effect": "ratios",
28         "name": "Matrix Pass"
29         "disable_conditions": [
30            { "type": "slider", "name": "adjustments", "value": false },
31            { "type": "slider", "name": "ratio_amount", "value": 0 }
32         ],
33         "uniforms": [
34            { "name": "u_ratio_amount", "slider": "ratio_amount" },
35            { "name": "u_red_ratios", "slider": "red_ratios" },
36            { "name": "u_grn_ratios", "slider": "grn_ratios" },
37            { "name": "u_blu_ratios", "slider": "blu_ratios" }
38         ],
39         "input": [
40            { "sampler": "s_tex", "texture": "screen" }
41         ],
42         "output": "native"
43      },
44      {   "effect": "tint",
45         "name": "Tint Pass"
46         "disable_conditions": [
47            { "type": "slider", "name": "adjustments", "value": false }
48         ],
49         "uniforms": [
50            { "name": "u_tint", "slider": "tint" },
51            { "name": "u_shift", "slider": "shift" }
52         ],
53         "input": [
54            { "sampler": "s_tex", "texture": "native" }
55         ],
56         "output": "native"
57      },
58      {   "effect": "phosphor"
59         "name": "Phosphor Decay",
60         "disable_conditions": [
61            { "type": "slider", "name": "adjustments", "value": false },
62            { "type": "slider", "name": "phosphor", "value": [ 0, 0, 0 ] }
63         ],
64         "uniforms": [
65            { "name": "u_passthrough", "value": [ 0.0f ] },
66            { "name": "u_phosphor", "slider": "phosphor" }
67         ],
68         "input": [
69            { "sampler": "s_tex", "texture": "native" },
70            { "sampler": "s_prev", "texture": "previous" }
71         ],
72         "output": "native"
73      },
74      {   "effect": "phosphor"
75         "name": "Phosphor Store",
76         "disable_conditions": [
77            { "type": "slider", "name": "adjustments", "value": false },
78            { "type": "slider", "name": "phosphor", "value": [ 0, 0, 0 ] }
79         ],
80         "uniforms": [
81            { "name": "u_passthrough", "value": [ 1.0f ] },
82            { "name": "u_phosphor", "slider": "phosphor" }
83         ],
84         "input": [
85            { "sampler": "s_tex", "texture": "native" },
86            { "sampler": "s_prev", "texture": "native" }
87         ],
88         "output": "previous"
89      },
90      {   "effect": "blit"
91         "name": "Final Blit",
92         "input": [
93            { "sampler": "s_tex", "texture": "native" }
94         ],
95         "output": "backbuffer"
96      }
97   ]
98}
No newline at end of file
trunk/bgfx/effects/gui_add.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "srcAlpha",
5       "dstColor": "1",
6       "srcAlpha": "srcAlpha",
7       "dstAlpha": "1"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_gui",
18    "fragment": "fs_gui",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] }
21    ]
22}
No newline at end of file
trunk/bgfx/effects/gui_blend.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "srcAlpha",
5       "dstColor": "1-srcAlpha",
6       "srcAlpha": "srcAlpha",
7       "dstAlpha": "1-srcAlpha"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_gui",
18    "fragment": "fs_gui",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] }
21    ]
22}
No newline at end of file
trunk/bgfx/effects/gui_multiply.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "dstColor",
5       "dstColor": "0",
6       "srcAlpha": "dstAlpha",
7       "dstAlpha": "0"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_gui",
18    "fragment": "fs_gui",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] }
21    ]
22}
No newline at end of file
trunk/bgfx/effects/gui_opaque.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "1",
5       "dstColor": "0",
6       "srcAlpha": "1",
7       "dstAlpha": "0"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_gui",
18    "fragment": "fs_gui",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] }
21    ]
22}
No newline at end of file
trunk/bgfx/effects/screen_add.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "srcAlpha",
5       "dstColor": "1",
6       "srcAlpha": "srcAlpha",
7       "dstAlpha": "1"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_screen",
18    "fragment": "fs_screen",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] },
21       { "name": "u_tint", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] }
22    ]
23}
No newline at end of file
trunk/bgfx/effects/screen_blend.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "srcAlpha",
5       "dstColor": "1-srcAlpha",
6       "srcAlpha": "srcAlpha",
7       "dstAlpha": "1-srcAlpha"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_screen",
18    "fragment": "fs_screen",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] },
21       { "name": "u_tint", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] }
22   ]
23}
No newline at end of file
trunk/bgfx/effects/screen_multiply.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "dstColor",
5       "dstColor": "0",
6       "srcAlpha": "dstAlpha",
7       "dstAlpha": "0"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_screen",
18    "fragment": "fs_screen",
19    "uniforms": [
20       { "name": "s_tex", "type": "int",  "values": [ 1.0 ] },
21       { "name": "u_tint", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] }
22    ]
23}
No newline at end of file
trunk/bgfx/effects/screen_opaque.json
r0r253587
1{
2    "blend": {
3       "equation": "add",
4       "srcColor": "1",
5       "dstColor": "0",
6       "srcAlpha": "1",
7       "dstAlpha": "0"
8    },
9    "depth": {
10       "function": "always"
11    },
12    "cull": { "mode": "none" },
13    "write": {
14       "rgb": "true",
15       "alpha": "true"
16    },
17    "vertex": "vs_screen",
18    "fragment": "fs_screen",
19    "uniforms": [
20       { "name": "s_tex",  "type": "int",  "values": [ 1.0 ] },
21       { "name": "u_tint", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] }
22    ]
23}
No newline at end of file
trunk/language/Chinese (Traditional)/strings.mo
r253586r253587
Previous 199869 Revisions Next

© 1997-2024 The MAME Team