Skip to content

Commit 338a18d

Browse files
spencer-lunargspencer-lunarg
committed
rerun clang-format with 132 line width
1 parent 3f46812 commit 338a18d

File tree

13 files changed

+1042
-1791
lines changed

13 files changed

+1042
-1791
lines changed

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ Language: Cpp
33
BasedOnStyle: Google
44
DerivePointerAlignment: false
55
SortIncludes: true
6+
ColumnLimit: 132
67
...

‎common/output_stream.cpp‎

Lines changed: 132 additions & 271 deletions
Large diffs are not rendered by default.

‎common/output_stream.h‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#ifndef SPIRV_REFLECT_OUTPUT_STREAM_H
22
#define SPIRV_REFLECT_OUTPUT_STREAM_H
33

4-
#include "spirv_reflect.h"
54
#include <map>
65
#include <ostream>
76
#include <string>
87

8+
#include "spirv_reflect.h"
9+
910
std::string ToStringSpvSourceLanguage(SpvSourceLanguage lang);
1011
std::string ToStringSpvExecutionModel(SpvExecutionModel model);
1112
std::string ToStringSpvStorageClass(SpvStorageClass storage_class);
1213
std::string ToStringSpvDim(SpvDim dim);
13-
std::string ToStringSpvBuiltIn(const SpvReflectInterfaceVariable& variable,
14-
bool preface);
14+
std::string ToStringSpvBuiltIn(const SpvReflectInterfaceVariable& variable, bool preface);
1515
std::string ToStringSpvImageFormat(SpvImageFormat fmt);
1616

1717
std::string ToStringGenerator(SpvReflectGenerator generator);
@@ -25,29 +25,27 @@ std::string ToStringFormat(SpvReflectFormat fmt);
2525
std::string ToStringComponentType(const SpvReflectTypeDescription& type, uint32_t member_decoration_flags);
2626
std::string ToStringType(SpvSourceLanguage src_lang, const SpvReflectTypeDescription& type);
2727

28-
//std::ostream& operator<<(std::ostream& os, const spv_reflect::ShaderModule& obj);
28+
// std::ostream& operator<<(std::ostream& os, const spv_reflect::ShaderModule& obj);
2929
void WriteReflection(const spv_reflect::ShaderModule& obj, bool flatten_cbuffers, std::ostream& os);
3030

3131
class SpvReflectToYaml {
32-
public:
32+
public:
3333
// verbosity = 0: top-level tables only (module, block variables, interface variables, descriptor bindings).
3434
// verbosity = 1: everything above, plus type description tables for all public objects.
3535
// verbosity = 2: everything above, plus SPIRV bytecode and full type description table. HUGE.
3636
explicit SpvReflectToYaml(const SpvReflectShaderModule& shader_module, uint32_t verbosity = 0);
3737

38-
friend std::ostream& operator<<(std::ostream& os, SpvReflectToYaml& to_yaml)
39-
{
38+
friend std::ostream& operator<<(std::ostream& os, SpvReflectToYaml& to_yaml) {
4039
to_yaml.Write(os);
4140
return os;
4241
}
43-
private:
42+
43+
private:
4444
void Write(std::ostream& os);
4545

4646
SpvReflectToYaml(const SpvReflectToYaml&) = delete;
4747
SpvReflectToYaml(const SpvReflectToYaml&&) = delete;
48-
static std::string Indent(uint32_t level) {
49-
return std::string(2*level, ' ');
50-
}
48+
static std::string Indent(uint32_t level) { return std::string(2 * level, ' '); }
5149
static std::string SafeString(const char* str) { return str ? (std::string("\"") + str + "\"") : ""; }
5250
void WriteTypeDescription(std::ostream& os, const SpvReflectTypeDescription& td, uint32_t indent_level);
5351
void WriteBlockVariable(std::ostream& os, const SpvReflectBlockVariable& bv, uint32_t indent_level);
@@ -60,7 +58,6 @@ class SpvReflectToYaml {
6058
void WriteDescriptorBindingTypes(std::ostream& os, const SpvReflectDescriptorBinding& db, uint32_t indent_level);
6159
void WriteInterfaceVariableTypes(std::ostream& os, const SpvReflectInterfaceVariable& iv, uint32_t indent_level);
6260

63-
6461
const SpvReflectShaderModule& sm_;
6562
uint32_t verbosity_ = 0;
6663
std::map<const SpvReflectTypeDescription*, uint32_t> type_description_to_index_;
@@ -69,5 +66,4 @@ class SpvReflectToYaml {
6966
std::map<const SpvReflectInterfaceVariable*, uint32_t> interface_variable_to_index_;
7067
};
7168

72-
7369
#endif

‎examples/arg_parser.cpp‎

Lines changed: 18 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,47 @@ ArgParser::ArgParser() {}
88

99
ArgParser::~ArgParser() {}
1010

11-
ArgParser::Option* ArgParser::FindOptionByShortName(
12-
const std::string& short_name) {
11+
ArgParser::Option* ArgParser::FindOptionByShortName(const std::string& short_name) {
1312
ArgParser::Option* p_option = nullptr;
1413
auto it = std::find_if(std::begin(m_options), std::end(m_options),
15-
[short_name](const ArgParser::Option& elem) -> bool {
16-
return elem.short_name == short_name;
17-
});
14+
[short_name](const ArgParser::Option& elem) -> bool { return elem.short_name == short_name; });
1815
if (it != std::end(m_options)) {
1916
p_option = &(*it);
2017
}
2118
return p_option;
2219
}
2320

24-
const ArgParser::Option* ArgParser::FindOptionByShortName(
25-
const std::string& short_name) const {
21+
const ArgParser::Option* ArgParser::FindOptionByShortName(const std::string& short_name) const {
2622
const ArgParser::Option* p_option = nullptr;
2723
auto it = std::find_if(std::begin(m_options), std::end(m_options),
28-
[short_name](const ArgParser::Option& elem) -> bool {
29-
return elem.short_name == short_name;
30-
});
24+
[short_name](const ArgParser::Option& elem) -> bool { return elem.short_name == short_name; });
3125
if (it != std::end(m_options)) {
3226
p_option = &(*it);
3327
}
3428
return p_option;
3529
}
3630

37-
ArgParser::Option* ArgParser::FindOptionByLongName(
38-
const std::string& long_name) {
31+
ArgParser::Option* ArgParser::FindOptionByLongName(const std::string& long_name) {
3932
ArgParser::Option* p_option = nullptr;
4033
auto it = std::find_if(std::begin(m_options), std::end(m_options),
41-
[long_name](const ArgParser::Option& elem) -> bool {
42-
return elem.long_name == long_name;
43-
});
34+
[long_name](const ArgParser::Option& elem) -> bool { return elem.long_name == long_name; });
4435
if (it != std::end(m_options)) {
4536
p_option = &(*it);
4637
}
4738
return p_option;
4839
}
4940

50-
const ArgParser::Option* ArgParser::FindOptionByLongName(
51-
const std::string& long_name) const {
41+
const ArgParser::Option* ArgParser::FindOptionByLongName(const std::string& long_name) const {
5242
const ArgParser::Option* p_option = nullptr;
5343
auto it = std::find_if(std::begin(m_options), std::end(m_options),
54-
[long_name](const ArgParser::Option& elem) -> bool {
55-
return elem.long_name == long_name;
56-
});
44+
[long_name](const ArgParser::Option& elem) -> bool { return elem.long_name == long_name; });
5745
if (it != std::end(m_options)) {
5846
p_option = &(*it);
5947
}
6048
return p_option;
6149
}
6250

63-
bool ArgParser::AddFlag(const std::string& short_name,
64-
const std::string& long_name, const std::string& desc) {
51+
bool ArgParser::AddFlag(const std::string& short_name, const std::string& long_name, const std::string& desc) {
6552
Option option = {};
6653
option.short_name = short_name;
6754
option.long_name = long_name;
@@ -76,9 +63,7 @@ bool ArgParser::AddFlag(const std::string& short_name,
7663
return true;
7764
}
7865

79-
bool ArgParser::AddOptionString(const std::string& short_name,
80-
const std::string& long_name,
81-
const std::string& desc,
66+
bool ArgParser::AddOptionString(const std::string& short_name, const std::string& long_name, const std::string& desc,
8267
const std::string& default_value) {
8368
Option option = {};
8469
option.short_name = short_name;
@@ -95,9 +80,8 @@ bool ArgParser::AddOptionString(const std::string& short_name,
9580
return true;
9681
}
9782

98-
bool ArgParser::AddOptionInt(const std::string& short_name,
99-
const std::string& long_name,
100-
const std::string& desc, int default_value) {
83+
bool ArgParser::AddOptionInt(const std::string& short_name, const std::string& long_name, const std::string& desc,
84+
int default_value) {
10185
Option option = {};
10286
option.short_name = short_name;
10387
option.long_name = long_name;
@@ -113,9 +97,8 @@ bool ArgParser::AddOptionInt(const std::string& short_name,
11397
return true;
11498
}
11599

116-
bool ArgParser::AddOptionFloat(const std::string& short_name,
117-
const std::string& long_name,
118-
const std::string& desc, float default_value) {
100+
bool ArgParser::AddOptionFloat(const std::string& short_name, const std::string& long_name, const std::string& desc,
101+
float default_value) {
119102
Option option = {};
120103
option.short_name = short_name;
121104
option.long_name = long_name;
@@ -228,8 +211,7 @@ bool ArgParser::GetArg(size_t i, std::string* p_value) const {
228211

229212
const std::vector<std::string>& ArgParser::GetArgs() const { return m_args; }
230213

231-
bool ArgParser::GetFlag(const std::string& short_name,
232-
const std::string& long_name) const {
214+
bool ArgParser::GetFlag(const std::string& short_name, const std::string& long_name) const {
233215
auto p_short = FindOptionByShortName(short_name);
234216
auto p_long = FindOptionByLongName(long_name);
235217

@@ -252,9 +234,7 @@ bool ArgParser::GetFlag(const std::string& short_name,
252234
return p_option->parsed;
253235
}
254236

255-
bool ArgParser::GetString(const std::string& short_name,
256-
const std::string& long_name,
257-
std::string* p_value) const {
237+
bool ArgParser::GetString(const std::string& short_name, const std::string& long_name, std::string* p_value) const {
258238
auto p_short = FindOptionByShortName(short_name);
259239
auto p_long = FindOptionByLongName(long_name);
260240

@@ -281,8 +261,7 @@ bool ArgParser::GetString(const std::string& short_name,
281261
return true;
282262
}
283263

284-
bool ArgParser::GetInt(const std::string& short_name,
285-
const std::string& long_name, int* p_value) const {
264+
bool ArgParser::GetInt(const std::string& short_name, const std::string& long_name, int* p_value) const {
286265
auto p_short = FindOptionByShortName(short_name);
287266
auto p_long = FindOptionByLongName(long_name);
288267

@@ -309,8 +288,7 @@ bool ArgParser::GetInt(const std::string& short_name,
309288
return true;
310289
}
311290

312-
bool ArgParser::GetFloat(const std::string& short_name,
313-
const std::string& long_name, float* p_value) const {
291+
bool ArgParser::GetFloat(const std::string& short_name, const std::string& long_name, float* p_value) const {
314292
auto p_short = FindOptionByShortName(short_name);
315293
auto p_long = FindOptionByLongName(long_name);
316294

‎examples/arg_parser.h‎

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,63 @@
33

44
#include <iostream>
55
#include <string>
6-
#include <vector>
76
#include <unordered_map>
7+
#include <vector>
88

99
class ArgParser {
10-
public:
11-
enum OptionType {
12-
OPTION_TYPE_UNDEFINED = 0,
13-
OPTION_TYPE_FLAG,
14-
OPTION_TYPE_STRING,
15-
OPTION_TYPE_INT,
16-
OPTION_TYPE_FLOAT
17-
};
10+
public:
11+
enum OptionType { OPTION_TYPE_UNDEFINED = 0, OPTION_TYPE_FLAG, OPTION_TYPE_STRING, OPTION_TYPE_INT, OPTION_TYPE_FLOAT };
1812

1913
struct OptionValue {
20-
std::string str;
14+
std::string str;
2115
union {
22-
int i32;
23-
float f32;
16+
int i32;
17+
float f32;
2418
};
2519
};
2620

2721
struct Option {
28-
std::string short_name;
29-
std::string long_name;
30-
OptionType type;
31-
std::string desc;
32-
OptionValue value;
33-
OptionValue default_value;
34-
bool parsed;
22+
std::string short_name;
23+
std::string long_name;
24+
OptionType type;
25+
std::string desc;
26+
OptionValue value;
27+
OptionValue default_value;
28+
bool parsed;
3529
};
3630

3731
ArgParser();
3832
~ArgParser();
3933

40-
bool AddFlag(const std::string& short_name, const std::string& long_name, const std::string& desc);
41-
bool AddOptionString(const std::string& short_name, const std::string& long_name, const std::string& desc, const std::string& default_value = "");
42-
bool AddOptionInt(const std::string& short_name, const std::string& long_name, const std::string& desc, int default_value = 0);
43-
bool AddOptionFloat(const std::string& short_name, const std::string& long_name, const std::string& desc, float default_value = 0);
34+
bool AddFlag(const std::string& short_name, const std::string& long_name, const std::string& desc);
35+
bool AddOptionString(const std::string& short_name, const std::string& long_name, const std::string& desc,
36+
const std::string& default_value = "");
37+
bool AddOptionInt(const std::string& short_name, const std::string& long_name, const std::string& desc, int default_value = 0);
38+
bool AddOptionFloat(const std::string& short_name, const std::string& long_name, const std::string& desc,
39+
float default_value = 0);
40+
41+
bool Parse(int argc, char** argv, std::ostream& os);
4442

45-
bool Parse(int argc, char** argv, std::ostream& os);
46-
47-
size_t GetArgCount() const;
48-
bool GetArg(size_t i, std::string* p_value) const;
43+
size_t GetArgCount() const;
44+
bool GetArg(size_t i, std::string* p_value) const;
4945
const std::vector<std::string>& GetArgs() const;
5046

51-
bool GetFlag(const std::string& short_name, const std::string& long_name) const;
52-
bool GetString(const std::string& short_name, const std::string& long_name, std::string* p_value) const;
53-
bool GetInt(const std::string& short_name, const std::string& long_name, int* p_value) const;
54-
bool GetFloat(const std::string& short_name, const std::string& long_name, float* p_value) const;
47+
bool GetFlag(const std::string& short_name, const std::string& long_name) const;
48+
bool GetString(const std::string& short_name, const std::string& long_name, std::string* p_value) const;
49+
bool GetInt(const std::string& short_name, const std::string& long_name, int* p_value) const;
50+
bool GetFloat(const std::string& short_name, const std::string& long_name, float* p_value) const;
5551

56-
void PrintHelp(std::ostream& os);
52+
void PrintHelp(std::ostream& os);
5753

58-
private:
59-
ArgParser::Option* FindOptionByShortName(const std::string& short_name);
60-
const ArgParser::Option* FindOptionByShortName(const std::string& short_name) const;
61-
ArgParser::Option* FindOptionByLongName(const std::string& long_name);
62-
const ArgParser::Option* FindOptionByLongName(const std::string& long_name) const;
54+
private:
55+
ArgParser::Option* FindOptionByShortName(const std::string& short_name);
56+
const ArgParser::Option* FindOptionByShortName(const std::string& short_name) const;
57+
ArgParser::Option* FindOptionByLongName(const std::string& long_name);
58+
const ArgParser::Option* FindOptionByLongName(const std::string& long_name) const;
6359

64-
private:
65-
std::vector<ArgParser::Option> m_options;
66-
std::vector<std::string> m_args;
60+
private:
61+
std::vector<ArgParser::Option> m_options;
62+
std::vector<std::string> m_args;
6763
};
6864

69-
#endif // __VERIFLECT_ARG_PARSER_H__
65+
#endif // __VERIFLECT_ARG_PARSER_H__

0 commit comments

Comments
 (0)