From 6014ca73a0768ef8aa1b2b18da717383caf5c260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Sun, 3 Nov 2019 16:51:22 -0800
Subject: [PATCH] Cleanup.

---
 src/bgfx_shader.sh | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/bgfx_shader.sh b/src/bgfx_shader.sh
index 070df9b5d..b103ac4dd 100644
--- a/src/bgfx_shader.sh
+++ b/src/bgfx_shader.sh
@@ -619,29 +619,17 @@ mat3 mtxFromCols(vec3 _0, vec3 _1, vec3 _2)
 }
 
 #if BGFX_SHADER_LANGUAGE_GLSL
+#define mtxFromRows3(_0, _1, _2)     transpose(mat3(_0, _1, _2))
 #define mtxFromRows4(_0, _1, _2, _3) transpose(mat4(_0, _1, _2, _3))
-#else
-#define mtxFromRows4(_0, _1, _2, _3) mat4(_0, _1, _2, _3)
-#endif // BGFX_SHADER_LANGUAGE_GLSL
-
-#if BGFX_SHADER_LANGUAGE_GLSL
-#define mtxFromRows3(_0, _1, _2) transpose(mat3(_0, _1, _2))
-#else
-#define mtxFromRows3(_0, _1, _2) mat3(_0, _1, _2)
-#endif // BGFX_SHADER_LANGUAGE_GLSL
-
-#if BGFX_SHADER_LANGUAGE_GLSL
+#define mtxFromCols3(_0, _1, _2)     mat3(_0, _1, _2)
 #define mtxFromCols4(_0, _1, _2, _3) mat4(_0, _1, _2, _3)
 #else
+#define mtxFromRows3(_0, _1, _2)     mat3(_0, _1, _2)
+#define mtxFromRows4(_0, _1, _2, _3) mat4(_0, _1, _2, _3)
+#define mtxFromCols3(_0, _1, _2)     transpose(mat3(_0, _1, _2))
 #define mtxFromCols4(_0, _1, _2, _3) transpose(mat4(_0, _1, _2, _3))
 #endif // BGFX_SHADER_LANGUAGE_GLSL
 
-#if BGFX_SHADER_LANGUAGE_GLSL
-#define mtxFromCols3(_0, _1, _2) mat3(_0, _1, _2)
-#else
-#define mtxFromCols3(_0, _1, _2) transpose(mat3(_0, _1, _2))
-#endif // BGFX_SHADER_LANGUAGE_GLSL
-
 uniform vec4  u_viewRect;
 uniform vec4  u_viewTexel;
 uniform mat4  u_view;