aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-01-24 17:32:17 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-26 15:03:28 +0000
commita56c4d267a877d208311a5326d134824ec987db3 (patch)
treed33e2e560c9f5962e4a8398cdea1c3be7e52d37e
parentfc4f768e5aaf8efdd112f38295a35de83a0f9a55 (diff)
Rename .include files to .inc
Change-Id: Ie7a59d598a5916d8620cb55064a1204f90bc148d Reviewed-on: https://skia-review.googlesource.com/99244 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
-rw-r--r--BUILD.gn2
-rw-r--r--src/sksl/SkSLCompiler.cpp12
-rw-r--r--src/sksl/sksl.inc (renamed from src/sksl/sksl.include)0
-rw-r--r--src/sksl/sksl_enums.inc (renamed from src/sksl/sksl_enums.include)0
-rw-r--r--src/sksl/sksl_fp.inc (renamed from src/sksl/sksl_fp.include)0
-rw-r--r--src/sksl/sksl_frag.inc (renamed from src/sksl/sksl_frag.include)0
-rw-r--r--src/sksl/sksl_geom.inc (renamed from src/sksl/sksl_geom.include)0
-rw-r--r--src/sksl/sksl_vert.inc (renamed from src/sksl/sksl_vert.include)0
8 files changed, 7 insertions, 7 deletions
diff --git a/BUILD.gn b/BUILD.gn
index f9b6bc9c43..841ff1eca0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -504,7 +504,7 @@ if (skia_compile_processors) {
]
outputs = [
"$target_out_dir/" +
- rebase_path("src/sksl/sksl_enums.include", target_out_dir),
+ rebase_path("src/sksl/sksl_enums.inc", target_out_dir),
]
args = [
rebase_path(sources[0]),
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 7589da98ee..06ab71f922 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -34,24 +34,24 @@
#define STRINGIFY(x) #x
static const char* SKSL_INCLUDE =
-#include "sksl.include"
+#include "sksl.inc"
;
static const char* SKSL_VERT_INCLUDE =
-#include "sksl_vert.include"
+#include "sksl_vert.inc"
;
static const char* SKSL_FRAG_INCLUDE =
-#include "sksl_frag.include"
+#include "sksl_frag.inc"
;
static const char* SKSL_GEOM_INCLUDE =
-#include "sksl_geom.include"
+#include "sksl_geom.inc"
;
static const char* SKSL_FP_INCLUDE =
-#include "sksl_enums.include"
-#include "sksl_fp.include"
+#include "sksl_enums.inc"
+#include "sksl_fp.inc"
;
namespace SkSL {
diff --git a/src/sksl/sksl.include b/src/sksl/sksl.inc
index 2b433ebd0f..2b433ebd0f 100644
--- a/src/sksl/sksl.include
+++ b/src/sksl/sksl.inc
diff --git a/src/sksl/sksl_enums.include b/src/sksl/sksl_enums.inc
index eb60b3b0c5..eb60b3b0c5 100644
--- a/src/sksl/sksl_enums.include
+++ b/src/sksl/sksl_enums.inc
diff --git a/src/sksl/sksl_fp.include b/src/sksl/sksl_fp.inc
index d407fd08f6..d407fd08f6 100644
--- a/src/sksl/sksl_fp.include
+++ b/src/sksl/sksl_fp.inc
diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.inc
index e96165be1f..e96165be1f 100644
--- a/src/sksl/sksl_frag.include
+++ b/src/sksl/sksl_frag.inc
diff --git a/src/sksl/sksl_geom.include b/src/sksl/sksl_geom.inc
index 1ce5265c19..1ce5265c19 100644
--- a/src/sksl/sksl_geom.include
+++ b/src/sksl/sksl_geom.inc
diff --git a/src/sksl/sksl_vert.include b/src/sksl/sksl_vert.inc
index da2a1a2513..da2a1a2513 100644
--- a/src/sksl/sksl_vert.include
+++ b/src/sksl/sksl_vert.inc