if(supports_stage(s.type))
{
s.content.visit(*this);
+ NodeRemover().apply(s, nodes_to_remove);
if(!stage->required_features.glsl_version)
stage->required_features.glsl_version = Version(1, (stage->required_features.gl_api==OPENGL_ES2 ? 0 : 10));
{
var.name = "gl_FragColor";
var.declaration = 0;
- r_type = "vec4";
}
- else if(var.declaration)
- r_type = var.declaration->type;
- else
- r_type.clear();
}
void LegacyConverter::visit(Assignment &assign)
void LegacyConverter::visit(FunctionCall &call)
{
- if(call.name=="texture")
+ if(call.declaration && call.declaration->source==BUILTIN_SOURCE)
{
- string sampler_type;
- r_type.clear();
- NodeArray<Expression>::iterator i = call.arguments.begin();
- if(i!=call.arguments.end())
- {
- (*i)->visit(*this);
- sampler_type = r_type;
-
- for(; i!=call.arguments.end(); ++i)
- (*i)->visit(*this);
- }
-
- if(!supports_unified_sampling_functions())
+ if(!call.name.compare(0, 7, "texture") && call.arguments.size()>=1)
{
- if(sampler_type=="sampler1D")
- call.name = "texture1D";
- else if(sampler_type=="sampler2D")
- call.name = "texture2D";
- else if(sampler_type=="sampler3D")
- call.name = "texture3D";
- else if(sampler_type=="samplerCube")
- call.name = "textureCube";
- else if(sampler_type=="sampler1DShadow")
- call.name = "shadow1D";
- else if(sampler_type=="sampler2DShadow")
- call.name = "shadow2D";
- else if(sampler_type=="sampler1DArray")
- {
- check_extension(&Features::ext_texture_array);
- call.name = "texture1DArray";
- }
- else if(sampler_type=="sampler2DArray")
- {
- check_extension(&Features::ext_texture_array);
- call.name = "texture2DArray";
- }
- else if(sampler_type=="sampler1DArrayShadow")
- {
- check_extension(&Features::ext_texture_array);
- call.name = "shadow1DArray";
- }
- else if(sampler_type=="sampler2DArrayShadow")
+ const ImageTypeDeclaration *arg_image = dynamic_cast<const ImageTypeDeclaration *>(call.arguments.front()->type);
+ if(arg_image && !supports_unified_sampling_functions())
{
- check_extension(&Features::ext_texture_array);
- call.name = "shadow2DArray";
+ string suffix = call.name.substr(7);
+ call.name = (arg_image->shadow ? "shadow" : "texture");
+
+ switch(arg_image->dimensions)
+ {
+ case ImageTypeDeclaration::ONE: call.name += "1D"; break;
+ case ImageTypeDeclaration::TWO: call.name += "2D"; break;
+ case ImageTypeDeclaration::THREE: call.name += "3D"; break;
+ case ImageTypeDeclaration::CUBE: call.name += "Cube"; break;
+ }
+
+ if(arg_image->array)
+ {
+ /* Array textures and the unified sampling function name were
+ both introduced in GLSL 1.30. */
+ if(arg_image->dimensions==ImageTypeDeclaration::ONE || arg_image->dimensions==ImageTypeDeclaration::TWO)
+ check_extension(&Features::ext_texture_array);
+ call.name += "Array";
+ }
+
+ call.name += suffix;
}
}
}
- else
- TraversingVisitor::visit(call);
+
+ TraversingVisitor::visit(call);
}
bool LegacyConverter::supports_interface_layouts() const
return check_version(Version(3, 0));
else if(check_version(Version(3, 30)))
return true;
- else
+ else if(check_version(Version(1, 30)))
return check_extension(&Features::arb_explicit_attrib_location);
+ else
+ return false;
}
bool LegacyConverter::supports_centroid_sampling() const
void LegacyConverter::visit(VariableDeclaration &var)
{
- if(var.layout && !supports_interface_layouts())
+ if(var.layout)
{
- vector<Layout::Qualifier>::iterator i;
- for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->name!="location"); ++i) ;
- if(i!=var.layout->qualifiers.end())
+ for(vector<Layout::Qualifier>::const_iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); )
{
- if(stage->type==Stage::VERTEX && var.interface=="in")
- {
- stage->locations[var.name] = i->value;
- var.layout->qualifiers.erase(i);
- }
- else if(stage->type==Stage::FRAGMENT && var.interface=="out")
+ if(i->name=="location" && !supports_interface_layouts())
{
- if(check_extension(&Features::ext_gpu_shader4))
+ if(stage->type==Stage::VERTEX && var.interface=="in")
stage->locations[var.name] = i->value;
- else if(i->value!=0)
- unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs");
- var.layout->qualifiers.erase(i);
+ else if(stage->type==Stage::FRAGMENT && var.interface=="out")
+ {
+ if(check_extension(&Features::ext_gpu_shader4))
+ stage->locations[var.name] = i->value;
+ else if(i->value!=0)
+ unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs");
+ }
+
+ i = var.layout->qualifiers.erase(i);
}
-
- if(var.layout->qualifiers.empty())
- var.layout = 0;
+ else
+ ++i;
}
+
+ if(var.layout->qualifiers.empty())
+ var.layout = 0;
}
if(var.sampling=="centroid")