Code hygiene work for spvc (#808)

Changing the include path to spvc instead of shaderc Reformatting a couple rules to be more readable.
google · Sep 18, 2019 · 68b6857 · 68b6857
1 parent 5903ef1
commit 68b6857
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 15 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -123,8 +123,8 @@ component("libshaderc_spvc") {
     "libshaderc/include/shaderc/env.h",
     "libshaderc/include/shaderc/status.h",
     "libshaderc/include/shaderc/visibility.h",
-    "libshaderc_spvc/include/shaderc/spvc.h",
-    "libshaderc_spvc/include/shaderc/spvc.hpp",
+    "libshaderc_spvc/include/spvc/spvc.h",
+    "libshaderc_spvc/include/spvc/spvc.hpp",
     "libshaderc_spvc/src/spvc.cc",
     "libshaderc_spvc/src/spvc_private.cc",
     "libshaderc_spvc/src/spvc_private.h",

diff --git a/libshaderc_spvc/CMakeLists.txt b/libshaderc_spvc/CMakeLists.txt
@@ -4,19 +4,29 @@ project(libshaderc)
 # a dependency here will force clients of the library to rebuild
 # when it changes.
 set(SPVC_SOURCES
-  include/shaderc/spvc.h
-  include/shaderc/spvc.hpp
+  include/spvc/spvc.h
+  include/spvc/spvc.hpp
   src/spvc.cc
   src/spvc_private.cc
 )
 
 add_library(shaderc_spvc STATIC ${SPVC_SOURCES})
 shaderc_default_compile_options(shaderc_spvc)
-target_include_directories(shaderc_spvc PUBLIC include PRIVATE ${shaderc_SOURCE_DIR}/libshaderc/include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${spirv-tools_SOURCE_DIR}/include ${SPIRV-Cross_SOURCE_DIR}/..)
+target_include_directories(shaderc_spvc
+  PUBLIC include
+  ${shaderc_SOURCE_DIR}/libshaderc/include
+  ${shaderc_SOURCE_DIR}/libshaderc_util/include
+  ${spirv-tools_SOURCE_DIR}/include
+  ${SPIRV-Cross_SOURCE_DIR}/..)
 
 add_library(shaderc_spvc_shared SHARED ${SPVC_SOURCES})
 shaderc_default_compile_options(shaderc_spvc_shared)
-target_include_directories(shaderc_spvc_shared PUBLIC include PRIVATE ${shaderc_SOURCE_DIR}/libshaderc/include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${spirv-tools_SOURCE_DIR}/include ${SPIRV-Cross_SOURCE_DIR}/..)
+target_include_directories(shaderc_spvc_shared
+  PUBLIC include
+  ${shaderc_SOURCE_DIR}/libshaderc/include
+  ${shaderc_SOURCE_DIR}/libshaderc_util/include
+  ${spirv-tools_SOURCE_DIR}/include
+  ${SPIRV-Cross_SOURCE_DIR}/..)
 
 target_compile_definitions(shaderc_spvc_shared
     PRIVATE SHADERC_IMPLEMENTATION
@@ -33,8 +43,8 @@ set_target_properties(shaderc_spvc_shared PROPERTIES SOVERSION 1)
 if(SHADERC_ENABLE_INSTALL)
   install(
     FILES
-      include/shaderc/spvc.h
-      include/shaderc/spvc.hpp
+      include/spvc/spvc.h
+      include/spvc/spvc.hpp
     DESTINATION
       ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
 

diff --git a/libshaderc_spvc/include/shaderc/spvc.h → libshaderc_spvc/include/spvc/spvc.h b/libshaderc_spvc/include/shaderc/spvc.h → libshaderc_spvc/include/spvc/spvc.h
diff --git a/libshaderc_spvc/include/shaderc/spvc.hpp → libshaderc_spvc/include/spvc/spvc.hpp b/libshaderc_spvc/include/shaderc/spvc.hpp → libshaderc_spvc/include/spvc/spvc.hpp
diff --git a/libshaderc_spvc/src/spvc_cpp_test.cc b/libshaderc_spvc/src/spvc_cpp_test.cc
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include "common_shaders_for_test.h"
-#include "shaderc/spvc.hpp"
+#include "spvc/spvc.hpp"
 
 using shaderc_spvc::CompilationResult;
 using shaderc_spvc::CompileOptions;

diff --git a/libshaderc_spvc/src/spvc_private.h b/libshaderc_spvc/src/spvc_private.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "shaderc/spvc.h"
+#include "spvc/spvc.h"
 #include <spirv_glsl.hpp>
 #include <spirv_hlsl.hpp>
 #include <spirv_msl.hpp>

diff --git a/libshaderc_spvc/src/spvc_smoke_test_util.c b/libshaderc_spvc/src/spvc_smoke_test_util.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "shaderc/shaderc.h"
-#include "shaderc/spvc.h"
+#include "spvc/spvc.h"
 
 typedef shaderc_spvc_compilation_result_t (*CompileInto)(
     const shaderc_spvc_compiler_t, const uint32_t*, size_t,

diff --git a/libshaderc_spvc/src/spvc_test.cc b/libshaderc_spvc/src/spvc_test.cc
@@ -16,7 +16,7 @@
 #include <thread>
 
 #include "common_shaders_for_test.h"
-#include "shaderc/spvc.h"
+#include "spvc/spvc.h"
 
 namespace {
 

diff --git a/libshaderc_spvc/src/spvc_webgpu_cpp_test.cc b/libshaderc_spvc/src/spvc_webgpu_cpp_test.cc
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include "common_shaders_for_test.h"
-#include "shaderc/spvc.hpp"
+#include "spvc/spvc.hpp"
 
 using shaderc_spvc::CompilationResult;
 using shaderc_spvc::CompileOptions;

diff --git a/libshaderc_spvc/src/spvc_webgpu_test.cc b/libshaderc_spvc/src/spvc_webgpu_test.cc
@@ -17,7 +17,7 @@
 #include <thread>
 
 #include "common_shaders_for_test.h"
-#include "shaderc/spvc.h"
+#include "spvc/spvc.h"
 
 namespace {
 

diff --git a/spvc/src/main.cc b/spvc/src/main.cc
@@ -21,7 +21,7 @@
 #include "libshaderc_util/args.h"
 #include "libshaderc_util/string_piece.h"
 #include "shaderc/env.h"
-#include "shaderc/spvc.hpp"
+#include "spvc/spvc.hpp"
 #include "shaderc/status.h"
 #include "spirv-tools/libspirv.h"