Skip to content

Commit

Permalink
Fix warnings and run format_all.sh.
Browse files Browse the repository at this point in the history
  • Loading branch information
HansKristian-Work committed Jun 22, 2018
1 parent b4c8c3b commit 040204d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion spirv_glsl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6704,7 +6704,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
case OpBitwiseXor:
{
auto type = get<SPIRType>(ops[0]).basetype;
BOP_CAST(^, type);
BOP_CAST (^, type);
break;
}

Expand Down
10 changes: 6 additions & 4 deletions spirv_reflect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,11 @@ string CompilerReflection::execution_model_to_str(spv::ExecutionModel model)
// FIXME include things like the local_size dimensions, geometry output vertex count, etc
void CompilerReflection::emit_entry_points()
{
auto entry_points = get_entry_points_and_stages();
if (!entry_points.empty())
auto entries = get_entry_points_and_stages();
if (!entries.empty())
{
json_stream->emit_json_key_array("entryPoints");
for (auto &e : entry_points)
for (auto &e : entries)
{
json_stream->begin_json_object();
json_stream->emit_json_key_value("name", e.name);
Expand Down Expand Up @@ -438,7 +438,6 @@ void CompilerReflection::emit_resources(const char *tag, const vector<Resource>
{
auto &type = get_type(res.type_id);
auto typeflags = meta[type.self].decoration.decoration_flags;
auto &dec = meta[type.self].decoration;
auto &mask = get_decoration_bitset(res.id);

// If we don't have a name, use the fallback for the type instead of the variable
Expand Down Expand Up @@ -555,6 +554,9 @@ void CompilerReflection::emit_specialization_constants()
case SPIRType::Boolean:
json_stream->emit_json_key_value("default_value", c.scalar() != 0);
break;

default:
break;
}
json_stream->end_json_object();
}
Expand Down

0 comments on commit 040204d

Please sign in to comment.