diff --git a/Runtime/Graphics/CLineRendererShadersGLSL.cpp b/Runtime/Graphics/CLineRendererShadersGLSL.cpp index 2bc6bee7f..9423be71f 100644 --- a/Runtime/Graphics/CLineRendererShadersGLSL.cpp +++ b/Runtime/Graphics/CLineRendererShadersGLSL.cpp @@ -22,7 +22,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uv;\n" "};\n" "\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.color = colorIn * moduColor;\n" @@ -39,7 +39,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uv;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "TBINDING0 uniform sampler2D texs[1];\n" "void main()\n" @@ -63,7 +63,7 @@ BOO_GLSL_BINDING_HEAD " vec4 color;\n" "};\n" "\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.color = colorIn * moduColor;\n" @@ -77,7 +77,7 @@ static const char* FS_GLSL_NOTEX = " vec4 color;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "void main()\n" "{\n" diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp index 5ec258049..dadb3bfda 100644 --- a/Runtime/Graphics/CMoviePlayer.cpp +++ b/Runtime/Graphics/CMoviePlayer.cpp @@ -21,7 +21,7 @@ SPECTER_GLSL_VIEW_VERT_BLOCK " vec4 color;\n" " vec2 uv;\n" "};\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.uv = uvIn;\n" @@ -37,7 +37,7 @@ BOO_GLSL_BINDING_HEAD " vec4 color;\n" " vec2 uv;\n" "};\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "TBINDING0 uniform sampler2D texs[3];\n" "layout(location=0) out vec4 colorOut;\n" "void main()\n" diff --git a/Runtime/Particle/CElementGenShadersGLSL.cpp b/Runtime/Particle/CElementGenShadersGLSL.cpp index 5c05cc13c..2888c726e 100644 --- a/Runtime/Particle/CElementGenShadersGLSL.cpp +++ b/Runtime/Particle/CElementGenShadersGLSL.cpp @@ -27,7 +27,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uv;\n" "};\n" "\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.color = colorIn * moduColor;\n" @@ -44,7 +44,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uv;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "TBINDING0 uniform sampler2D texs[1];\n" "void main()\n" @@ -61,7 +61,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uv;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "TBINDING0 uniform sampler2D texs[1];\n" "void main()\n" @@ -92,7 +92,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uvTind;\n" "};\n" "\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.color = colorIn * moduColor;\n" @@ -113,7 +113,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uvTind;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "TBINDING0 uniform sampler2D texs[3];\n" "void main()\n" @@ -136,7 +136,7 @@ BOO_GLSL_BINDING_HEAD " vec2 uvTind;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "TBINDING0 uniform sampler2D texs[3];\n" "void main()\n" @@ -163,7 +163,7 @@ BOO_GLSL_BINDING_HEAD " vec4 color;\n" "};\n" "\n" -"out VertToFrag vtf;\n" +"SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" " vtf.color = colorIn * moduColor;\n" @@ -177,7 +177,7 @@ static const char* FS_GLSL_NOTEX = " vec4 color;\n" "};\n" "\n" -"in VertToFrag vtf;\n" +"SBINDING(0) in VertToFrag vtf;\n" "layout(location=0) out vec4 colorOut;\n" "void main()\n" "{\n" diff --git a/hecl b/hecl index 86391565a..360af21c0 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 86391565a104aba0bf32d2345d1139379af4e486 +Subproject commit 360af21c0d1f1f56554520c6ccf50d2e93a344ae diff --git a/kabufuda b/kabufuda index 2a9c18534..99069bd06 160000 --- a/kabufuda +++ b/kabufuda @@ -1 +1 @@ -Subproject commit 2a9c18534a5085763c191c151447d598c0f9e90f +Subproject commit 99069bd069a93ab2d98dcd09b799711d2f93754c diff --git a/specter b/specter index 47a6e28db..f81bd59b9 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 47a6e28db624f100e8cbc6ef11f3feba2a575ec7 +Subproject commit f81bd59b923e830c76537306b8eda7d8fc955666