From 527ab0bcc11ec390add59c6e2e898e3c9c1cfb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 12 Jun 2015 15:22:01 -0700 Subject: [PATCH] shaderc: Metal fixes. --- src/bgfx_shader.sh | 4 ++-- tools/shaderc/shaderc.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bgfx_shader.sh b/src/bgfx_shader.sh index c3d74bb9..c165f2d2 100644 --- a/src/bgfx_shader.sh +++ b/src/bgfx_shader.sh @@ -270,7 +270,7 @@ vec2 mod(vec2 _a, vec2 _b) { return _a - _b * floor(_a / _b); } vec3 mod(vec3 _a, vec3 _b) { return _a - _b * floor(_a / _b); } vec4 mod(vec4 _a, vec4 _b) { return _a - _b * floor(_a / _b); } -#elif BGFX_SHADER_LANGUAGE_GLSL +#else # define atan2(_x, _y) atan(_x, _y) # define mul(_a, _b) ( (_a) * (_b) ) # define saturate(_x) clamp(_x, 0.0, 1.0) @@ -301,7 +301,7 @@ float rcp(float _a) { return 1.0/_a; } vec2 rcp(vec2 _a) { return vec2(1.0)/_a; } vec3 rcp(vec3 _a) { return vec3(1.0)/_a; } vec4 rcp(vec4 _a) { return vec4(1.0)/_a; } -#endif // BGFX_SHADER_LANGUAGE_HLSL +#endif // BGFX_SHADER_LANGUAGE_* uniform vec4 u_viewRect; uniform vec4 u_viewTexel; diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 657250cb..7b7d1651 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -1290,7 +1290,8 @@ int main(int _argc, const char* _argv[]) else { if (0 != glsl - || 0 != essl) + || 0 != essl + || 0 != metal) { if (120 == glsl || 0 != essl) @@ -1356,9 +1357,6 @@ int main(int _argc, const char* _argv[]) } } } - else if (0 != metal) - { - } else { preprocessor.writef(