scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-12-01 03:47:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

shaderc: Metal fixes.

Browse source
This commit is contained in:
Branimir Karadžić 2015-06-12 15:22:01 -07:00
parent ce1b41336d
commit 527ab0bcc1
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bgfx_shader.sh
View file

@ -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); } vec3 mod(vec3 _a, vec3 _b) { return _a - _b * floor(_a / _b); }
vec4 mod(vec4 _a, vec4 _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 atan2(_x, _y) atan(_x, _y)
# define mul(_a, _b) ( (_a) * (_b) ) # define mul(_a, _b) ( (_a) * (_b) )
# define saturate(_x) clamp(_x, 0.0, 1.0) # 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; } vec2 rcp(vec2 _a) { return vec2(1.0)/_a; }
vec3 rcp(vec3 _a) { return vec3(1.0)/_a; } vec3 rcp(vec3 _a) { return vec3(1.0)/_a; }
vec4 rcp(vec4 _a) { return vec4(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_viewRect;
uniform vec4 u_viewTexel; uniform vec4 u_viewTexel;

6
tools/shaderc/shaderc.cpp
View file

@ -1290,7 +1290,8 @@ int main(int _argc, const char* _argv[])
else else
{ {
if (0 != glsl if (0 != glsl
|| 0 != essl) || 0 != essl
|| 0 != metal)
{ {
if (120 == glsl if (120 == glsl
|| 0 != essl) || 0 != essl)
@ -1356,9 +1357,6 @@ int main(int _argc, const char* _argv[])
} }
} }
} }
else if (0 != metal)
{
}
else else
{ {
preprocessor.writef( preprocessor.writef(