diff --git a/data/shaders/deferredshadows/debug.frag.spv b/data/shaders/deferredshadows/debug.frag.spv index 39a88b28..87ae1418 100644 Binary files a/data/shaders/deferredshadows/debug.frag.spv and b/data/shaders/deferredshadows/debug.frag.spv differ diff --git a/data/shaders/deferredshadows/debug.vert b/data/shaders/deferredshadows/debug.vert index 40833b18..1226dec1 100644 --- a/data/shaders/deferredshadows/debug.vert +++ b/data/shaders/deferredshadows/debug.vert @@ -14,11 +14,6 @@ layout (binding = 0) uniform UBO layout (location = 0) out vec3 outUV; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outUV = vec3(inUV.st, gl_InstanceIndex); diff --git a/data/shaders/deferredshadows/debug.vert.spv b/data/shaders/deferredshadows/debug.vert.spv index f7b69969..fa760719 100644 Binary files a/data/shaders/deferredshadows/debug.vert.spv and b/data/shaders/deferredshadows/debug.vert.spv differ diff --git a/data/shaders/deferredshadows/deferred.frag.spv b/data/shaders/deferredshadows/deferred.frag.spv index 77359095..7c9b1e95 100644 Binary files a/data/shaders/deferredshadows/deferred.frag.spv and b/data/shaders/deferredshadows/deferred.frag.spv differ diff --git a/data/shaders/deferredshadows/deferred.vert b/data/shaders/deferredshadows/deferred.vert index e13d0aff..062ffad3 100644 --- a/data/shaders/deferredshadows/deferred.vert +++ b/data/shaders/deferredshadows/deferred.vert @@ -14,11 +14,6 @@ layout (binding = 0) uniform UBO layout (location = 0) out vec2 outUV; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outUV = inUV; diff --git a/data/shaders/deferredshadows/deferred.vert.spv b/data/shaders/deferredshadows/deferred.vert.spv index 5f41a5ed..ab93cdfb 100644 Binary files a/data/shaders/deferredshadows/deferred.vert.spv and b/data/shaders/deferredshadows/deferred.vert.spv differ diff --git a/data/shaders/deferredshadows/mrt.frag.spv b/data/shaders/deferredshadows/mrt.frag.spv index 6ff397e8..c2acf111 100644 Binary files a/data/shaders/deferredshadows/mrt.frag.spv and b/data/shaders/deferredshadows/mrt.frag.spv differ diff --git a/data/shaders/deferredshadows/mrt.vert b/data/shaders/deferredshadows/mrt.vert index a8d3ee02..6b10775a 100644 --- a/data/shaders/deferredshadows/mrt.vert +++ b/data/shaders/deferredshadows/mrt.vert @@ -23,11 +23,6 @@ layout (location = 2) out vec3 outColor; layout (location = 3) out vec3 outWorldPos; layout (location = 4) out vec3 outTangent; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { vec4 tmpPos = inPos + ubo.instancePos[gl_InstanceIndex]; diff --git a/data/shaders/deferredshadows/mrt.vert.spv b/data/shaders/deferredshadows/mrt.vert.spv index aaa4e3ff..c751ed59 100644 Binary files a/data/shaders/deferredshadows/mrt.vert.spv and b/data/shaders/deferredshadows/mrt.vert.spv differ diff --git a/data/shaders/deferredshadows/shadow.geom b/data/shaders/deferredshadows/shadow.geom index fdd2dba7..04ca7d7e 100644 --- a/data/shaders/deferredshadows/shadow.geom +++ b/data/shaders/deferredshadows/shadow.geom @@ -16,11 +16,6 @@ layout (binding = 0) uniform UBO layout (location = 0) in int inInstanceIndex[]; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { vec4 instancedPos = ubo.instancePos[inInstanceIndex[0]]; diff --git a/data/shaders/deferredshadows/shadow.geom.spv b/data/shaders/deferredshadows/shadow.geom.spv index 111e9a8b..3a70cb30 100644 Binary files a/data/shaders/deferredshadows/shadow.geom.spv and b/data/shaders/deferredshadows/shadow.geom.spv differ diff --git a/data/shaders/deferredshadows/shadow.vert b/data/shaders/deferredshadows/shadow.vert index 61a60627..bf698d62 100644 --- a/data/shaders/deferredshadows/shadow.vert +++ b/data/shaders/deferredshadows/shadow.vert @@ -7,11 +7,6 @@ layout (location = 0) in vec4 inPos; layout (location = 0) out int outInstanceIndex; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outInstanceIndex = gl_InstanceIndex; diff --git a/data/shaders/deferredshadows/shadow.vert.spv b/data/shaders/deferredshadows/shadow.vert.spv index c3fc560e..581c1ca6 100644 Binary files a/data/shaders/deferredshadows/shadow.vert.spv and b/data/shaders/deferredshadows/shadow.vert.spv differ diff --git a/data/shaders/geometryshader/base.frag.spv b/data/shaders/geometryshader/base.frag.spv index 06ab7a2f..003f4e99 100644 Binary files a/data/shaders/geometryshader/base.frag.spv and b/data/shaders/geometryshader/base.frag.spv differ diff --git a/data/shaders/geometryshader/base.vert b/data/shaders/geometryshader/base.vert index 8f66ad20..99b5ebee 100644 --- a/data/shaders/geometryshader/base.vert +++ b/data/shaders/geometryshader/base.vert @@ -1,18 +1,10 @@ #version 450 -#extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_420pack : enable - layout (location = 0) in vec3 inPos; layout (location = 1) in vec3 inNormal; layout (location = 0) out vec3 outNormal; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main(void) { outNormal = inNormal; diff --git a/data/shaders/geometryshader/base.vert.spv b/data/shaders/geometryshader/base.vert.spv index 056dbb71..1051ccfc 100644 Binary files a/data/shaders/geometryshader/base.vert.spv and b/data/shaders/geometryshader/base.vert.spv differ diff --git a/data/shaders/geometryshader/mesh.frag.spv b/data/shaders/geometryshader/mesh.frag.spv index 50714dbe..4b5fb861 100644 Binary files a/data/shaders/geometryshader/mesh.frag.spv and b/data/shaders/geometryshader/mesh.frag.spv differ diff --git a/data/shaders/geometryshader/mesh.vert b/data/shaders/geometryshader/mesh.vert index 06ff4f9b..cd5bb26a 100644 --- a/data/shaders/geometryshader/mesh.vert +++ b/data/shaders/geometryshader/mesh.vert @@ -18,11 +18,6 @@ layout (location = 1) out vec3 outColor; layout (location = 2) out vec3 outViewVec; layout (location = 3) out vec3 outLightVec; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outNormal = inNormal; diff --git a/data/shaders/geometryshader/mesh.vert.spv b/data/shaders/geometryshader/mesh.vert.spv index a1c31ca3..b537fb40 100644 Binary files a/data/shaders/geometryshader/mesh.vert.spv and b/data/shaders/geometryshader/mesh.vert.spv differ diff --git a/data/shaders/geometryshader/normaldebug.geom.spv b/data/shaders/geometryshader/normaldebug.geom.spv index 105ecee1..5f8aa82d 100644 Binary files a/data/shaders/geometryshader/normaldebug.geom.spv and b/data/shaders/geometryshader/normaldebug.geom.spv differ diff --git a/data/shaders/pipelinestatistics/scene.frag.spv b/data/shaders/pipelinestatistics/scene.frag.spv index 17d51ad6..bf0c7a10 100644 Binary files a/data/shaders/pipelinestatistics/scene.frag.spv and b/data/shaders/pipelinestatistics/scene.frag.spv differ diff --git a/data/shaders/pipelinestatistics/scene.tesc.spv b/data/shaders/pipelinestatistics/scene.tesc.spv index d68bc835..6c58fd74 100644 Binary files a/data/shaders/pipelinestatistics/scene.tesc.spv and b/data/shaders/pipelinestatistics/scene.tesc.spv differ diff --git a/data/shaders/pipelinestatistics/scene.tese.spv b/data/shaders/pipelinestatistics/scene.tese.spv index 1a6233c4..5cb3391a 100644 Binary files a/data/shaders/pipelinestatistics/scene.tese.spv and b/data/shaders/pipelinestatistics/scene.tese.spv differ diff --git a/data/shaders/pipelinestatistics/scene.vert b/data/shaders/pipelinestatistics/scene.vert index 0399c8c3..fc54284e 100644 --- a/data/shaders/pipelinestatistics/scene.vert +++ b/data/shaders/pipelinestatistics/scene.vert @@ -20,11 +20,6 @@ layout(push_constant) uniform PushConsts { vec3 objPos; } pushConsts; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outNormal = inNormal; @@ -34,8 +29,8 @@ void main() vec3 worldPos = vec3(ubo.modelview * vec4(inPos + pushConsts.objPos, 1.0)); gl_Position = ubo.projection /* ubo.modelview */ * vec4(worldPos, 1.0); - vec4 pos = ubo.modelview * vec4(worldPos, 1.0); - outNormal = mat3(ubo.modelview) * inNormal; - outLightVec = ubo.lightPos.xyz - pos.xyz; - outViewVec = -pos.xyz; + vec4 pos = ubo.modelview * vec4(worldPos, 1.0); + outNormal = mat3(ubo.modelview) * inNormal; + outLightVec = ubo.lightPos.xyz - pos.xyz; + outViewVec = -pos.xyz; } \ No newline at end of file diff --git a/data/shaders/pipelinestatistics/scene.vert.spv b/data/shaders/pipelinestatistics/scene.vert.spv index c9a8eeb6..0e282926 100644 Binary files a/data/shaders/pipelinestatistics/scene.vert.spv and b/data/shaders/pipelinestatistics/scene.vert.spv differ diff --git a/data/shaders/terraintessellation/skysphere.frag.spv b/data/shaders/terraintessellation/skysphere.frag.spv index b09de25b..925b1506 100644 Binary files a/data/shaders/terraintessellation/skysphere.frag.spv and b/data/shaders/terraintessellation/skysphere.frag.spv differ diff --git a/data/shaders/terraintessellation/skysphere.vert b/data/shaders/terraintessellation/skysphere.vert index f9473a3e..39a26e9f 100644 --- a/data/shaders/terraintessellation/skysphere.vert +++ b/data/shaders/terraintessellation/skysphere.vert @@ -11,11 +11,6 @@ layout (set = 0, binding = 0) uniform UBO mat4 mvp; } ubo; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main(void) { gl_Position = ubo.mvp * vec4(inPos, 1.0); diff --git a/data/shaders/terraintessellation/skysphere.vert.spv b/data/shaders/terraintessellation/skysphere.vert.spv index 5a5f1b03..ee48655a 100644 Binary files a/data/shaders/terraintessellation/skysphere.vert.spv and b/data/shaders/terraintessellation/skysphere.vert.spv differ diff --git a/data/shaders/terraintessellation/terrain.frag.spv b/data/shaders/terraintessellation/terrain.frag.spv index 471431f6..ed8f0e82 100644 Binary files a/data/shaders/terraintessellation/terrain.frag.spv and b/data/shaders/terraintessellation/terrain.frag.spv differ diff --git a/data/shaders/terraintessellation/terrain.tesc.spv b/data/shaders/terraintessellation/terrain.tesc.spv index 374096b5..85163bc1 100644 Binary files a/data/shaders/terraintessellation/terrain.tesc.spv and b/data/shaders/terraintessellation/terrain.tesc.spv differ diff --git a/data/shaders/terraintessellation/terrain.tese.spv b/data/shaders/terraintessellation/terrain.tese.spv index 77978bff..c5bc1384 100644 Binary files a/data/shaders/terraintessellation/terrain.tese.spv and b/data/shaders/terraintessellation/terrain.tese.spv differ diff --git a/data/shaders/terraintessellation/terrain.vert b/data/shaders/terraintessellation/terrain.vert index 3dc0d169..b847b16e 100644 --- a/data/shaders/terraintessellation/terrain.vert +++ b/data/shaders/terraintessellation/terrain.vert @@ -10,11 +10,6 @@ layout (location = 2) in vec2 inUV; layout (location = 0) out vec3 outNormal; layout (location = 1) out vec2 outUV; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main(void) { gl_Position = vec4(inPos.xyz, 1.0); diff --git a/data/shaders/terraintessellation/terrain.vert.spv b/data/shaders/terraintessellation/terrain.vert.spv index 3dad2d61..25df7cd0 100644 Binary files a/data/shaders/terraintessellation/terrain.vert.spv and b/data/shaders/terraintessellation/terrain.vert.spv differ diff --git a/data/shaders/tessellation/base.vert b/data/shaders/tessellation/base.vert index 944399aa..7fe487a1 100644 --- a/data/shaders/tessellation/base.vert +++ b/data/shaders/tessellation/base.vert @@ -10,11 +10,6 @@ layout (location = 2) in vec2 inUV; layout (location = 0) out vec3 outNormal; layout (location = 1) out vec2 outUV; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main(void) { gl_Position = vec4(inPos.xyz, 1.0); diff --git a/data/shaders/viewportarray/multiview.geom.spv b/data/shaders/viewportarray/multiview.geom.spv index a40c84ca..64fb39b1 100644 Binary files a/data/shaders/viewportarray/multiview.geom.spv and b/data/shaders/viewportarray/multiview.geom.spv differ diff --git a/data/shaders/viewportarray/scene.frag.spv b/data/shaders/viewportarray/scene.frag.spv index 4f2fc6ca..1eae642c 100644 Binary files a/data/shaders/viewportarray/scene.frag.spv and b/data/shaders/viewportarray/scene.frag.spv differ diff --git a/data/shaders/viewportarray/scene.vert b/data/shaders/viewportarray/scene.vert index 86f53b96..5231157e 100644 --- a/data/shaders/viewportarray/scene.vert +++ b/data/shaders/viewportarray/scene.vert @@ -7,11 +7,6 @@ layout (location = 2) in vec3 inColor; layout (location = 0) out vec3 outNormal; layout (location = 1) out vec3 outColor; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { outColor = inColor; diff --git a/data/shaders/viewportarray/scene.vert.spv b/data/shaders/viewportarray/scene.vert.spv index 6b2853fa..379e6500 100644 Binary files a/data/shaders/viewportarray/scene.vert.spv and b/data/shaders/viewportarray/scene.vert.spv differ