glsl initializer lists are 4.2

This commit is contained in:
SamGondelman 2019-01-21 12:35:48 -08:00
parent da7cd6b2f7
commit 5b1ea24d20

View file

@ -92,10 +92,10 @@ void main(void) {
emissive = vec3(clamp(emissiveAmount, 0.0, 1.0)); emissive = vec3(clamp(emissiveAmount, 0.0, 1.0));
#elif defined(PROCEDURAL_V3) || defined(PROCEDURAL_V4) #elif defined(PROCEDURAL_V3) || defined(PROCEDURAL_V4)
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)
ProceduralFragment proceduralData = { ProceduralFragment proceduralData = ProceduralFragment(
#else #else
vec4 position = cam._viewInverse * _positionES; vec4 position = cam._viewInverse * _positionES;
ProceduralFragmentWithPosition proceduralData = { ProceduralFragmentWithPosition proceduralData = ProceduralFragmentWithPosition(
position.xyz, position.xyz,
#endif #endif
normal, normal,
@ -107,7 +107,7 @@ void main(void) {
DEFAULT_METALLIC, DEFAULT_METALLIC,
DEFAULT_OCCLUSION, DEFAULT_OCCLUSION,
DEFAULT_SCATTERING DEFAULT_SCATTERING
}; );
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)
emissiveAmount = getProceduralFragment(proceduralData); emissiveAmount = getProceduralFragment(proceduralData);