From d841ded4e90953e42a2cb4d7d225530add2a095a Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Thu, 28 May 2020 22:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86shader=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shader/{ => PBR}/brdf.glsl                        |  0
 .../PushConstant3D.glsl}                          |  0
 shader/{WorldMatrix.ubo => UBO/WorldMatrix.glsl}  |  2 +-
 shader/UBO_WorldMatrix.glsl                       | 15 ---------------
 4 files changed, 1 insertion(+), 16 deletions(-)
 rename shader/{ => PBR}/brdf.glsl (100%)
 rename shader/{push_constant_3d.glsl => UBO/PushConstant3D.glsl} (100%)
 rename shader/{WorldMatrix.ubo => UBO/WorldMatrix.glsl} (96%)
 delete mode 100644 shader/UBO_WorldMatrix.glsl

diff --git a/shader/brdf.glsl b/shader/PBR/brdf.glsl
similarity index 100%
rename from shader/brdf.glsl
rename to shader/PBR/brdf.glsl
diff --git a/shader/push_constant_3d.glsl b/shader/UBO/PushConstant3D.glsl
similarity index 100%
rename from shader/push_constant_3d.glsl
rename to shader/UBO/PushConstant3D.glsl
diff --git a/shader/WorldMatrix.ubo b/shader/UBO/WorldMatrix.glsl
similarity index 96%
rename from shader/WorldMatrix.ubo
rename to shader/UBO/WorldMatrix.glsl
index b986c85..0335cf8 100644
--- a/shader/WorldMatrix.ubo
+++ b/shader/UBO/WorldMatrix.glsl
@@ -13,4 +13,4 @@ layout(binding=0) uniform WorldMatrix     // hgl/math/Math.h
 
     vec4 view_pos;
     vec2 resolution;
-} world; 
+} world;
diff --git a/shader/UBO_WorldMatrix.glsl b/shader/UBO_WorldMatrix.glsl
deleted file mode 100644
index 6336904..0000000
--- a/shader/UBO_WorldMatrix.glsl
+++ /dev/null
@@ -1,15 +0,0 @@
-layout(binding = 0) uniform WorldMatrix     // hgl/math/Math.h
-{
-    mat4 ortho;
-
-    mat4 projection;
-    mat4 inverse_projection;
-
-    mat4 modelview;
-    mat4 inverse_modelview;
-
-    mat4 mvp;
-    mat4 inverse_mvp;
-
-    vec4 view_pos;
-} world;