bool LocationAllocator::visit_uniform(const string &name, RefPtr<Layout> &layout)
{
- int desc_set = 0;
+ int desc_set = get_layout_value(layout.get(), "set");
int bind_point = get_layout_value(layout.get(), "binding");
if(features.target_api==VULKAN)
{
- desc_set = get_layout_value(layout.get(), "set");
if(desc_set<0 && bind_point>=0)
{
desc_set = 0;
if(desc_set>=0)
uniforms[name].desc_set = desc_set;
}
+ else if(desc_set>=0 && bind_point<0)
+ {
+ auto i = find_member(layout->qualifiers, string("set"), &Layout::Qualifier::name);
+ layout->qualifiers.erase(i);
+ }
if(bind_point>=0)
{
{
if(st==Stage::GEOMETRY)
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 20));
else
return check_version(Version(1, 50));
bool StructuralFeatureConverter::supports_unified_interface_syntax() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 0));
else
return check_version(Version(1, 30));
bool StructuralFeatureConverter::supports_unified_sampling_functions() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 0));
else
return check_version(Version(1, 30));
bool StructuralFeatureConverter::supports_interface_blocks(const string &iface) const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
{
if(iface=="uniform")
return check_version(Version(3, 0));
bool QualifierConverter::supports_interface_layouts() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 0));
else if(check_version(Version(3, 30)))
return true;
bool QualifierConverter::supports_stage_interface_layouts() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else if(check_version(Version(4, 10)))
return true;
bool QualifierConverter::supports_centroid_sampling() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 0));
else if(check_version(Version(1, 20)))
return true;
bool QualifierConverter::supports_sample_sampling() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 20));
else if(check_version(Version(4, 0)))
return true;
bool QualifierConverter::supports_uniform_location() const
{
- if(features.target_api==VULKAN)
- return false;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else if(check_version(Version(4, 30)))
return true;
bool QualifierConverter::supports_binding() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else
return check_version(Version(4, 20));
bool QualifierConverter::supports_interface_block_location() const
{
- if(features.target_api==VULKAN)
- return true;
- else if(features.target_api==OPENGL_ES)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 20));
else if(check_version(Version(4, 40)))
return true;