AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updates for Vulkan rendering

This commit is contained in:
Jack Andersen 2016-06-30 16:33:16 -10:00
parent 9a1e4dc161
commit 10784b7dc5
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Graphics/CLineRendererShadersGLSL.cpp
View File

@ -22,7 +22,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"\n" "\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
@ -39,7 +39,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"TBINDING0 uniform sampler2D texs[1];\n" "TBINDING0 uniform sampler2D texs[1];\n"
"void main()\n" "void main()\n"
@ -63,7 +63,7 @@ BOO_GLSL_BINDING_HEAD
" vec4 color;\n" " vec4 color;\n"
"};\n" "};\n"
"\n" "\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
@ -77,7 +77,7 @@ static const char* FS_GLSL_NOTEX =
" vec4 color;\n" " vec4 color;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"

4
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -21,7 +21,7 @@ SPECTER_GLSL_VIEW_VERT_BLOCK
" vec4 color;\n" " vec4 color;\n"
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.uv = uvIn;\n" " vtf.uv = uvIn;\n"
@ -37,7 +37,7 @@ BOO_GLSL_BINDING_HEAD
" vec4 color;\n" " vec4 color;\n"
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"TBINDING0 uniform sampler2D texs[3];\n" "TBINDING0 uniform sampler2D texs[3];\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"void main()\n" "void main()\n"

16
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -27,7 +27,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"\n" "\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
@ -44,7 +44,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"TBINDING0 uniform sampler2D texs[1];\n" "TBINDING0 uniform sampler2D texs[1];\n"
"void main()\n" "void main()\n"
@ -61,7 +61,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uv;\n" " vec2 uv;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"TBINDING0 uniform sampler2D texs[1];\n" "TBINDING0 uniform sampler2D texs[1];\n"
"void main()\n" "void main()\n"
@ -92,7 +92,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uvTind;\n" " vec2 uvTind;\n"
"};\n" "};\n"
"\n" "\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
@ -113,7 +113,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uvTind;\n" " vec2 uvTind;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"TBINDING0 uniform sampler2D texs[3];\n" "TBINDING0 uniform sampler2D texs[3];\n"
"void main()\n" "void main()\n"
@ -136,7 +136,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 uvTind;\n" " vec2 uvTind;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"TBINDING0 uniform sampler2D texs[3];\n" "TBINDING0 uniform sampler2D texs[3];\n"
"void main()\n" "void main()\n"
@ -163,7 +163,7 @@ BOO_GLSL_BINDING_HEAD
" vec4 color;\n" " vec4 color;\n"
"};\n" "};\n"
"\n" "\n"
"out VertToFrag vtf;\n" "SBINDING(0) out VertToFrag vtf;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vtf.color = colorIn * moduColor;\n" " vtf.color = colorIn * moduColor;\n"
@ -177,7 +177,7 @@ static const char* FS_GLSL_NOTEX =
" vec4 color;\n" " vec4 color;\n"
"};\n" "};\n"
"\n" "\n"
"in VertToFrag vtf;\n" "SBINDING(0) in VertToFrag vtf;\n"
"layout(location=0) out vec4 colorOut;\n" "layout(location=0) out vec4 colorOut;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"

2
hecl

@ -1 +1 @@
Subproject commit 86391565a104aba0bf32d2345d1139379af4e486 Subproject commit 360af21c0d1f1f56554520c6ccf50d2e93a344ae

2
kabufuda

@ -1 +1 @@
Subproject commit 2a9c18534a5085763c191c151447d598c0f9e90f Subproject commit 99069bd069a93ab2d98dcd09b799711d2f93754c

2
specter

@ -1 +1 @@
Subproject commit 47a6e28db624f100e8cbc6ef11f3feba2a575ec7 Subproject commit f81bd59b923e830c76537306b8eda7d8fc955666