From 504cc3d86f511d886b144d3850b30420185bfc8f Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 8 Apr 2020 20:51:01 +0800 Subject: [PATCH] delete std430,row_major --- shader/UBO_WorldMatrix.glsl | 2 +- shader/push_constant_3d.glsl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/shader/UBO_WorldMatrix.glsl b/shader/UBO_WorldMatrix.glsl index 8a07947..6336904 100644 --- a/shader/UBO_WorldMatrix.glsl +++ b/shader/UBO_WorldMatrix.glsl @@ -1,4 +1,4 @@ -layout(std430,binding = 0,row_major) uniform WorldMatrix // hgl/math/Math.h +layout(binding = 0) uniform WorldMatrix // hgl/math/Math.h { mat4 ortho; diff --git a/shader/push_constant_3d.glsl b/shader/push_constant_3d.glsl index 933ce0c..2dc6dff 100644 --- a/shader/push_constant_3d.glsl +++ b/shader/push_constant_3d.glsl @@ -1,4 +1,7 @@ -layout(std430,push_constant,row_major) uniform Consts { +layout(push_constant) uniform Consts +{ mat4 local_to_world; mat3 normal; + vec3 object_position; + vec3 object_size; } pc;