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;