aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <antiagainst@google.com>2016-11-08 10:26:09 -0800
committerLei Zhang <antiagainst@gmail.com>2016-11-08 17:19:56 -0800
commit38036a7203ca604c0f25b0dc33da169ac58e2900 (patch)
tree388b3987da07ddf531b4736e1b70a9f03fb2ba06
parent2881fe958f6345c57be00594337e64982f676047 (diff)
downloadspirv-tools-38036a7203ca604c0f25b0dc33da169ac58e2900.tar.gz
Rename validation source files to comply with Google style guide.
-rw-r--r--source/CMakeLists.txt10
-rw-r--r--source/val/basic_block.cpp (renamed from source/val/BasicBlock.cpp)2
-rw-r--r--source/val/basic_block.h (renamed from source/val/BasicBlock.h)0
-rw-r--r--source/val/construct.cpp (renamed from source/val/Construct.cpp)2
-rw-r--r--source/val/construct.h (renamed from source/val/Construct.h)0
-rw-r--r--source/val/function.cpp (renamed from source/val/Function.cpp)6
-rw-r--r--source/val/function.h (renamed from source/val/Function.h)6
-rw-r--r--source/val/instruction.cpp (renamed from source/val/Instruction.cpp)2
-rw-r--r--source/val/instruction.h (renamed from source/val/Instruction.h)0
-rw-r--r--source/val/validation_state.cpp (renamed from source/val/ValidationState.cpp)8
-rw-r--r--source/val/validation_state.h (renamed from source/val/ValidationState.h)4
-rw-r--r--source/validate.cpp6
-rw-r--r--source/validate_cfg.cpp8
-rw-r--r--source/validate_datarules.cpp2
-rw-r--r--source/validate_id.cpp4
-rw-r--r--source/validate_instruction.cpp4
-rw-r--r--source/validate_layout.cpp4
-rw-r--r--test/val/val_state_test.cpp6
18 files changed, 37 insertions, 37 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 5439ecf7..0c6ff93d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -160,11 +160,11 @@ set(SPIRV_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/validate_instruction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/validate_datarules.cpp
${CMAKE_CURRENT_SOURCE_DIR}/validate_layout.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/val/BasicBlock.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/val/Construct.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/val/Function.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/val/Instruction.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/val/ValidationState.cpp)
+ ${CMAKE_CURRENT_SOURCE_DIR}/val/basic_block.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/val/construct.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/val/function.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/val/instruction.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/val/validation_state.cpp)
# The software_version.cpp file includes build-version.inc.
# Rebuild the software_version.cpp object file if it is older than
diff --git a/source/val/BasicBlock.cpp b/source/val/basic_block.cpp
index 55483b94..0bfc4f12 100644
--- a/source/val/BasicBlock.cpp
+++ b/source/val/basic_block.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "BasicBlock.h"
+#include "val/basic_block.h"
#include <algorithm>
#include <utility>
diff --git a/source/val/BasicBlock.h b/source/val/basic_block.h
index 29d730cb..29d730cb 100644
--- a/source/val/BasicBlock.h
+++ b/source/val/basic_block.h
diff --git a/source/val/Construct.cpp b/source/val/construct.cpp
index da87b4d3..4270063f 100644
--- a/source/val/Construct.cpp
+++ b/source/val/construct.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "val/Construct.h"
+#include "val/construct.h"
#include <cassert>
#include <cstddef>
diff --git a/source/val/Construct.h b/source/val/construct.h
index 09cf9dff..09cf9dff 100644
--- a/source/val/Construct.h
+++ b/source/val/construct.h
diff --git a/source/val/Function.cpp b/source/val/function.cpp
index 223fcb1e..e033bfe8 100644
--- a/source/val/Function.cpp
+++ b/source/val/function.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "val/Function.h"
+#include "val/function.h"
#include <cassert>
@@ -21,8 +21,8 @@
#include <unordered_map>
#include <utility>
-#include "val/BasicBlock.h"
-#include "val/Construct.h"
+#include "val/basic_block.h"
+#include "val/construct.h"
#include "validate.h"
using std::ignore;
diff --git a/source/val/Function.h b/source/val/function.h
index dc5c3242..bd993c79 100644
--- a/source/val/Function.h
+++ b/source/val/function.h
@@ -15,16 +15,16 @@
#ifndef LIBSPIRV_VAL_FUNCTION_H_
#define LIBSPIRV_VAL_FUNCTION_H_
-#include <list>
#include <functional>
+#include <list>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include "spirv-tools/libspirv.h"
#include "spirv/1.1/spirv.h"
-#include "val/BasicBlock.h"
-#include "val/Construct.h"
+#include "val/basic_block.h"
+#include "val/construct.h"
namespace libspirv {
diff --git a/source/val/Instruction.cpp b/source/val/instruction.cpp
index 02be245a..56bd37f5 100644
--- a/source/val/Instruction.cpp
+++ b/source/val/instruction.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "val/Instruction.h"
+#include "val/instruction.h"
#include <utility>
diff --git a/source/val/Instruction.h b/source/val/instruction.h
index 1d8fe91a..1d8fe91a 100644
--- a/source/val/Instruction.h
+++ b/source/val/instruction.h
diff --git a/source/val/ValidationState.cpp b/source/val/validation_state.cpp
index 13684160..11096bc3 100644
--- a/source/val/ValidationState.cpp
+++ b/source/val/validation_state.cpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "val/ValidationState.h"
+#include "val/validation_state.h"
#include <cassert>
-#include "val/BasicBlock.h"
-#include "val/Construct.h"
-#include "val/Function.h"
+#include "val/basic_block.h"
+#include "val/construct.h"
+#include "val/function.h"
using std::deque;
using std::make_pair;
diff --git a/source/val/ValidationState.h b/source/val/validation_state.h
index ff23d05e..006f0556 100644
--- a/source/val/ValidationState.h
+++ b/source/val/validation_state.h
@@ -27,8 +27,8 @@
#include "spirv-tools/libspirv.h"
#include "spirv/1.1/spirv.h"
#include "spirv_definition.h"
-#include "val/Function.h"
-#include "val/Instruction.h"
+#include "val/function.h"
+#include "val/instruction.h"
namespace libspirv {
diff --git a/source/validate.cpp b/source/validate.cpp
index d253d175..28984971 100644
--- a/source/validate.cpp
+++ b/source/validate.cpp
@@ -32,9 +32,9 @@
#include "spirv-tools/libspirv.h"
#include "spirv_constant.h"
#include "spirv_endian.h"
-#include "val/Construct.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/construct.h"
+#include "val/function.h"
+#include "val/validation_state.h"
using std::function;
using std::ostream_iterator;
diff --git a/source/validate_cfg.cpp b/source/validate_cfg.cpp
index 78436975..b01b88d0 100644
--- a/source/validate_cfg.cpp
+++ b/source/validate_cfg.cpp
@@ -26,10 +26,10 @@
#include <utility>
#include <vector>
-#include "val/BasicBlock.h"
-#include "val/Construct.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/basic_block.h"
+#include "val/construct.h"
+#include "val/function.h"
+#include "val/validation_state.h"
using std::find;
using std::function;
diff --git a/source/validate_datarules.cpp b/source/validate_datarules.cpp
index d21c33b3..c6626b83 100644
--- a/source/validate_datarules.cpp
+++ b/source/validate_datarules.cpp
@@ -23,7 +23,7 @@
#include "diagnostic.h"
#include "opcode.h"
#include "operand.h"
-#include "val/ValidationState.h"
+#include "val/validation_state.h"
using libspirv::CapabilitySet;
using libspirv::DiagnosticStream;
diff --git a/source/validate_id.cpp b/source/validate_id.cpp
index bd7f2067..f603a065 100644
--- a/source/validate_id.cpp
+++ b/source/validate_id.cpp
@@ -27,8 +27,8 @@
#include "message.h"
#include "opcode.h"
#include "spirv-tools/libspirv.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/function.h"
+#include "val/validation_state.h"
using libspirv::ValidationState_t;
using std::function;
diff --git a/source/validate_instruction.cpp b/source/validate_instruction.cpp
index 8160b10e..bcab49ad 100644
--- a/source/validate_instruction.cpp
+++ b/source/validate_instruction.cpp
@@ -26,8 +26,8 @@
#include "opcode.h"
#include "operand.h"
#include "spirv_definition.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/function.h"
+#include "val/validation_state.h"
using libspirv::AssemblyGrammar;
using libspirv::CapabilitySet;
diff --git a/source/validate_layout.cpp b/source/validate_layout.cpp
index de650b47..b8b55180 100644
--- a/source/validate_layout.cpp
+++ b/source/validate_layout.cpp
@@ -22,8 +22,8 @@
#include "opcode.h"
#include "operand.h"
#include "spirv-tools/libspirv.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/function.h"
+#include "val/validation_state.h"
using libspirv::ValidationState_t;
using libspirv::kLayoutMemoryModel;
diff --git a/test/val/val_state_test.cpp b/test/val/val_state_test.cpp
index d6635e0c..2e6dafbc 100644
--- a/test/val/val_state_test.cpp
+++ b/test/val/val_state_test.cpp
@@ -21,9 +21,9 @@
#include "spirv/1.1/spirv.h"
#include "enum_set.h"
-#include "val/Construct.h"
-#include "val/Function.h"
-#include "val/ValidationState.h"
+#include "val/construct.h"
+#include "val/function.h"
+#include "val/validation_state.h"
#include "validate.h"
namespace {