Previous 199869 Revisions Next

r45063 Sunday 21st February, 2016 at 02:03:23 UTC by Ryan Holtz
First take on render API reorg, nw
[/trunk].gitignore
[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*
[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/ui]sliders.cpp sliders.h ui.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* 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* pass.cpp* pass.h* passreader.cpp* passreader.h* shadermanager.cpp* shadermanager.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.h window.cpp window.h
[src/osd/windows]video.cpp video.h window.cpp window.h winmain.h

trunk/.gitignore
r253574r253575
44!/3rdparty/
55!/benchmarks/
66!/artwork/
7!/bgfx/
78!/docs/
89!/hash/
910!/hlsl/
trunk/bgfx/effects/gui_add.json
r0r253575
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
r0r253575
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
r0r253575
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
r0r253575
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
r0r253575
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
r0r253575
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
r0r253575
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
r0r253575
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/scripts/src/osd/modules.lua
r253574r253575
103103   files {
104104      MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
105105      MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
106      MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp",
107      MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp",
108      MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp",
109      MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
110      MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
111      MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
112      MAME_DIR .. "src/osd/modules/render/bgfx/pass.cpp",
113      MAME_DIR .. "src/osd/modules/render/bgfx/passreader.cpp",
114      MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
115      MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
116      MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
117      MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
118      MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
119      MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp",
120      MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp",
121      MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
122      MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
106123   }
107124   includedirs {
108125      MAME_DIR .. "3rdparty/bgfx/include",
trunk/scripts/src/osd/sdl.lua
r253574r253575
384384      MAME_DIR .. "src/osd/sdl/video.h",
385385      MAME_DIR .. "src/osd/sdl/window.cpp",
386386      MAME_DIR .. "src/osd/sdl/window.h",
387      MAME_DIR .. "src/osd/modules/osdwindow.cpp",
387388      MAME_DIR .. "src/osd/modules/osdwindow.h",
388389      MAME_DIR .. "src/osd/sdl/output.cpp",
389390      MAME_DIR .. "src/osd/sdl/watchdog.cpp",
trunk/scripts/src/osd/windows.lua
r253574r253575
152152   }
153153
154154   files {
155      MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
156      MAME_DIR .. "src/osd/modules/render/drawd3d.h",
157155      MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
156      MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
158157      MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
159158      MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
160159      MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
161      MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
160      MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
161      MAME_DIR .. "src/osd/modules/render/drawd3d.h",
162162      MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
163      MAME_DIR .. "src/osd/modules/render/drawgdi.h",
163164      MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
165      MAME_DIR .. "src/osd/modules/render/drawnone.h",
164166      MAME_DIR .. "src/osd/windows/input.cpp",
165167      MAME_DIR .. "src/osd/windows/input.h",
166168      MAME_DIR .. "src/osd/windows/output.cpp",
r253574r253575
169171      MAME_DIR .. "src/osd/windows/video.h",
170172      MAME_DIR .. "src/osd/windows/window.cpp",
171173      MAME_DIR .. "src/osd/windows/window.h",
174      MAME_DIR .. "src/osd/modules/osdwindow.cpp",
172175      MAME_DIR .. "src/osd/modules/osdwindow.h",
173176      MAME_DIR .. "src/osd/windows/winmenu.cpp",
174177      MAME_DIR .. "src/osd/windows/winmain.cpp",
trunk/shaders/dx11/fs_gui.bin
r0r253575
1FSHƒòás_tex0pDXBC¾xç¥ pëL±¬„é—p, ÔISGNlP\bSV_POSITIONCOLORTEXCOORD«OSGN, SV_TARGET««SHDR”@%Z`XpUUbòb2eò hE   òFF~`8ò FF>
No newline at end of file
trunk/shaders/dx11/fs_line.bin
r253574r253575
1FSH¤‹ïIôDXBC¦╽_£?[XŽT‰gô,€´ISGNL8DSV_POSITIONCOLOR««OSGN, SV_TARGET««SHDR8@bòeò 6ò F>
No newline at end of file
trunk/shaders/dx11/fs_quad.bin
r253574r253575
1FSH¤‹ïIôDXBC¦╽_£?[XŽT‰gô,€´ISGNL8DSV_POSITIONCOLOR««OSGN, SV_TARGET««SHDR8@bòeò 6ò F>
No newline at end of file
trunk/shaders/dx11/fs_quad_texture.bin
r253574r253575
1FSHƒòás_tex0pDXBC¾xç¥ pëL±¬„é—p, ÔISGNlP\bSV_POSITIONCOLORTEXCOORD«OSGN, SV_TARGET««SHDR”@%Z`XpUUbòb2eò hE   òFF~`8ò FF>
No newline at end of file
trunk/shaders/dx11/fs_screen.bin
r0r253575
1FSHƒòáu_tints_tex0 DXBC9Ð<¢æ6Wˆ|€óÕ´o , ÔISGNlP\bSV_POSITIONCOLORTEXCOORD«OSGN, SV_TARGET««SHDRÄ@1YFŽ Z`XpUUbòb2eò hE   òFF~`8òFF8ò FFŽ >
No newline at end of file
trunk/shaders/dx11/vs_gui.bin
r0r253575
1VSHƒòá
2u_viewProjDXBCê$Øo#õö8[M,œISGNhPV_COLORPOSITIONTEXCOORDOSGNlP\b SV_POSITIONCOLORTEXCOORD«SHDR@@YFŽ _ò_2_2gò eò e2 h8òVFŽ 2
3òFŽ Fò FFŽ 6ò F62 F>@
No newline at end of file
trunk/shaders/dx11/vs_line.bin
r253574r253575
1VSH¤‹ïI
2u_viewProj¬DXBC¼²(§Ò«Ã/¤ä¼gÿ¤Ïf¬,|ÐISGNH8>COLORPOSITION«OSGNL8DSV_POSITIONCOLOR««SHDRÔ@5YFŽ _ò_2gò eò h8òVFŽ 2
3òFŽ Fò FFŽ 6ò F>@
No newline at end of file
trunk/shaders/dx11/vs_quad.bin
r253574r253575
1VSH¤‹ïI
2u_viewProj¬DXBC¼²(§Ò«Ã/¤ä¼gÿ¤Ïf¬,|ÐISGNH8>COLORPOSITION«OSGNL8DSV_POSITIONCOLOR««SHDRÔ@5YFŽ _ò_2gò eò h8òVFŽ 2
3òFŽ Fò FFŽ 6ò F>@
No newline at end of file
trunk/shaders/dx11/vs_quad_texture.bin
r253574r253575
1VSHƒòá
2u_viewProjDXBCê$Øo#õö8[M,œISGNhPV_COLORPOSITIONTEXCOORDOSGNlP\b SV_POSITIONCOLORTEXCOORD«SHDR@@YFŽ _ò_2_2gò eò e2 h8òVFŽ 2
3òFŽ Fò FFŽ 6ò F62 F>@
No newline at end of file
trunk/shaders/dx11/vs_screen.bin
r0r253575
1VSHƒòá
2u_viewProjDXBCê$Øo#õö8[M,œISGNhPV_COLORPOSITIONTEXCOORDOSGNlP\b SV_POSITIONCOLORTEXCOORD«SHDR@@YFŽ _ò_2_2gò eò e2 h8òVFŽ 2
3òFŽ Fò FFŽ 6ò F62 F>@
No newline at end of file
trunk/shaders/dx9/fs_gui.bin
r0r253575
Previous 199869 Revisions Next

© 1997-2024 The MAME Team