Run format_all.sh.
This commit is contained in:
parent
81cb8b54a3
commit
6e1c3ccb72
3
main.cpp
3
main.cpp
@ -707,7 +707,8 @@ static int main_inner(int argc, char *argv[])
|
||||
cbs.add("--msl", [&args](CLIParser &) { args.msl = true; });
|
||||
cbs.add("--hlsl", [&args](CLIParser &) { args.hlsl = true; });
|
||||
cbs.add("--hlsl-enable-compat", [&args](CLIParser &) { args.hlsl_compat = true; });
|
||||
cbs.add("--hlsl-support-nonzero-basevertex-baseinstance", [&args](CLIParser &) { args.hlsl_support_nonzero_base = true; });
|
||||
cbs.add("--hlsl-support-nonzero-basevertex-baseinstance",
|
||||
[&args](CLIParser &) { args.hlsl_support_nonzero_base = true; });
|
||||
cbs.add("--vulkan-semantics", [&args](CLIParser &) { args.vulkan_semantics = true; });
|
||||
cbs.add("--flatten-multidimensional-arrays", [&args](CLIParser &) { args.flatten_multidimensional_arrays = true; });
|
||||
cbs.add("--no-420pack-extension", [&args](CLIParser &) { args.use_420pack_extension = false; });
|
||||
|
@ -779,8 +779,7 @@ ShaderResources Compiler::get_shader_resources(const unordered_set<uint32_t> *ac
|
||||
{
|
||||
// There can only be one push constant block, but keep the vector in case this restriction is lifted
|
||||
// in the future.
|
||||
res.push_constant_buffers.push_back(
|
||||
{ var.self, var.basetype, type.self, get_name(var.self) });
|
||||
res.push_constant_buffers.push_back({ var.self, var.basetype, type.self, get_name(var.self) });
|
||||
}
|
||||
// Images
|
||||
else if (type.storage == StorageClassUniformConstant && type.basetype == SPIRType::Image &&
|
||||
|
@ -15,8 +15,8 @@
|
||||
*/
|
||||
|
||||
#include "spirv_cross_parsed_ir.hpp"
|
||||
#include <assert.h>
|
||||
#include <algorithm>
|
||||
#include <assert.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace spv;
|
||||
|
@ -296,9 +296,7 @@ void CompilerGLSL::reset()
|
||||
func.flush_undeclared = true;
|
||||
});
|
||||
|
||||
ir.for_each_typed_id<SPIRVariable>([&](uint32_t, SPIRVariable &var) {
|
||||
var.dependees.clear();
|
||||
});
|
||||
ir.for_each_typed_id<SPIRVariable>([&](uint32_t, SPIRVariable &var) { var.dependees.clear(); });
|
||||
|
||||
ir.reset_all_of_type<SPIRExpression>();
|
||||
ir.reset_all_of_type<SPIRAccessChain>();
|
||||
@ -1942,8 +1940,7 @@ void CompilerGLSL::replace_fragment_outputs()
|
||||
ir.for_each_typed_id<SPIRVariable>([&](uint32_t, SPIRVariable &var) {
|
||||
auto &type = this->get<SPIRType>(var.basetype);
|
||||
|
||||
if (!is_builtin_variable(var) && !var.remapped_variable && type.pointer &&
|
||||
var.storage == StorageClassOutput)
|
||||
if (!is_builtin_variable(var) && !var.remapped_variable && type.pointer && var.storage == StorageClassOutput)
|
||||
replace_fragment_output(var);
|
||||
});
|
||||
}
|
||||
|
@ -1192,8 +1192,7 @@ void CompilerHLSL::emit_resources()
|
||||
}
|
||||
|
||||
if (var.storage != StorageClassFunction && !is_builtin_variable(var) && !var.remapped_variable &&
|
||||
type.pointer &&
|
||||
(type.storage == StorageClassUniformConstant || type.storage == StorageClassAtomicCounter))
|
||||
type.pointer && (type.storage == StorageClassUniformConstant || type.storage == StorageClassAtomicCounter))
|
||||
{
|
||||
emit_uniform(var);
|
||||
emitted = true;
|
||||
|
@ -4366,8 +4366,7 @@ string CompilerMSL::entry_point_args(bool append_comma)
|
||||
|
||||
auto &entry_func = this->get<SPIRFunction>(ir.default_entry_point);
|
||||
entry_func.fixup_hooks_in.push_back([=]() {
|
||||
statement(builtin_type_decl(bi_type), " ", to_expression(var_id),
|
||||
" = simd_is_helper_thread();");
|
||||
statement(builtin_type_decl(bi_type), " ", to_expression(var_id), " = simd_is_helper_thread();");
|
||||
});
|
||||
}
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user