fsraytrace and vsraytrace were crashing on Mac OS X 10.6.3 in the Apple GLSL compiler function TPPStreamCompiler::assignOperands. Removing some const qualifers made the crashes go away.tags/mesa-7.9-rc1
@@ -76,10 +76,17 @@ static const char* fsSource = | |||
" vec3 n; \n" | |||
"}; \n" | |||
" \n" | |||
#ifdef __APPLE__ | |||
"Sphere spheres0 = Sphere( vec3(0.0,0.0,-1.0), 0.5 ); \n" | |||
"Sphere spheres1 = Sphere( vec3(-3.0,0.0,-1.0), 1.5 ); \n" | |||
"Sphere spheres2 = Sphere( vec3(0.0,3.0,-1.0), 0.5 ); \n" | |||
"Sphere spheres3 = Sphere( vec3(2.0,0.0,-1.0), 1.0 ); \n" | |||
#else | |||
"const Sphere spheres0 = Sphere( vec3(0.0,0.0,-1.0), 0.5 ); \n" | |||
"const Sphere spheres1 = Sphere( vec3(-3.0,0.0,-1.0), 1.5 ); \n" | |||
"const Sphere spheres2 = Sphere( vec3(0.0,3.0,-1.0), 0.5 ); \n" | |||
"const Sphere spheres3 = Sphere( vec3(2.0,0.0,-1.0), 1.0 ); \n" | |||
#endif | |||
" \n" | |||
"// Mesa intel gen4 generates \"unsupported IR in fragment shader 13\" for\n" | |||
"// sqrt, let's work around. \n" |
@@ -64,10 +64,17 @@ static const char* vsSource = | |||
" vec3 n; \n" | |||
"}; \n" | |||
" \n" | |||
#ifdef __APPLE__ | |||
"Sphere spheres0 = Sphere( vec3(0.0,0.0,-1.0), 0.5 ); \n" | |||
"Sphere spheres1 = Sphere( vec3(-3.0,0.0,-1.0), 1.5 ); \n" | |||
"Sphere spheres2 = Sphere( vec3(0.0,3.0,-1.0), 0.5 ); \n" | |||
"Sphere spheres3 = Sphere( vec3(2.0,0.0,-1.0), 1.0 ); \n" | |||
#else | |||
"const Sphere spheres0 = Sphere( vec3(0.0,0.0,-1.0), 0.5 ); \n" | |||
"const Sphere spheres1 = Sphere( vec3(-3.0,0.0,-1.0), 1.5 ); \n" | |||
"const Sphere spheres2 = Sphere( vec3(0.0,3.0,-1.0), 0.5 ); \n" | |||
"const Sphere spheres3 = Sphere( vec3(2.0,0.0,-1.0), 1.0 ); \n" | |||
#endif | |||
" \n" | |||
"// Mesa intel gen4 generates \"unsupported IR in fragment shader 13\" for\n" | |||
"// sqrt, let's work around. \n" |