Change SpirvShaderInstructions.inc extension to .inl

Files that are #included in a non-standard header way usually have a .inc or .inl extension. Reactor already has Reactor/Traits.inl, so let's be consistent and stick with this extension. Bug: b/148778720 Change-Id: Ie69951c254921b9cf86c3ab201533a3b21489b97 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40977 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Ben Clayton <bclayton@google.com>

Change SpirvShaderInstructions.inc extension to .inl
349b1a3c · Ben Clayton · 7dd1fce6 · 349b1a3c · 349b1a3c
Commit 349b1a3c authored Feb 08, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

SpirvShaderInstructions.cpp src/Pipeline/SpirvShaderInstructions.cpp +3 -3

SpirvShaderInstructions.inl src/Pipeline/SpirvShaderInstructions.inl +3 -3

No files found.
--- a/src/Pipeline/SpirvShaderInstructions.cpp
+++ b/src/Pipeline/SpirvShaderInstructions.cpp
@@ -22,7 +22,7 @@
 namespace {

 // checkForNoMissingOps() is an unused function that simply exists to try and
-// detect missing opcodes in "SpirvShaderInstructions.inc".
+// detect missing opcodes in "SpirvShaderInstructions.inl".
 // If there are missing opcodes, then some compilers will warn that not all
 // enum values are handled by the switch case below.
 constexpr void checkForNoMissingOps(spv::Op op)
@@ -35,7 +35,7 @@ constexpr void checkForNoMissingOps(spv::Op op)
 #define DECORATE_OP(isStatement, op) \
 	case spv::op:                    \
 		return;
-#include "SpirvShaderInstructions.inc"
+#include "SpirvShaderInstructions.inl"
 #undef DECORATE_OP
 		case spv::OpMax: return;
 	}
@@ -54,7 +54,7 @@ bool SpirvShader::IsStatement(spv::Op op)
 #define DECORATE_OP(isStatement, op)    \
 	CONCAT2(IS_STATEMENT_, isStatement) \
 	(op)
-#include "SpirvShaderInstructions.inc"
+#include "SpirvShaderInstructions.inl"
 #undef IS_STATEMENT_T
 #undef IS_STATEMENT_F
 #undef DECORATE_OP

--- a/src/Pipeline/SpirvShaderInstructions.inc
+++ b/src/Pipeline/SpirvShaderInstructions.inc
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// SpirvShaderInstructions.inc holds additional metadata for SPIR-V opcodes.
-// SpirvShaderInstructions.inc should only be included by
+// SpirvShaderInstructions.inl holds additional metadata for SPIR-V opcodes.
+// SpirvShaderInstructions.inl should only be included by
 // SpirvShaderInstructions.cpp.

 #ifndef DECORATE_OP
-#	error "SpirvShaderInstructions.inc must be included after defining DECORATE_OP()"
+#	error "SpirvShaderInstructions.inl must be included after defining DECORATE_OP()"
 #endif

 //   is-statement