projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some descriptor functions in vkutil - wip
[demo]
/
shaders
/
morphing.v.glsl
diff --git
a/shaders/morphing.v.glsl
b/shaders/morphing.v.glsl
index
80b7e39
..
1d93ada
100644
(file)
--- a/
shaders/morphing.v.glsl
+++ b/
shaders/morphing.v.glsl
@@
-1,7
+1,7
@@
#version 450
#define MATRIX_UNIFORMS 0
#version 450
#define MATRIX_UNIFORMS 0
-#define MORPHING_UNIFORMS 3
+#define MORPHING_MATRIX_UNIFORMS 3
layout(std140, binding = MATRIX_UNIFORMS) uniform vu {
mat4 mview;
layout(std140, binding = MATRIX_UNIFORMS) uniform vu {
mat4 mview;
@@
-9,7
+9,7
@@
layout(std140, binding = MATRIX_UNIFORMS) uniform vu {
uniform mat4 mmod;
} m;
uniform mat4 mmod;
} m;
-layout(std140, binding = MORPHING_UNIFORMS) uniform mvu {
+layout(std140, binding = MORPHING_MATRIX_UNIFORMS) uniform mvu {
float t;
} time;
float t;
} time;