From bb9374b2ecc0bee8194726020a08ceb49f297855 Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Sun, 12 Apr 2020 21:58:45 +0200 Subject: [PATCH] Split shader UBOs --- data/shaders/mesh/mesh.frag | 2 +- data/shaders/mesh/mesh.frag.spv | Bin 2008 -> 2008 bytes data/shaders/mesh/mesh.vert | 2 +- data/shaders/mesh/mesh.vert.spv | Bin 2748 -> 2748 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/shaders/mesh/mesh.frag b/data/shaders/mesh/mesh.frag index 746f45a7..17d4a95b 100644 --- a/data/shaders/mesh/mesh.frag +++ b/data/shaders/mesh/mesh.frag @@ -1,6 +1,6 @@ #version 450 -layout (binding = 1) uniform sampler2D samplerColorMap; +layout (set = 1, binding = 0) uniform sampler2D samplerColorMap; layout (location = 0) in vec3 inNormal; layout (location = 1) in vec3 inColor; diff --git a/data/shaders/mesh/mesh.frag.spv b/data/shaders/mesh/mesh.frag.spv index bae230cce23c591dc8c77e89df57013b9a41a6a0..3c870fe52862fce99f79607ec09940cf8e376fee 100644 GIT binary patch delta 41 tcmcb?e}kWsnMs+Qfq{{MV>(%?laL*#Lm{1#bWV delta 41 scmcb?e}kWsnMs+Qfq{{MeIsW(qaXtixHGUY@B(Q?AZFaWkkOnC0D#H`ZU6uP diff --git a/data/shaders/mesh/mesh.vert b/data/shaders/mesh/mesh.vert index d9139507..22b6aeb9 100644 --- a/data/shaders/mesh/mesh.vert +++ b/data/shaders/mesh/mesh.vert @@ -5,7 +5,7 @@ layout (location = 1) in vec3 inNormal; layout (location = 2) in vec2 inUV; layout (location = 3) in vec3 inColor; -layout (binding = 0) uniform UBO +layout (set = 0, binding = 0) uniform UBO { mat4 projection; mat4 model; diff --git a/data/shaders/mesh/mesh.vert.spv b/data/shaders/mesh/mesh.vert.spv index 82758e686cfd5a35ead56c59b5827cba399c672f..2d0a79fc927d5ef5a3553d76fa5e729080693ada 100644 GIT binary patch delta 18 ZcmdlZx<{0gnMs+Qfq{{MV