change project name to Kazan and reformat code
authorJacob Lifshay <programmerjake@gmail.com>
Wed, 6 Sep 2017 02:09:04 +0000 (19:09 -0700)
committerJacob Lifshay <programmerjake@gmail.com>
Wed, 6 Sep 2017 02:09:04 +0000 (19:09 -0700)
86 files changed:
CMakeLists.txt
README.md
docs/gsoc-2017-landing-page.md
docs/util.md
src/demo/CMakeLists.txt
src/demo/demo.cpp
src/generate_spirv_parser/CMakeLists.txt
src/generate_spirv_parser/ast.cpp
src/generate_spirv_parser/ast.h
src/generate_spirv_parser/generate.cpp
src/generate_spirv_parser/generate.h
src/generate_spirv_parser/generate_spirv_parser.cpp
src/generate_spirv_parser/instruction_properties.cpp
src/generate_spirv_parser/instruction_properties.h
src/generate_spirv_parser/parser.cpp
src/generate_spirv_parser/parser.h
src/generate_spirv_parser/patch.cpp
src/generate_spirv_parser/patch.h
src/generate_spirv_parser/word_iterator.h
src/image/CMakeLists.txt
src/image/image.h
src/json/CMakeLists.txt
src/json/json.cpp
src/json/json.h
src/json/location.cpp
src/json/location.h
src/json/parser.cpp
src/json/parser.h
src/json/source.cpp
src/json/source.h
src/llvm_wrapper/CMakeLists.txt
src/llvm_wrapper/llvm_wrapper.cpp
src/llvm_wrapper/llvm_wrapper.h
src/llvm_wrapper/orc_compile_stack.cpp
src/llvm_wrapper/orc_compile_stack.h
src/pipeline/CMakeLists.txt
src/pipeline/pipeline.cpp
src/pipeline/pipeline.h
src/spirv/CMakeLists.txt
src/spirv/literal_string.cpp
src/spirv/literal_string.h
src/spirv/word.h
src/spirv_to_llvm/CMakeLists.txt
src/spirv_to_llvm/core_instructions.cpp
src/spirv_to_llvm/fragment_entry_point.cpp
src/spirv_to_llvm/glsl_instructions.cpp
src/spirv_to_llvm/opencl_instructions.cpp
src/spirv_to_llvm/spirv_to_llvm.cpp
src/spirv_to_llvm/spirv_to_llvm.h
src/spirv_to_llvm/spirv_to_llvm_implementation.h
src/spirv_to_llvm/vertex_entry_point.cpp
src/util/CMakeLists.txt
src/util/bit_intrinsics.h
src/util/bitset.cpp
src/util/bitset.h
src/util/constexpr_array.h
src/util/copy_cv_ref.h
src/util/endian.h
src/util/endian_config.h.in
src/util/enum.h
src/util/filesystem.cpp
src/util/filesystem.h
src/util/in_place.h
src/util/invoke.h
src/util/is_referenceable.h
src/util/is_swappable.h
src/util/memory.h
src/util/optional.h
src/util/soft_float.cpp
src/util/soft_float.h
src/util/string_view.h
src/util/system_memory_info.cpp
src/util/system_memory_info.h
src/util/text.h
src/util/variant.cpp
src/util/variant.h
src/util/void_t.h
src/vulkan/CMakeLists.txt
src/vulkan/api_objects.cpp
src/vulkan/api_objects.h
src/vulkan/util.h
src/vulkan_icd/CMakeLists.txt
src/vulkan_icd/kazan_vulkan_icd.json.in [new file with mode: 0644]
src/vulkan_icd/vulkan_cpu_vulkan_icd.json.in [deleted file]
src/vulkan_icd/vulkan_icd.cpp
src/vulkan_icd/vulkan_icd.h

index f809bf7ae3770510414a9b24da238ca046a429e8..b697454a9b4ac00f8844e346dd48995674efd396 100644 (file)
@@ -26,7 +26,7 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-project(vulkan-cpu CXX C)
+project(kazan CXX C)
 if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
   message(FATAL_ERROR "compiler is not clang")
 endif()
index 0b4361301b8f905cea1cb4b9510169ab7559ba08..2db8e1993008e777801aa44b932736aa2f0089f4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Vulkan-cpu
+# Kazan
 
-[![Build Status](https://travis-ci.org/programmerjake/vulkan-cpu.svg?branch=master)](https://travis-ci.org/programmerjake/vulkan-cpu)
+[![Build Status](https://travis-ci.org/kazan-3d/kazan.svg?branch=master)](https://travis-ci.org/kazan-3d/kazan)
 
 Work-in-progress for Vulkan implementation on cpu
 
@@ -10,14 +10,18 @@ Work-in-progress for Vulkan implementation on cpu
 
 ## Build in Docker
 
-    docker build -t vulkan-cpu .
+    docker build -t kazan .
 
 ## Build under Ubuntu 16.04 (xenial)
 
     sudo apt install build-essential git clang-4.0 llvm-4.0-dev cmake zlib1g-dev libsdl2-dev
-    git clone https://github.com/programmerjake/vulkan-cpu.git
-    cd vulkan-cpu
+    git clone https://github.com/kazan-3d/kazan.git
+    cd kazan
     mkdir build
     cd build
     cmake .. -DCMAKE_CXX_COMPILER="`which clang++-4.0`" -DCMAKE_C_COMPILER="`which clang-4.0`" -DCMAKE_BUILD_TYPE=Debug
     make
+
+## Naming
+
+Kazan used to be named vulkan-cpu. Kazan is a Japanese word that means "volcano".
index 9d29cfb25cf3ec24da670061b8870449f71e0135..e667a2cafabdb02a451ed72afacbc978b8d2fd9a 100644 (file)
@@ -1,7 +1,7 @@
 # GSOC 2017 Landing Page
 
 The code produced as part of GSOC is available here: [gsoc-2017 tag](https://github.com/programmerjake/vulkan-cpu/tree/gsoc-2017)  
-I've probably done more work on the code since GSOC, available here: [master branch](https://github.com/programmerjake/vulkan-cpu/tree/master)
+I've probably done more work on the code since GSOC, available here: [master branch](https://github.com/kazan-3d/kazan/tree/master)
 
 ## State of code at end of GSOC
 
index 39c2f86a0332b0dbeceaead0eb254c64a5344840..5cba68bbf57b1c164ac16bf7f3745be5abe41058 100644 (file)
@@ -26,7 +26,7 @@ Get machine [endianness](https://en.wikipedia.org/wiki/Endianness).
 
 Utility functions and types for `enum`s.
 
-To use, you need to call the `vulkan_cpu_util_generate_enum_traits` macro at namespace scope after the definition of the `enum`:
+To use, you need to call the `kazan_util_generate_enum_traits` macro at namespace scope after the definition of the `enum`:
 
     enum class My_enum // class keyword is optional
     {
@@ -35,7 +35,7 @@ To use, you need to call the `vulkan_cpu_util_generate_enum_traits` macro at nam
         Value_3 = Value_1, // allows duplicate values
     };
 
-    vulkan_cpu_util_generate_enum_traits(My_enum,
+    kazan_util_generate_enum_traits(My_enum,
         My_enum::Value_1,
         My_enum::Value_2,
         My_enum::Value_3);
index 0bb3086520ad4496970eb1c536d2c91f22449b6d..29b7ce07dadea2023b5cae6c49261d84ed2be0cb 100644 (file)
@@ -24,7 +24,7 @@ string(STRIP ${SDL2_LIBRARIES} libraries) # workaround SDL2 automake bug
 set(sources demo.cpp) 
 add_executable(demo ${sources})
 target_include_directories(demo PRIVATE ${SDL2_INCLUDE_DIRS})
-target_link_libraries(demo ${libraries} vulkan_cpu_spirv vulkan_cpu_util vulkan_cpu_pipeline vulkan_cpu_vulkan)
+target_link_libraries(demo ${libraries} kazan_spirv kazan_util kazan_pipeline kazan_vulkan)
 set_target_properties(demo PROPERTIES
                       C_VISIBILITY_PRESET hidden
                       CXX_VISIBILITY_PRESET hidden)
index 8db8ea6333d1ed5351cbfeb0c4b2ebe7627ba3f9..151e9cde3721949ccac3de351c7f3cf0fe93b815 100644 (file)
@@ -41,7 +41,7 @@
 #error wrong SDL varsion
 #endif
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace test
 {
@@ -921,5 +921,5 @@ int test_main(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-    return vulkan_cpu::test::test_main(argc, argv);
+    return kazan::test::test_main(argc, argv);
 }
index 4b9c97975d2c8b49c4304561209e6940dda9121c..cdb9a83324feea069da6fc56ab737c3d3301c1c5 100644 (file)
@@ -26,4 +26,4 @@ set(sources ast.cpp
             parser.cpp
             patch.cpp)
 add_executable(generate_spirv_parser ${sources})
-target_link_libraries(generate_spirv_parser vulkan_cpu_util vulkan_cpu_json)
+target_link_libraries(generate_spirv_parser kazan_util kazan_json)
index 5619228b8987fb9ec55e21da1efd8db4bfc39dec..c2c39cf7179e04264f984215526d8862cd337615 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "ast.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
index 331eba4f2bd8708dac7441985d42f823b98c15f0..caf1cbbb1716edde612b60cdc90e124e088716e7 100644 (file)
@@ -32,7 +32,7 @@
 #include <vector>
 #include <string>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -106,11 +106,10 @@ enum class Instructions_Instruction_Operands_Operand_Quantifier
     variable,
 };
 
-vulkan_cpu_util_generate_enum_traits(
-    Instructions_Instruction_Operands_Operand_Quantifier,
-    Instructions_Instruction_Operands_Operand_Quantifier::none,
-    Instructions_Instruction_Operands_Operand_Quantifier::optional,
-    Instructions_Instruction_Operands_Operand_Quantifier::variable);
+kazan_util_generate_enum_traits(Instructions_Instruction_Operands_Operand_Quantifier,
+                                Instructions_Instruction_Operands_Operand_Quantifier::none,
+                                Instructions_Instruction_Operands_Operand_Quantifier::optional,
+                                Instructions_Instruction_Operands_Operand_Quantifier::variable);
 
 struct Instructions
 {
@@ -180,12 +179,11 @@ struct Instructions
                     std::uint32_t opcode,
                     Operands operands,
                     Capabilities capabilities,
-                    Extensions extensions) noexcept
-            : opname(std::move(opname)),
-              opcode(opcode),
-              operands(std::move(operands)),
-              capabilities(std::move(capabilities)),
-              extensions(std::move(extensions))
+                    Extensions extensions) noexcept : opname(std::move(opname)),
+                                                      opcode(opcode),
+                                                      operands(std::move(operands)),
+                                                      capabilities(std::move(capabilities)),
+                                                      extensions(std::move(extensions))
         {
         }
         json::ast::Value to_json() const;
@@ -222,12 +220,12 @@ enum class Operand_kinds_Operand_kind_Category
     composite,
 };
 
-vulkan_cpu_util_generate_enum_traits(Operand_kinds_Operand_kind_Category,
-                                     Operand_kinds_Operand_kind_Category::bit_enum,
-                                     Operand_kinds_Operand_kind_Category::value_enum,
-                                     Operand_kinds_Operand_kind_Category::id,
-                                     Operand_kinds_Operand_kind_Category::literal,
-                                     Operand_kinds_Operand_kind_Category::composite);
+kazan_util_generate_enum_traits(Operand_kinds_Operand_kind_Category,
+                                Operand_kinds_Operand_kind_Category::bit_enum,
+                                Operand_kinds_Operand_kind_Category::value_enum,
+                                Operand_kinds_Operand_kind_Category::id,
+                                Operand_kinds_Operand_kind_Category::literal,
+                                Operand_kinds_Operand_kind_Category::composite);
 
 enum class Operand_kinds_Operand_kind_Literal_kind
 {
@@ -238,7 +236,7 @@ enum class Operand_kinds_Operand_kind_Literal_kind
     literal_spec_constant_op_integer,
 };
 
-vulkan_cpu_util_generate_enum_traits(
+kazan_util_generate_enum_traits(
     Operand_kinds_Operand_kind_Literal_kind,
     Operand_kinds_Operand_kind_Literal_kind::literal_integer,
     Operand_kinds_Operand_kind_Literal_kind::literal_string,
index b59076a0f777bfea9ceede669054815bb6257fc4..405a60ea94a2bffe8bbc0ce17e31942023a80ee6 100644 (file)
@@ -33,7 +33,7 @@
 #include <list>
 #include <deque>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -382,38 +382,38 @@ enum class Output_part
     struct_closing,
 };
 
-vulkan_cpu_util_generate_enum_traits(Output_part,
-                                     Output_part::file_comments,
-                                     Output_part::include_guard_start,
-                                     Output_part::includes,
-                                     Output_part::namespaces_start,
-                                     Output_part::basic_types,
-                                     Output_part::basic_constants,
-                                     Output_part::id_types,
-                                     Output_part::enum_definitions,
-                                     Output_part::enum_properties_definitions,
-                                     Output_part::literal_types,
-                                     Output_part::enum_structs,
-                                     Output_part::composite_types,
-                                     Output_part::instruction_structs,
-                                     Output_part::instruction_variant,
-                                     Output_part::parse_error_class,
-                                     Output_part::parser_callbacks_class,
-                                     Output_part::dump_callbacks_class,
-                                     Output_part::parser_class,
-                                     Output_part::namespaces_end,
-                                     Output_part::include_guard_end,
-                                     Output_part::struct_opening,
-                                     Output_part::struct_members,
-                                     Output_part::struct_default_constructor,
-                                     Output_part::struct_default_constructor_initializers,
-                                     Output_part::struct_default_constructor_body,
-                                     Output_part::struct_fill_constructor_start,
-                                     Output_part::struct_fill_constructor_args,
-                                     Output_part::struct_fill_constructor_args_end,
-                                     Output_part::struct_fill_constructor_initializers,
-                                     Output_part::struct_fill_constructor_body,
-                                     Output_part::struct_closing);
+kazan_util_generate_enum_traits(Output_part,
+                                Output_part::file_comments,
+                                Output_part::include_guard_start,
+                                Output_part::includes,
+                                Output_part::namespaces_start,
+                                Output_part::basic_types,
+                                Output_part::basic_constants,
+                                Output_part::id_types,
+                                Output_part::enum_definitions,
+                                Output_part::enum_properties_definitions,
+                                Output_part::literal_types,
+                                Output_part::enum_structs,
+                                Output_part::composite_types,
+                                Output_part::instruction_structs,
+                                Output_part::instruction_variant,
+                                Output_part::parse_error_class,
+                                Output_part::parser_callbacks_class,
+                                Output_part::dump_callbacks_class,
+                                Output_part::parser_class,
+                                Output_part::namespaces_end,
+                                Output_part::include_guard_end,
+                                Output_part::struct_opening,
+                                Output_part::struct_members,
+                                Output_part::struct_default_constructor,
+                                Output_part::struct_default_constructor_initializers,
+                                Output_part::struct_default_constructor_body,
+                                Output_part::struct_fill_constructor_start,
+                                Output_part::struct_fill_constructor_args,
+                                Output_part::struct_fill_constructor_args_end,
+                                Output_part::struct_fill_constructor_initializers,
+                                Output_part::struct_fill_constructor_body,
+                                Output_part::struct_closing);
 
 static_assert(util::Enum_traits<Output_part>::is_compact,
               "mismatch between declaration and generate enum traits");
@@ -671,7 +671,7 @@ private:
             file_comments << automatically_generated_file_warning_comment
                           << state.top_level.copyright;
             namespaces_start << R"(
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv
 {
@@ -891,7 +891,7 @@ constexpr util::string_view get_enumerant_name()"
                 }
                 enum_definitions << R"(@-};
 
-vulkan_cpu_util_generate_enum_traits()"
+kazan_util_generate_enum_traits()"
                                  << enumeration.cpp_name;
                 std::unordered_set<std::uint32_t> values;
                 for(auto &enumerant : enumeration.enumerants)
index 97febc01a8030eb496cba8af548cc92e2dc7600e..da3305db29ce410ad9e995d1e4a45192032f653e 100644 (file)
@@ -36,7 +36,7 @@
 #include <utility>
 #include <cassert>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -206,8 +206,8 @@ private:
     void write_signed_integer(std::int64_t value, unsigned base = 10);
     void write_literal(util::string_view value)
     {
-        *this << escape_char << literal_command << static_cast<std::uint64_t>(value.size()) << escape_char << value
-              << escape_char;
+        *this << escape_char << literal_command << static_cast<std::uint64_t>(value.size())
+              << escape_char << value << escape_char;
     }
 
 public:
index e065e8f2fe91d45992e4be6b0e9b74f03ef6e26f..f5a17e846ca8b206325254a5ec8f856151cfe8ba 100644 (file)
@@ -28,7 +28,7 @@
 #include "generate.h"
 #include "patch.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -48,7 +48,7 @@ int generate_spirv_parser_main(int argc, char **argv)
     }
     try
     {
-        std::shared_ptr<std::vector<ast::Json_file>> required_files; // outside of try so 
+        std::shared_ptr<std::vector<ast::Json_file>> required_files; // outside of try so
         try
         {
             required_files = parser::read_required_files(std::move(input_directory));
@@ -84,5 +84,5 @@ int generate_spirv_parser_main(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-    return vulkan_cpu::generate_spirv_parser::generate_spirv_parser_main(argc, argv);
+    return kazan::generate_spirv_parser::generate_spirv_parser_main(argc, argv);
 }
index 0e296a4bb65cda1625123df3e56068177cb0b558..878a08184da1276cd95457a7b152c83cbef571e6 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "instruction_properties.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
index ca97a4ab1debf348fc967909c9c03d49215210db..622ce4dea73f001357e05b5c4578d96406f9a13d 100644 (file)
@@ -28,7 +28,7 @@
 #include <cstdint>
 #include <cassert>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
index 3a928b4bfdfd55d1a0919b28bbf88ab70754a84c..185077928503eaee51adc14d9a4124c7e8961afa 100644 (file)
@@ -29,7 +29,7 @@
 #include <cstdlib>
 #include <list>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -751,7 +751,8 @@ ast::Extension_instruction_set parse_extension_instruction_set(json::ast::Value
               != 0)
         throw Parse_error(top_level_value.location, {}, "file name is unrecognizable");
     auto instruction_set_name = file_name;
-    instruction_set_name.erase(instruction_set_name.size() - file_name_suffix.size(), file_name_suffix.size());
+    instruction_set_name.erase(instruction_set_name.size() - file_name_suffix.size(),
+                               file_name_suffix.size());
     instruction_set_name.erase(0, file_name_prefix.size());
     if(top_level_value.get_value_kind() != json::ast::Value_kind::object)
         throw Parse_error(top_level_value.location, {}, "top level value is not an object");
@@ -797,7 +798,8 @@ ast::Extension_instruction_set parse_extension_instruction_set(json::ast::Value
             revision, top_level_value.location, nullptr, "missing revision"),
         get_value_or_throw_parse_error(
             std::move(instructions), top_level_value.location, nullptr, "missing instructions"));
-    std::cerr << "Parsed extension instruction set: " << import_name << " from " << file_name << std::endl;
+    std::cerr << "Parsed extension instruction set: " << import_name << " from " << file_name
+              << std::endl;
     return retval;
 }
 }
index dd2a21e639f2f49f7a876e2fb07dec7117d09208..e4b2d76f02df4ba9395618710d5d7dda34fc18e5 100644 (file)
@@ -34,7 +34,7 @@
 #include "json/parser.h"
 #include "util/filesystem.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -111,7 +111,8 @@ public:
     }
 };
 
-std::shared_ptr<std::vector<ast::Json_file>> read_required_files(const util::filesystem::path &dir_path);
+std::shared_ptr<std::vector<ast::Json_file>> read_required_files(
+    const util::filesystem::path &dir_path);
 
 ast::Top_level parse(std::vector<ast::Json_file> &&json_files);
 }
index 8eb062e817b1d21cc3a6e6f6bb7cd72c8b1834bf..84f85a1502d9e44f083a6d6ff5d7c4dacc302f72 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "patch.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
index eb253aee6f5d3c5387d80cbee8277563c13ff728..cb84dceaa0c1219e805e4915f852ef37ca2b5c46 100644 (file)
@@ -28,7 +28,7 @@
 #include <ostream>
 #include <memory>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
@@ -52,6 +52,7 @@ struct Ast_patches
     struct Add_image_operands_grad_parameter_names final : public Ast_patch
     {
         using Ast_patch::Ast_patch;
+
     protected:
         virtual bool apply(ast::Top_level &top_level) const override;
 
index 0e98c0db281c38c973fbabfecdf12f8a622222c0..efecb0e22d788de0dbfaaa4d8bc4b426ff32e455 100644 (file)
@@ -28,7 +28,7 @@
 #include "util/optional.h"
 #include <iterator>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace generate_spirv_parser
 {
index f4af74a8468f140496a93e32bdde0f993cbb4484..d8c79311d9e6501a6b4ebaafd4751d2282064723 100644 (file)
@@ -20,5 +20,5 @@
 #
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 set(sources image.cpp) 
-add_library(vulkan_cpu_image STATIC ${sources})
-target_link_libraries(vulkan_cpu_image vulkan_cpu_util vulkan_cpu_llvm_wrapper vulkan_cpu_vulkan)
+add_library(kazan_image STATIC ${sources})
+target_link_libraries(kazan_image kazan_util kazan_llvm_wrapper kazan_vulkan)
index 3ed16675f3077fd64a7209c92555e2efb2cd8ea1..f0504e0704533d22bafbfa3f7caa12e0f3dc813c 100644 (file)
@@ -29,7 +29,7 @@
 #include <cstdint>
 #include "util/enum.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace image
 {
index d0ac3dc26eb411f84c06f2fb37300fac5d2e12e7..ee8f4ad039885e18ad2d70bf8199ca2dddea8ecd 100644 (file)
@@ -23,5 +23,5 @@ set(sources json.cpp
             location.cpp
             parser.cpp
             source.cpp)
-add_library(vulkan_cpu_json STATIC ${sources})
-target_link_libraries(vulkan_cpu_json vulkan_cpu_util)
+add_library(kazan_json STATIC ${sources})
+target_link_libraries(kazan_json kazan_util)
index 28f4ae5d4416696a75f034cc7c19005bb1ad9de9..08ab61e281de27d6fc903735f475cf02b3faf994 100644 (file)
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include "util/soft_float.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index 15cbe05bc3db376ac04d1c2abdf0a3ff09f761be..31ca6573b8bb04b4b6299fcb43d5953ef5a45031 100644 (file)
@@ -39,7 +39,7 @@
 #include "util/optional.h"
 #include "location.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index ea9916a26b86193002eb6b8f40f8900d3e3350e3..c1ebaebf9ce5956439eb595b7d2cd4bb81144924 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "location.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index 2ffecb719245f37cefd6a50730ee58b8c0b1eae3..78566475f29e4bdb9ff47892b9577f7fd7167d4d 100644 (file)
@@ -28,7 +28,7 @@
 #include <string>
 #include <iosfwd>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index 1481c922af5137869472a62547f9dc8596e1c32a..3e2fafb9c6b1727404b971b0eb30746d8dd32cb3 100644 (file)
@@ -28,7 +28,7 @@
 #include <limits>
 #include "util/soft_float.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index 31adb3efdb658d8a789c1f23c52e452af1b4eb8e..dcd3f46f5922cbb0ef8b03187ede84db5379f780 100644 (file)
@@ -34,7 +34,7 @@
 #include "location.h"
 #include "util/optional.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
@@ -88,4 +88,4 @@ ast::Value parse(const Source *source, Parse_options options = Parse_options::de
 }
 }
 
-#endif /* JSON_PARSER_H_ */
\ No newline at end of file
+#endif /* JSON_PARSER_H_ */
index 93e7eba66758ad72240b662ef8d90bd035dcabae..569cf0a059a7a8cb30a50cd26e40851ba13e84a7 100644 (file)
@@ -27,7 +27,7 @@
 #include <fstream>
 #include <algorithm>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index cad27909e1c52bc6bb019703dd02d7531a24387e..c2596367854799aea7ffae25f9b897dc64ed88a8 100644 (file)
@@ -30,7 +30,7 @@
 #include <iosfwd>
 #include "util/filesystem.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace json
 {
index ad401917376608f22a4701437ae29d2d9743d93e..8b7ddf585ea7ee069e2d2a71fa37eb07dcc05a76 100644 (file)
@@ -22,11 +22,11 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 
 set(sources llvm_wrapper.cpp
             orc_compile_stack.cpp)
-add_library(vulkan_cpu_llvm_wrapper STATIC ${sources})
+add_library(kazan_llvm_wrapper STATIC ${sources})
 if(0)
 llvm_map_components_to_libnames(llvm_libraries core native analysis orcjit mcjit nativecodegen ipo scalaropts vectorize)
 else()
 set(llvm_libraries LLVM)
 endif()
-target_link_libraries(vulkan_cpu_llvm_wrapper util ${llvm_libraries})
+target_link_libraries(kazan_llvm_wrapper util ${llvm_libraries})
 set_source_files_properties(orc_compile_stack.cpp PROPERTIES COMPILE_FLAGS -fno-rtti) # prevent link errors with missing type info
index 7473d00141174d4b49d0460eed24352f01cc0f99..b4faf6648d1b4f84a920c4c08aacb1ed843ffa7f 100644 (file)
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <algorithm>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace llvm_wrapper
 {
index 8d12f05b6e13279941d33181157c9f3435545843..9ac2d077e50c048a8f03ce918cf30bb87777a86a 100644 (file)
@@ -40,7 +40,7 @@
 #include "util/string_view.h"
 #include "util/variant.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace llvm_wrapper
 {
index 86f0ef32e5d477b7a1ab5a68453affe078aea730..8b56a10ff465409bb74f344f59a7390b2896219d 100644 (file)
@@ -39,7 +39,7 @@
 #error Orc compile stack is not yet implemented for this version of LLVM
 #endif
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace llvm_wrapper
 {
@@ -115,12 +115,10 @@ private:
             }
 
         public:
-            void operator()(
-                llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT,
-                const Object_set_wrapper
-                        &object_set,
-                const std::vector<std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo>>
-                    &load_result)
+            void operator()(llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT,
+                            const Object_set_wrapper &object_set,
+                            const std::vector<std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo>>
+                                &load_result)
             {
                 assert(object_set.size() == load_result.size());
                 for(std::size_t i = 0; i < object_set.size(); i++)
@@ -193,8 +191,9 @@ private:
             auto retval = create_module_handle();
             auto &handle = handle_map[retval];
             auto object_set_iter = object_sets.insert(object_sets.end(), std::move(object_set));
-            handle = object_linking_layer.addObjectSet(
-                Object_set_wrapper(*object_set_iter), std::move(memory_manager), std::move(symbol_resolver));
+            handle = object_linking_layer.addObjectSet(Object_set_wrapper(*object_set_iter),
+                                                       std::move(memory_manager),
+                                                       std::move(symbol_resolver));
             return retval;
         }
 
@@ -203,7 +202,9 @@ private:
         std::vector<std::shared_ptr<llvm::JITEventListener>> jit_event_listener_list;
         llvm::orc::ObjectLinkingLayer<On_loaded_functor> object_linking_layer;
         std::unordered_map<Module_handle, decltype(object_linking_layer)::ObjSetHandleT> handle_map;
-        std::list<std::vector<std::unique_ptr<llvm::object::OwningBinary<llvm::object::ObjectFile>>>> object_sets;
+        std::
+            list<std::vector<std::unique_ptr<llvm::object::OwningBinary<llvm::object::ObjectFile>>>>
+                object_sets;
         std::unordered_multiset<const llvm::object::ObjectFile *> loaded_object_set;
     };
     typedef std::function<std::unique_ptr<llvm::Module>(std::unique_ptr<llvm::Module>)>
index 80042c8a79222483d6dfdeb1ce1244348cf20318..2e78e73c5e7ef3135677622fba74e38283ae5a53 100644 (file)
@@ -28,7 +28,7 @@
 #include <utility>
 #include <functional>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace llvm_wrapper
 {
index 127767c47e8e8d9d2023c0b87b543b971c1f40b3..149f665659c4de06e0d65284d2a6aa76a35b1753 100644 (file)
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 
 set(sources pipeline.cpp)
-add_library(vulkan_cpu_pipeline STATIC ${sources})
-target_link_libraries(vulkan_cpu_pipeline vulkan_cpu_spirv_to_llvm
-                                          vulkan_cpu_json
-                                          vulkan_cpu_util
-                                          vulkan_cpu_spirv
-                                          vulkan_cpu_llvm_wrapper
-                                          vulkan_cpu_vulkan
-                                          vulkan_cpu_image)
+add_library(kazan_pipeline STATIC ${sources})
+target_link_libraries(kazan_pipeline kazan_spirv_to_llvm
+                                     kazan_json
+                                     kazan_util
+                                     kazan_spirv
+                                     kazan_llvm_wrapper
+                                     kazan_vulkan
+                                     kazan_image)
index c0fc697d8ac2878a1f18133cb91ad375c0771443..a0b97718fc374b55404eeb2665e7c1a6a4588871 100644 (file)
@@ -32,7 +32,7 @@
 #include <vector>
 #include <iostream>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace pipeline
 {
@@ -925,7 +925,8 @@ std::unique_ptr<Graphics_pipeline> Graphics_pipeline::make(
             std::cerr << dump_callbacks.ss.str() << std::endl;
         }
         assert(create_info.pVertexInputState);
-        assert(create_info.pVertexInputState->sType == VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO);
+        assert(create_info.pVertexInputState->sType
+               == VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO);
         auto compiled_shader = spirv_to_llvm::spirv_to_llvm(implementation->llvm_context.get(),
                                                             llvm_target_machine.get(),
                                                             shader_module->words(),
index b1253775f562e6a21a44cb9b8ea452d64d4ed803..e17d933e9351100571002343c9427cabf39657f8 100644 (file)
@@ -33,7 +33,7 @@
 #include "spirv/spirv.h"
 #include "image/image.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace pipeline
 {
index 12ed97f57480c5d3fcf625aed0d7673050e2e02f..4e65cfe615befc9ecdbaa763d9bdcffe483835d8 100644 (file)
@@ -42,6 +42,6 @@ add_custom_command(OUTPUT ${spirv_parser_sources} ${spirv_parser_headers}
                    VERBATIM
                    COMMENT "Generating SPIR-V Parser")
 set(sources ${sources} ${spirv_parser_sources})
-add_library(vulkan_cpu_spirv STATIC ${sources})
-target_link_libraries(vulkan_cpu_spirv vulkan_cpu_util vulkan_cpu_json)
-target_include_directories(vulkan_cpu_spirv PUBLIC ${spirv_parser_generated_include_dir})
+add_library(kazan_spirv STATIC ${sources})
+target_link_libraries(kazan_spirv kazan_util kazan_json)
+target_include_directories(kazan_spirv PUBLIC ${spirv_parser_generated_include_dir})
index edf7c52e11655cb8eb0fe957019db8aca6d84775..56eddf8992d15f614ba14ad8b03cc3773a8207c7 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "literal_string.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv
 {
index d21529bbec3df7b30a20741e22c190521cc03791..45b306bb02c59db8d804c5bb69b7e9d03771012a 100644 (file)
@@ -34,7 +34,7 @@
 #include "util/endian.h"
 #include "util/string_view.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv
 {
index 35bbea3a5ab67369edec008958c8614ca8e76a7a..01ea0e6dca8f60af328727b2bd2749d4d9ad4470 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <cstdint>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv
 {
index 43274e7cbd77d999bc6040612ecfb44de36da2d6..df1072aa59ecd3d41d09bb5d4065b6a58605a659 100644 (file)
@@ -26,5 +26,5 @@ set(sources core_instructions.cpp
             opencl_instructions.cpp
             spirv_to_llvm.cpp
             vertex_entry_point.cpp)
-add_library(vulkan_cpu_spirv_to_llvm STATIC ${sources})
-target_link_libraries(vulkan_cpu_spirv_to_llvm vulkan_cpu_util vulkan_cpu_spirv vulkan_cpu_llvm_wrapper vulkan_cpu_pipeline)
+add_library(kazan_spirv_to_llvm STATIC ${sources})
+target_link_libraries(kazan_spirv_to_llvm kazan_util kazan_spirv kazan_llvm_wrapper kazan_pipeline)
index 586b6f7bd50e5e7f0e80318a9850c7eccca72092..0c23e0c0f715eb87850c3a3ab36340c858ea84ce 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "spirv_to_llvm_implementation.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
index 3ab4abaf1b9696bde4f21d8f3f236bccf0350316..5a5b86855db4a0117fd879459c7bc85504d856b3 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "spirv_to_llvm_implementation.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
@@ -129,9 +129,8 @@ using namespace spirv;
                         if(built_in)
                             throw Parser_error(
                                 0, 0, "multiple BuiltIn decorations on the same variable");
-                        built_in =
-                            util::get<Decoration_built_in_parameters>(decoration.parameters)
-                                .built_in;
+                        built_in = util::get<Decoration_built_in_parameters>(decoration.parameters)
+                                       .built_in;
                         continue;
                     case Decoration::no_perspective:
 #warning finish implementing Decoration::no_perspective
@@ -248,11 +247,10 @@ using namespace spirv;
 #warning finish implementing Decoration::secondary_viewport_relative_nv
                         break;
                     }
-                    throw Parser_error(
-                        0,
-                        0,
-                        "unimplemented member decoration on shader input variable: "
-                            + std::string(get_enumerant_name(decoration.value)));
+                    throw Parser_error(0,
+                                       0,
+                                       "unimplemented member decoration on shader input variable: "
+                                           + std::string(get_enumerant_name(decoration.value)));
                 }
                 if(!built_in)
                     throw Parser_error(
@@ -431,9 +429,9 @@ using namespace spirv;
                         break;
                     }
                     throw Parser_error(0,
-                                              0,
-                                              "unimplemented built in shader input variable: "
-                                                  + std::string(get_enumerant_name(*built_in)));
+                                       0,
+                                       "unimplemented built in shader input variable: "
+                                           + std::string(get_enumerant_name(*built_in)));
                 } while(false);
             }
         }
@@ -539,9 +537,8 @@ using namespace spirv;
                         if(location)
                             throw Parser_error(
                                 0, 0, "multiple Location decorations on the same variable");
-                        location =
-                            util::get<Decoration_location_parameters>(decoration.parameters)
-                                .location;
+                        location = util::get<Decoration_location_parameters>(decoration.parameters)
+                                       .location;
                         continue;
                     case Decoration::component:
 #warning finish implementing Decoration::component
@@ -607,11 +604,10 @@ using namespace spirv;
 #warning finish implementing Decoration::secondary_viewport_relative_nv
                         break;
                     }
-                    throw Parser_error(
-                        0,
-                        0,
-                        "unimplemented member decoration on shader output variable: "
-                            + std::string(get_enumerant_name(decoration.value)));
+                    throw Parser_error(0,
+                                       0,
+                                       "unimplemented member decoration on shader output variable: "
+                                           + std::string(get_enumerant_name(decoration.value)));
                 }
                 if(!location)
                     throw Parser_error(
@@ -628,8 +624,7 @@ using namespace spirv;
                 auto callback = [llvm_output_member_type, &output_color, this, output_pointer]()
                 {
                     if(output_color)
-                        throw Parser_error(
-                            0, 0, "duplicate fragment shader output variable");
+                        throw Parser_error(0, 0, "duplicate fragment shader output variable");
                     output_color = ::LLVMBuildLoad(builder.get(), output_pointer, "output_color");
                     ::LLVMSetAlignment(output_color, llvm_output_member_type.alignment);
                 };
index 3ec637fa8f6bfff91af692a474e800681675e3cf..52343e0854890b2ffeb0ffd6e19a0577649f07a2 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "spirv_to_llvm_implementation.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
@@ -839,4 +839,3 @@ void Spirv_to_llvm::handle_instruction_glsl_std_450_op_n_clamp(Glsl_std_450_op_n
 }
 }
 }
-
index 285969c5b35b3f581f40f8e71d695540f8abfc4e..d404639f48e1adb078f92dbfd2696a42a4c43bce 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "spirv_to_llvm_implementation.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
index 3ba5cbbcf0eb03e475e7b9bfe232cc6a7a6e8e82..aae4b0412afb95d346c146b20ffb9b76750fcbea 100644 (file)
@@ -22,7 +22,7 @@
  */
 #include "spirv_to_llvm_implementation.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
index adabcedd57dee313ce0a7c74b6d8e220f77b60fe..d7e312a504c4eba1be6857c13134a79e7f34d385 100644 (file)
@@ -36,7 +36,7 @@
 #include "util/string_view.h"
 #include "vulkan/vulkan.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
index dad8879557fc99cb8941a9084a4d70b671449a9c..cc4f6bf18c7408da0bce7696fc72a295eb94158a 100644 (file)
@@ -32,7 +32,7 @@
 #include <list>
 #include <iostream>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
@@ -42,7 +42,7 @@ enum class Stage
     generate_code,
 };
 
-vulkan_cpu_util_generate_enum_traits(Stage, Stage::calculate_types, Stage::generate_code);
+kazan_util_generate_enum_traits(Stage, Stage::calculate_types, Stage::generate_code);
 
 static_assert(util::Enum_traits<Stage>::is_compact, "");
 
index 1b731003b90e1f680bc1c79e6e8129329a1353f5..7ed6f05a9681a4341eeac9470c215e4fc77ed62a 100644 (file)
@@ -23,7 +23,7 @@
 #include "spirv_to_llvm_implementation.h"
 #include <unordered_map>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace spirv_to_llvm
 {
index 649e2d37c55771bd08e0c3fc6a9a359771f8b390..ad4a08442bdb47486a4f1ad1f88c34d0b1625518 100644 (file)
@@ -41,7 +41,7 @@ set(sources bit_intrinsics.cpp
             system_memory_info.cpp
             variant.cpp
             void_t.cpp)
-add_library(vulkan_cpu_util STATIC ${sources})
-target_include_directories(vulkan_cpu_util PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
-add_executable(vulkan_cpu_util_test EXCLUDE_FROM_ALL ${sources} util_test.cpp)
-target_include_directories(vulkan_cpu_util_test PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
+add_library(kazan_util STATIC ${sources})
+target_include_directories(kazan_util PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
+add_executable(kazan_util_test EXCLUDE_FROM_ALL ${sources} util_test.cpp)
+target_include_directories(kazan_util_test PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
index 3ffd6a75ea158aaa3250122bf36b4a770f2be064..10dfbc57952d513b820f1737d682d378a645e844 100644 (file)
 #if defined(__clang__)
 #if defined(__apple_build_version__)
 #if __clang_major__ > 5 || (__clang_major__ == 5 && __clang_minor__ >= 1)
-#define VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
+#define KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
 #endif
 #else
 #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)
-#define VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
+#define KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
 #endif
 #endif
 #elif defined(__INTEL_COMPILER)
 #warning figure out icc version numbers for constexpr __builtin_clz and __builtin_ctz
 #elif defined(__GNUC__)
 // gcc supports constexpr __builtin_clz and __builtin_ctz before it supports c++14
-#define VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
+#define KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED 1
 #endif
 
 #if 1
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
-#undef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#undef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
 #endif
 #endif
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
 constexpr std::uint32_t clz4(std::uint8_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 4 : __builtin_clz(v) - __builtin_clz(0x8U);
 #else
     typedef const std::uint_fast8_t LookupTableType[0x10];
@@ -70,7 +70,7 @@ constexpr std::uint32_t clz4(std::uint8_t v) noexcept
 
 constexpr std::uint32_t clz8(std::uint8_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 8 : __builtin_clz(v) - __builtin_clz(0x80U);
 #else
     return ((v & 0xF0) == 0) ? 4 + clz4(v) : clz4(v >> 4);
@@ -79,7 +79,7 @@ constexpr std::uint32_t clz8(std::uint8_t v) noexcept
 
 constexpr std::uint32_t clz16(std::uint16_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 16 : __builtin_clz(v) - (std::numeric_limits<int>::digits - 16);
 #else
     return ((v & 0xFF00U) == 0) ? 8 + clz8(v) : clz8(v >> 8);
@@ -88,7 +88,7 @@ constexpr std::uint32_t clz16(std::uint16_t v) noexcept
 
 constexpr std::uint32_t clz32(std::uint32_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 32 : __builtin_clzl(v) - (std::numeric_limits<long>::digits - 32);
 #else
     return ((v & 0xFFFF0000UL) == 0) ? 16 + clz16(v) : clz16(v >> 16);
@@ -97,7 +97,7 @@ constexpr std::uint32_t clz32(std::uint32_t v) noexcept
 
 constexpr std::uint32_t clz64(std::uint64_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 64 : __builtin_clzll(v) - (std::numeric_limits<long long>::digits - 64);
 #else
     return ((v & 0xFFFFFFFF00000000ULL) == 0) ? 32 + clz32(v) : clz32(v >> 32);
@@ -106,7 +106,7 @@ constexpr std::uint32_t clz64(std::uint64_t v) noexcept
 
 constexpr std::uint32_t ctz4(std::uint8_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 4 : __builtin_ctz(v);
 #else
     typedef const std::uint_fast8_t LookupTableType[0x10];
@@ -120,7 +120,7 @@ constexpr std::uint32_t ctz4(std::uint8_t v) noexcept
 
 constexpr std::uint32_t ctz8(std::uint8_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 8 : __builtin_ctz(v);
 #else
     return ((v & 0xF0) == 0) ? ctz4(v) : 4 + ctz4(v >> 4);
@@ -129,7 +129,7 @@ constexpr std::uint32_t ctz8(std::uint8_t v) noexcept
 
 constexpr std::uint32_t ctz16(std::uint16_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 16 : __builtin_ctz(v);
 #else
     return ((v & 0xFF00U) == 0) ? ctz8(v) : 8 + ctz8(v >> 8);
@@ -138,7 +138,7 @@ constexpr std::uint32_t ctz16(std::uint16_t v) noexcept
 
 constexpr std::uint32_t ctz32(std::uint32_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 32 : __builtin_ctzl(v);
 #else
     return ((v & 0xFFFF0000UL) == 0) ? ctz16(v) : 16 + ctz16(v >> 16);
@@ -147,7 +147,7 @@ constexpr std::uint32_t ctz32(std::uint32_t v) noexcept
 
 constexpr std::uint32_t ctz64(std::uint64_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return v == 0 ? 64 : __builtin_ctzll(v);
 #else
     return ((v & 0xFFFFFFFF00000000ULL) == 0) ? ctz32(v) : 32 + ctz32(v >> 32);
@@ -156,7 +156,7 @@ constexpr std::uint32_t ctz64(std::uint64_t v) noexcept
 
 constexpr std::uint32_t popcount8(std::uint8_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return __builtin_popcount(v);
 #else
     constexpr std::uint8_t lookup_table[0x10] = {
@@ -168,7 +168,7 @@ constexpr std::uint32_t popcount8(std::uint8_t v) noexcept
 
 constexpr std::uint32_t popcount32(std::uint32_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return __builtin_popcountl(v);
 #else
     constexpr std::uint32_t m1 = 0x5555'5555UL;
@@ -188,7 +188,7 @@ constexpr std::uint32_t popcount16(std::uint16_t v) noexcept
 
 constexpr std::uint32_t popcount64(std::uint64_t v) noexcept
 {
-#ifdef VULKAN_CPU_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
+#ifdef KAZAN_UTIL_CONSTEXPR_BUILTIN_CLZ_CTZ_POPCOUNT_SUPPORTED
     return __builtin_popcountll(v);
 #else
     constexpr std::uint64_t m1 = 0x5555'5555'5555'5555ULL;
index 73f94050b6afc337087ab2a76a385ff2804c9d6e..09f5dec588b874deccf814d6ef1a292b6515d2bd 100644 (file)
@@ -32,7 +32,7 @@
 #include <string>
 #include <utility>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index f61b5c382b691197fc36b18daba9a577ec644fd7..14b825b5a15e54276fc272f2a157c8ac60e18a04 100644 (file)
@@ -38,7 +38,7 @@
 // derived from
 // https://github.com/programmerjake/hashlife-voxels/blob/0dd91021a5b9caeffb7849b2114dca89204876bd/util/bitset.h
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -605,9 +605,9 @@ constexpr std::size_t bitset<Bit_count>::npos;
 namespace std
 {
 template <std::size_t Bit_count>
-struct hash<vulkan_cpu::util::bitset<Bit_count>>
+struct hash<kazan::util::bitset<Bit_count>>
 {
-    constexpr std::size_t operator()(const vulkan_cpu::util::bitset<Bit_count> &v) const noexcept
+    constexpr std::size_t operator()(const kazan::util::bitset<Bit_count> &v) const noexcept
     {
         return v.hash();
     }
index 5182c1e1b5e3443cfd4e96109aeb27462ebabd86..31edd77ace121c14971617645e63e9f9688de992 100644 (file)
@@ -30,7 +30,7 @@
 #include <iterator>
 #include <stdexcept>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index c01e06e2d993caefcddd4e4b71012e8d09d98eeb..e78a8ada22a346fb38a430d8b5d7942b7b704990 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef UTIL_COPY_CV_REF_H_
 #define UTIL_COPY_CV_REF_H_
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 20a801cf19e07d5f3e570e8cad3e7eabbcba14fe..c031cedfe8079eede1a565b6b918292da082120a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "util/endian_config.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -33,7 +33,7 @@ enum class Endian
 {
     Little,
     Big,
-    Native = vulkan_cpu_util_endian_endian,
+    Native = kazan_util_endian_endian,
 };
 
 constexpr Endian endian = Endian::Native;
index 1b5a3a783eff12d15f84f35d53242a869360c584..2a171634dbe031ca9750f557dba0a662fab1c8d4 100644 (file)
@@ -23,7 +23,6 @@
 #ifndef UTIL_ENDIAN_CONFIG_H_
 #define UTIL_ENDIAN_CONFIG_H_
 
-#define vulkan_cpu_util_endian_endian @UTIL_ENDIAN@
+#define kazan_util_endian_endian @UTIL_ENDIAN@
 
 #endif /* UTIL_ENDIAN_CONFIG_H_ */
-
index 697b334d7c7b958dd2852a33d59620ed8f8bf65b..f40bec2c6219ffde92354cd0c306220e581668a5 100644 (file)
@@ -35,7 +35,7 @@
 #include "bitset.h"
 #include "is_swappable.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -207,10 +207,10 @@ struct Default_enum_traits
 template <typename Enum, Enum... Values>
 constexpr Constexpr_array<Enum, sizeof...(Values)> Default_enum_traits<Enum, Values...>::values;
 /** generate code for Enum_traits instantiation; use like
- * <code>vulkan_cpu_util_generate_enum_traits(Enum, Enum::Value1, Enum::Value2, Enum::Value3,
+ * <code>kazan_util_generate_enum_traits(Enum, Enum::Value1, Enum::Value2, Enum::Value3,
  * <...>);</code> */
-#define vulkan_cpu_util_generate_enum_traits(Enum, ...)                                \
-    [[gnu::unused]] ::vulkan_cpu::util::detail::Default_enum_traits<Enum, __VA_ARGS__> \
+#define kazan_util_generate_enum_traits(Enum, ...)                                \
+    [[gnu::unused]] ::kazan::util::detail::Default_enum_traits<Enum, __VA_ARGS__> \
         enum_traits_resolve_function(Enum)
 }
 
index f2271d7b7bc0e7e8d8e07096753fb1d1b8afe403..3fa59ef35bada77e270b114d4ff9269bacb7f152 100644 (file)
@@ -45,7 +45,7 @@
 #error filesystem is not implemented for your operating system
 #endif
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -432,7 +432,7 @@ void directory_iterator::increment(std::shared_ptr<Implementation> &implementati
 }
 
 #if 0 // change to 1 to test filesystem::path
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index db7a7dc14cf9fc46dd369826f017990baaa380d5..eb4766b5715f751400f16a228762a016cfcd162d 100644 (file)
@@ -45,7 +45,7 @@
 #include <chrono>
 #include <ratio>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index d95ca1be4eff833fe62f6ca0819c09a5e6b6a4d5..9a6dd6f388443fc19e49983f3254c0771061bb64 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <cstddef>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 1a2b801fa0b256c142112d30ce770d54b84a700f..f26163779218061d434cb8c9709a1613fbdb3ec8 100644 (file)
@@ -29,7 +29,7 @@
 #include <functional>
 #include "void_t.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 9b0c0ea489ceba5a25df3fe49ec86211cd3524f1..9d6808e266178c6d644fbe12bdb2876d9b4e8d81 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <type_traits>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index a6cb63136ab67b44d73ab6448586580b6858a2c5..fefa9eb1b807d0257f50b7362bcc514f9766a748 100644 (file)
@@ -28,7 +28,7 @@
 #include <type_traits>
 #include "is_referenceable.h"
 
-namespace vulkan_cpu_util_is_swappable_unrelated_namespace
+namespace kazan_util_is_swappable_unrelated_namespace
 {
 using std::swap;
 template <typename T, typename U, bool Is_Void = std::is_void<T>::value || std::is_void<T>::value>
@@ -68,14 +68,14 @@ struct Is_nothrow_swappable_with<T, U, false>
 };
 }
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
 template <typename T, typename U>
 struct is_swappable_with
     : public std::integral_constant<bool,
-                                    vulkan_cpu_util_is_swappable_unrelated_namespace::
+                                    kazan_util_is_swappable_unrelated_namespace::
                                         Is_swappable_with<T, U>::value>
 {
 };
@@ -86,7 +86,7 @@ constexpr bool is_swappable_with_v = is_swappable_with<T, U>::value;
 template <typename T, typename U>
 struct is_nothrow_swappable_with
     : public std::integral_constant<bool,
-                                    vulkan_cpu_util_is_swappable_unrelated_namespace::
+                                    kazan_util_is_swappable_unrelated_namespace::
                                         Is_nothrow_swappable_with<T, U>::value>
 {
 };
index 08081a6fb6bc62ea149856820291a3dcfcac9f09..45127e22de00cb432e0b06970e3b4e89ff14fc24 100644 (file)
@@ -27,7 +27,7 @@
 #include <new>
 #include <cstdint>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index c11ba78fa37fb85f2e417ef5ddbda21cbd69d201..fed10464fed9625a174cd3a4c0ddf316d775640e 100644 (file)
@@ -35,7 +35,7 @@
 #include "in_place.h"
 #include "is_swappable.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -916,7 +916,7 @@ struct optional_hash<T, false>
 namespace std
 {
 template <typename T>
-struct hash<vulkan_cpu::util::optional<T>> : public vulkan_cpu::util::detail::optional_hash<T>
+struct hash<kazan::util::optional<T>> : public kazan::util::detail::optional_hash<T>
 {
 };
 }
index 0a581f3bbdd04cf5d1be646b0b70ebb5077a8f65..414ce0d6d9f4858124ee7bcd53ee7a568fd6e888 100644 (file)
@@ -34,7 +34,7 @@
 #include <cstdio>
 namespace
 {
-using namespace vulkan_cpu::util::soft_float;
+using namespace kazan::util::soft_float;
 [[gnu::unused]] std::string hexValue(const ExtendedFloat &v)
 {
     if(v.isNaN())
index b0ca4de3d09f74557e9e0ac3d42daa63ca806979..1afb74117e86b4cb2b725d8fd7b8a197c3de6ee3 100644 (file)
@@ -32,7 +32,7 @@
 #include <cassert>
 #include "bit_intrinsics.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -576,7 +576,8 @@ struct ExtendedFloat final // modeled after IEEE754 standard
             mantissaField |= 0x400U; // add in implicit 1
         else
             exponentField = 1;
-        return ExtendedFloat(mantissaField, static_cast<int>(exponentField) - 15 - 10 + exponentBias() + 63, sign);
+        return ExtendedFloat(
+            mantissaField, static_cast<int>(exponentField) - 15 - 10 + exponentBias() + 63, sign);
     }
     explicit operator long double() const noexcept
     {
index 9bb5e176825261a03a7e2b7de44e150a97add358..2fec55f5698f0a2842163cfb41297938b6eba6b9 100644 (file)
@@ -32,7 +32,7 @@
 #include <stdexcept>
 #include <ostream>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -460,104 +460,104 @@ constexpr bool operator>(basic_string_view<Char_type, Traits_type> a,
     return a.compare(b) > 0;
 }
 
-#define VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(...) \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator==(__VA_ARGS__) noexcept                                               \
-    {                                                                                   \
-        return operator==(static_cast<basic_string_view<Char_type, Traits_type>>(a),    \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));   \
-    }                                                                                   \
-                                                                                        \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator!=(__VA_ARGS__) noexcept                                               \
-    {                                                                                   \
-        return operator!=(static_cast<basic_string_view<Char_type, Traits_type>>(a),    \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));   \
-    }                                                                                   \
-                                                                                        \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator<=(__VA_ARGS__) noexcept                                               \
-    {                                                                                   \
-        return operator<=(static_cast<basic_string_view<Char_type, Traits_type>>(a),    \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));   \
-    }                                                                                   \
-                                                                                        \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator>=(__VA_ARGS__) noexcept                                               \
-    {                                                                                   \
-        return operator>=(static_cast<basic_string_view<Char_type, Traits_type>>(a),    \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));   \
-    }                                                                                   \
-                                                                                        \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator<(__VA_ARGS__) noexcept                                                \
-    {                                                                                   \
-        return operator<(static_cast<basic_string_view<Char_type, Traits_type>>(a),     \
-                         static_cast<basic_string_view<Char_type, Traits_type>>(b));    \
-    }                                                                                   \
-                                                                                        \
-    template <typename Char_type, typename Traits_type>                                 \
-    bool operator>(__VA_ARGS__) noexcept                                                \
-    {                                                                                   \
-        return operator>(static_cast<basic_string_view<Char_type, Traits_type>>(a),     \
-                         static_cast<basic_string_view<Char_type, Traits_type>>(b));    \
+#define KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(...)     \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator==(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator==(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator!=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator!=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator<=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator<=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator>=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator>=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator<(__VA_ARGS__) noexcept                                              \
+    {                                                                                 \
+        return operator<(static_cast<basic_string_view<Char_type, Traits_type>>(a),   \
+                         static_cast<basic_string_view<Char_type, Traits_type>>(b));  \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type>                               \
+    bool operator>(__VA_ARGS__) noexcept                                              \
+    {                                                                                 \
+        return operator>(static_cast<basic_string_view<Char_type, Traits_type>>(a),   \
+                         static_cast<basic_string_view<Char_type, Traits_type>>(b));  \
     }
 
-#define VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(...) \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator==(__VA_ARGS__) noexcept                                                 \
-    {                                                                                     \
-        return operator==(static_cast<basic_string_view<Char_type, Traits_type>>(a),      \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));     \
-    }                                                                                     \
-                                                                                          \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator!=(__VA_ARGS__) noexcept                                                 \
-    {                                                                                     \
-        return operator!=(static_cast<basic_string_view<Char_type, Traits_type>>(a),      \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));     \
-    }                                                                                     \
-                                                                                          \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator<=(__VA_ARGS__) noexcept                                                 \
-    {                                                                                     \
-        return operator<=(static_cast<basic_string_view<Char_type, Traits_type>>(a),      \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));     \
-    }                                                                                     \
-                                                                                          \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator>=(__VA_ARGS__) noexcept                                                 \
-    {                                                                                     \
-        return operator>=(static_cast<basic_string_view<Char_type, Traits_type>>(a),      \
-                          static_cast<basic_string_view<Char_type, Traits_type>>(b));     \
-    }                                                                                     \
-                                                                                          \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator<(__VA_ARGS__) noexcept                                                  \
-    {                                                                                     \
-        return operator<(static_cast<basic_string_view<Char_type, Traits_type>>(a),       \
-                         static_cast<basic_string_view<Char_type, Traits_type>>(b));      \
-    }                                                                                     \
-                                                                                          \
-    template <typename Char_type, typename Traits_type, typename Allocator>               \
-    bool operator>(__VA_ARGS__) noexcept                                                  \
-    {                                                                                     \
-        return operator>(static_cast<basic_string_view<Char_type, Traits_type>>(a),       \
-                         static_cast<basic_string_view<Char_type, Traits_type>>(b));      \
+#define KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(...)   \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator==(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator==(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator!=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator!=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator<=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator<=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator>=(__VA_ARGS__) noexcept                                             \
+    {                                                                                 \
+        return operator>=(static_cast<basic_string_view<Char_type, Traits_type>>(a),  \
+                          static_cast<basic_string_view<Char_type, Traits_type>>(b)); \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator<(__VA_ARGS__) noexcept                                              \
+    {                                                                                 \
+        return operator<(static_cast<basic_string_view<Char_type, Traits_type>>(a),   \
+                         static_cast<basic_string_view<Char_type, Traits_type>>(b));  \
+    }                                                                                 \
+                                                                                      \
+    template <typename Char_type, typename Traits_type, typename Allocator>           \
+    bool operator>(__VA_ARGS__) noexcept                                              \
+    {                                                                                 \
+        return operator>(static_cast<basic_string_view<Char_type, Traits_type>>(a),   \
+                         static_cast<basic_string_view<Char_type, Traits_type>>(b));  \
     }
 
-VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(
+KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(
     const Char_type *a, basic_string_view<Char_type, Traits_type> b)
-VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(
+KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR(
     basic_string_view<Char_type, Traits_type> a, const Char_type *b)
-VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(
+KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(
     basic_string_view<Char_type, Traits_type> a,
     std::basic_string<Char_type, Traits_type, Allocator> b)
-VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(
+KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR(
     std::basic_string<Char_type, Traits_type, Allocator> a,
     basic_string_view<Char_type, Traits_type> b)
-#undef VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR
-#undef VULKAN_CPU_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR
+#undef KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_NO_ALLOCATOR
+#undef KAZAN_UTIL_STRING_VIEW_GENERATE_EXTRA_COMPARE_OPERATORS_WITH_ALLOCATOR
 
 template <typename Char_type, typename Traits_type>
 std::basic_ostream<Char_type, Traits_type> &operator<<(
@@ -600,9 +600,9 @@ constexpr u32string_view operator"" _sv(const char32_t *str, std::size_t length)
 namespace std
 {
 template <typename Char_type, typename Traits_type>
-struct hash<vulkan_cpu::util::basic_string_view<Char_type, Traits_type>>
+struct hash<kazan::util::basic_string_view<Char_type, Traits_type>>
 {
-    std::size_t operator()(vulkan_cpu::util::basic_string_view<Char_type, Traits_type> v) const
+    std::size_t operator()(kazan::util::basic_string_view<Char_type, Traits_type> v) const
     {
         typedef std::basic_string<Char_type, Traits_type> stringType;
         return std::hash<stringType>(static_cast<stringType>(v));
index 0c6857216e2043295e53d07f5be249f0a6287c3c..212cc427a12e0a6d77cbd6e91494ac5f63f49c5d 100644 (file)
@@ -24,7 +24,7 @@
 
 #ifdef __linux__
 #include <sys/sysinfo.h>
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -43,7 +43,7 @@ System_memory_info System_memory_info::get()
 #elif defined(_WIN32)
 #include <windows.h>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 051a70c40880d65eb9446dc7ed63d6b9f6816b54..c64d9ba34bacad72647bf1a6dc0f6e892a18f57a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <cstdint>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 70f04c1906d6c0967154fac1d693325c0beaece7..312a09088ea5ef0c49c1d91f84a796453abcd554 100644 (file)
@@ -36,7 +36,7 @@
 #include <cassert>
 #include "string_view.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index eb5d0c7282b08b4b75130090e31c9faf63bfdf18..219264f661a3e3a7d90b13f8575ad09821a4798e 100644 (file)
@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <string>
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 0ef2e1ca7f200d419fd918bfa57613e380d05a94..751c5b0c8726bb3ee8bba7c8a89d04a0a41f941e 100644 (file)
@@ -36,7 +36,7 @@
 #include "is_swappable.h"
 #include "invoke.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
@@ -312,7 +312,7 @@ template <typename... Types>
 using Variant_values =
     Variant_values_implementation<variant_is_trivially_destructible<Types...>(), Types...>;
 
-#define VULKAN_CPU_UTIL_VARIANT_VALUES(Is_Trivially_Destructible, Destructor)                     \
+#define KAZAN_UTIL_VARIANT_VALUES(Is_Trivially_Destructible, Destructor)                          \
     template <typename T, typename... Types>                                                      \
     union Variant_values_implementation<Is_Trivially_Destructible, T, Types...>                   \
     {                                                                                             \
@@ -490,9 +490,9 @@ using Variant_values =
         Destructor                                                                                \
     };
 
-VULKAN_CPU_UTIL_VARIANT_VALUES(true, ~Variant_values_implementation() = default;)
-VULKAN_CPU_UTIL_VARIANT_VALUES(false, ~Variant_values_implementation(){})
-#undef VULKAN_CPU_UTIL_VARIANT_VALUES
+KAZAN_UTIL_VARIANT_VALUES(true, ~Variant_values_implementation() = default;)
+KAZAN_UTIL_VARIANT_VALUES(false, ~Variant_values_implementation(){})
+#undef KAZAN_UTIL_VARIANT_VALUES
 
 template <std::size_t Index, typename... Types>
 struct Variant_get;
@@ -543,7 +543,7 @@ struct Variant_get<Index, T, Types...>
     }
 };
 
-#define VULKAN_CPU_UTIL_VARIANT_DISPATCH(Const, Ref)                                               \
+#define KAZAN_UTIL_VARIANT_DISPATCH(Const, Ref)                                                    \
     template <std::size_t Index,                                                                   \
               typename Return_Type,                                                                \
               typename Fn,                                                                         \
@@ -645,11 +645,11 @@ struct Variant_get<Index, T, Types...>
             std::forward<Args>(args)...);                                                          \
     }
 
-VULKAN_CPU_UTIL_VARIANT_DISPATCH(, &)
-VULKAN_CPU_UTIL_VARIANT_DISPATCH(const, &)
-VULKAN_CPU_UTIL_VARIANT_DISPATCH(, &&)
-VULKAN_CPU_UTIL_VARIANT_DISPATCH(const, &&)
-#undef VULKAN_CPU_UTIL_VARIANT_DISPATCH
+KAZAN_UTIL_VARIANT_DISPATCH(, &)
+KAZAN_UTIL_VARIANT_DISPATCH(const, &)
+KAZAN_UTIL_VARIANT_DISPATCH(, &&)
+KAZAN_UTIL_VARIANT_DISPATCH(const, &&)
+#undef KAZAN_UTIL_VARIANT_DISPATCH
 
 template <std::size_t Type_Count>
 struct Variant_index_type
@@ -705,15 +705,15 @@ template <bool Is_Trivially_Destructible,
           typename... Types>
 struct Variant_base;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_DESTRUCTOR_false \
-    ~Variant_base()                                   \
-    {                                                 \
-        values.destruct(index_value.get());           \
+#define KAZAN_UTIL_VARIANT_BASE_DESTRUCTOR_false \
+    ~Variant_base()                              \
+    {                                            \
+        values.destruct(index_value.get());      \
     }
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_DESTRUCTOR_true ~Variant_base() = default;
+#define KAZAN_UTIL_VARIANT_BASE_DESTRUCTOR_true ~Variant_base() = default;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_true                \
+#define KAZAN_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_true                     \
     Variant_base(const Variant_base &rt) noexcept(                        \
         Variant_values<Types...>::is_nothrow_copy_constructible)          \
         : values(in_place_index<variant_npos>), index_value(variant_npos) \
@@ -722,10 +722,10 @@ struct Variant_base;
         index_value = rt.index_value;                                     \
     }
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_false \
+#define KAZAN_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_false \
     Variant_base(const Variant_base &rt) = delete;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_true                 \
+#define KAZAN_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_true                      \
     Variant_base(Variant_base &&rt) noexcept(                              \
         Variant_values<Types...>::is_nothrow_move_constructible)           \
         : values(in_place_index<variant_npos>), index_value(variant_npos)  \
@@ -734,10 +734,9 @@ struct Variant_base;
         index_value = rt.index_value;                                      \
     }
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_false \
-    Variant_base(Variant_base &&rt) = delete;
+#define KAZAN_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_false Variant_base(Variant_base &&rt) = delete;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_true                      \
+#define KAZAN_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_true                           \
     Variant_base &operator=(const Variant_base &rt) noexcept(                 \
         Variant_values<Types...>::is_nothrow_copy_assignable)                 \
     {                                                                         \
@@ -755,10 +754,10 @@ struct Variant_base;
         return *this;                                                         \
     }
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_false \
+#define KAZAN_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_false \
     Variant_base &operator=(const Variant_base &rt) = delete;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_true                       \
+#define KAZAN_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_true                            \
     Variant_base &operator=(Variant_base &&rt) noexcept(                       \
         Variant_values<Types...>::is_nothrow_move_assignable)                  \
     {                                                                          \
@@ -776,71 +775,68 @@ struct Variant_base;
         return *this;                                                          \
     }
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_false \
+#define KAZAN_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_false \
     Variant_base &operator=(Variant_base &&rt) = delete;
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE0(Is_Trivially_Destructible,                         \
-                                      Is_Copy_Constructible,                             \
-                                      Is_Move_Constructible,                             \
-                                      Is_Copy_Assignable,                                \
-                                      Is_Move_Assignable)                                \
-    template <typename... Types>                                                         \
-    struct Variant_base<Is_Trivially_Destructible,                                       \
-                        Is_Copy_Constructible,                                           \
-                        Is_Move_Constructible,                                           \
-                        Is_Copy_Assignable,                                              \
-                        Is_Move_Assignable,                                              \
-                        Types...>                                                        \
-    {                                                                                    \
-        Variant_values<Types...> values;                                                 \
-        Variant_index_type<sizeof...(Types)> index_value;                                \
-        template <typename... Args>                                                      \
-        constexpr Variant_base(                                                          \
-            Variant_base_construct_tag,                                                  \
-            std::size_t index_value,                                                     \
-            Args &&... args) noexcept(noexcept(new(std::declval<void *>())               \
-                                                   Variant_values<Types...>(             \
-                                                       std::declval<Args>()...)))        \
-            : values(std::forward<Args>(args)...), index_value(index_value)              \
-        {                                                                                \
-        }                                                                                \
-        VULKAN_CPU_UTIL_VARIANT_BASE_DESTRUCTOR_##Is_Trivially_Destructible              \
-            VULKAN_CPU_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_##Is_Copy_Constructible        \
-                VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_##Is_Move_Constructible    \
-                    VULKAN_CPU_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_##Is_Copy_Assignable     \
-                        VULKAN_CPU_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_##Is_Move_Assignable \
+#define KAZAN_UTIL_VARIANT_BASE0(Is_Trivially_Destructible,                         \
+                                 Is_Copy_Constructible,                             \
+                                 Is_Move_Constructible,                             \
+                                 Is_Copy_Assignable,                                \
+                                 Is_Move_Assignable)                                \
+    template <typename... Types>                                                    \
+    struct Variant_base<Is_Trivially_Destructible,                                  \
+                        Is_Copy_Constructible,                                      \
+                        Is_Move_Constructible,                                      \
+                        Is_Copy_Assignable,                                         \
+                        Is_Move_Assignable,                                         \
+                        Types...>                                                   \
+    {                                                                               \
+        Variant_values<Types...> values;                                            \
+        Variant_index_type<sizeof...(Types)> index_value;                           \
+        template <typename... Args>                                                 \
+        constexpr Variant_base(                                                     \
+            Variant_base_construct_tag,                                             \
+            std::size_t index_value,                                                \
+            Args &&... args) noexcept(noexcept(new(std::declval<void *>())          \
+                                                   Variant_values<Types...>(        \
+                                                       std::declval<Args>()...)))   \
+            : values(std::forward<Args>(args)...), index_value(index_value)         \
+        {                                                                           \
+        }                                                                           \
+        KAZAN_UTIL_VARIANT_BASE_DESTRUCTOR_##Is_Trivially_Destructible              \
+            KAZAN_UTIL_VARIANT_BASE_COPY_CONSTRUCTOR_##Is_Copy_Constructible        \
+                KAZAN_UTIL_VARIANT_BASE_MOVE_CONSTRUCTOR_##Is_Move_Constructible    \
+                    KAZAN_UTIL_VARIANT_BASE_COPY_ASSIGN_OP_##Is_Copy_Assignable     \
+                        KAZAN_UTIL_VARIANT_BASE_MOVE_ASSIGN_OP_##Is_Move_Assignable \
     };
 
-#define VULKAN_CPU_UTIL_VARIANT_BASE1(                                                    \
+#define KAZAN_UTIL_VARIANT_BASE1(                                                         \
     Is_Copy_Constructible, Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable) \
-    VULKAN_CPU_UTIL_VARIANT_BASE0(false,                                                  \
-                                  Is_Copy_Constructible,                                  \
-                                  Is_Move_Constructible,                                  \
-                                  Is_Copy_Assignable,                                     \
-                                  Is_Move_Assignable)                                     \
-    VULKAN_CPU_UTIL_VARIANT_BASE0(true,                                                   \
-                                  Is_Copy_Constructible,                                  \
-                                  Is_Move_Constructible,                                  \
-                                  Is_Copy_Assignable,                                     \
-                                  Is_Move_Assignable)
-
-#define VULKAN_CPU_UTIL_VARIANT_BASE2(                                        \
-    Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable)            \
-    VULKAN_CPU_UTIL_VARIANT_BASE1(                                            \
-        false, Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable) \
-    VULKAN_CPU_UTIL_VARIANT_BASE1(                                            \
-        true, Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable)
-
-#define VULKAN_CPU_UTIL_VARIANT_BASE3(Is_Copy_Assignable, Is_Move_Assignable)    \
-    VULKAN_CPU_UTIL_VARIANT_BASE2(false, Is_Copy_Assignable, Is_Move_Assignable) \
-    VULKAN_CPU_UTIL_VARIANT_BASE2(true, Is_Copy_Assignable, Is_Move_Assignable)
-
-#define VULKAN_CPU_UTIL_VARIANT_BASE4(Is_Move_Assignable)    \
-    VULKAN_CPU_UTIL_VARIANT_BASE3(false, Is_Move_Assignable) \
-    VULKAN_CPU_UTIL_VARIANT_BASE3(true, Is_Move_Assignable)
-
-VULKAN_CPU_UTIL_VARIANT_BASE4(false)
-VULKAN_CPU_UTIL_VARIANT_BASE4(true)
+    KAZAN_UTIL_VARIANT_BASE0(false,                                                       \
+                             Is_Copy_Constructible,                                       \
+                             Is_Move_Constructible,                                       \
+                             Is_Copy_Assignable,                                          \
+                             Is_Move_Assignable)                                          \
+    KAZAN_UTIL_VARIANT_BASE0(true,                                                        \
+                             Is_Copy_Constructible,                                       \
+                             Is_Move_Constructible,                                       \
+                             Is_Copy_Assignable,                                          \
+                             Is_Move_Assignable)
+
+#define KAZAN_UTIL_VARIANT_BASE2(Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable)    \
+    KAZAN_UTIL_VARIANT_BASE1(false, Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable) \
+    KAZAN_UTIL_VARIANT_BASE1(true, Is_Move_Constructible, Is_Copy_Assignable, Is_Move_Assignable)
+
+#define KAZAN_UTIL_VARIANT_BASE3(Is_Copy_Assignable, Is_Move_Assignable)    \
+    KAZAN_UTIL_VARIANT_BASE2(false, Is_Copy_Assignable, Is_Move_Assignable) \
+    KAZAN_UTIL_VARIANT_BASE2(true, Is_Copy_Assignable, Is_Move_Assignable)
+
+#define KAZAN_UTIL_VARIANT_BASE4(Is_Move_Assignable)    \
+    KAZAN_UTIL_VARIANT_BASE3(false, Is_Move_Assignable) \
+    KAZAN_UTIL_VARIANT_BASE3(true, Is_Move_Assignable)
+
+KAZAN_UTIL_VARIANT_BASE4(false)
+KAZAN_UTIL_VARIANT_BASE4(true)
 
 template <typename T>
 struct Variant_is_in_place_index
@@ -1393,23 +1389,23 @@ auto visit(Fn &&fn, Variants &&... variants)
 namespace std
 {
 template <>
-struct hash<vulkan_cpu::util::monostate>
+struct hash<kazan::util::monostate>
 {
-    constexpr std::size_t operator()(vulkan_cpu::util::monostate) const noexcept
+    constexpr std::size_t operator()(kazan::util::monostate) const noexcept
     {
         return 5546275UL;
     }
 };
 
 template <typename... Types>
-struct hash<vulkan_cpu::util::variant<Types...>>
+struct hash<kazan::util::variant<Types...>>
 {
-    constexpr std::size_t operator()(const vulkan_cpu::util::variant<Types...> &v) const
+    constexpr std::size_t operator()(const kazan::util::variant<Types...> &v) const
     {
         if(v.valueless_by_exception())
             return 10285473UL;
         return v.index() * 1414729UL
-               + vulkan_cpu::util::visit(
+               + kazan::util::visit(
                      [](const auto &v) -> std::size_t
                      {
                          return std::hash<typename std::decay<decltype(v)>::type>()(v);
@@ -1418,12 +1414,12 @@ struct hash<vulkan_cpu::util::variant<Types...>>
     }
 };
 
-template <typename... Types,
-          typename = typename std::
-              enable_if<vulkan_cpu::util::detail::Variant_values<Types...>::is_swappable>::type>
-inline void
-    swap(vulkan_cpu::util::variant<Types...> &l, vulkan_cpu::util::variant<Types...> &r) noexcept(
-        vulkan_cpu::util::detail::Variant_values<Types...>::is_nothrow_swappable)
+template <
+    typename... Types,
+    typename =
+        typename std::enable_if<kazan::util::detail::Variant_values<Types...>::is_swappable>::type>
+inline void swap(kazan::util::variant<Types...> &l, kazan::util::variant<Types...> &r) noexcept(
+    kazan::util::detail::Variant_values<Types...>::is_nothrow_swappable)
 {
     l.swap(r);
 }
index 5aed59e91c7c1b0efb455af2ba8df546199901bd..43c472366fdac852b73ed96809b2c7189800c133 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef UTIL_VOID_T_H_
 #define UTIL_VOID_T_H_
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace util
 {
index 1d232c117cbd6caa238b39f66f3e04c866627b5d..3ef1a808f8688a34b167f0b81b2a3ad73c48ca42 100644 (file)
@@ -21,5 +21,5 @@
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 set(sources vulkan.cpp
             api_objects.cpp)
-add_library(vulkan_cpu_vulkan STATIC ${sources})
-target_compile_definitions(vulkan_cpu_vulkan PUBLIC VK_NO_PROTOTYPES)
+add_library(kazan_vulkan STATIC ${sources})
+target_compile_definitions(kazan_vulkan PUBLIC VK_NO_PROTOTYPES)
index 557bd64a3cf4d80d688e8105614eaa39c29bc9c5..1c140d78c50c891b784f8d7ff7576bb19c92f5c5 100644 (file)
@@ -24,7 +24,7 @@
 #include "util/optional.h"
 #include <iostream>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace vulkan
 {
index d3c5e037d2f7232f9e58b01b8e52032f0eec1570..151307b45a44684cb6ff5e56eade765a8bcd04c4 100644 (file)
@@ -32,7 +32,7 @@
 #include <cassert>
 #include <chrono>
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace vulkan
 {
@@ -41,7 +41,7 @@ enum class Supported_extension
     Not_supported,
 };
 
-vulkan_cpu_util_generate_enum_traits(Supported_extension, Supported_extension::Not_supported);
+kazan_util_generate_enum_traits(Supported_extension, Supported_extension::Not_supported);
 
 typedef util::Enum_set<Supported_extension> Supported_extensions;
 
@@ -152,7 +152,7 @@ struct Vulkan_physical_device
               .vendorID = 0x12345678UL,
               .deviceID = 0,
               .deviceType = VK_PHYSICAL_DEVICE_TYPE_CPU,
-              .deviceName = "Vulkan-CPU Device",
+              .deviceName = "Kazan Software Renderer",
 #warning calculate the correct value of pipelineCacheUUID as the hash of the target cpu info and the hashed source code
               .pipelineCacheUUID = {},
               .limits =
index 98edf17bf7024c8138dd569a33c46b6480b8a352..3095e2c42f7525d37d9909b9f9a06e52652d7c16 100644 (file)
@@ -27,7 +27,7 @@
 #include "spirv/spirv.h"
 #include "util/enum.h"
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace vulkan
 {
index 97d3826106d62d9d0b71c67e386c9b62e334e4b4..35fecad7fd0cbd6f7198e4e89989603e4e4ac09e 100644 (file)
 #
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 set(sources vulkan_icd.cpp)
-add_library(vulkan_cpu_vulkan_icd MODULE ${sources})
-target_link_libraries(vulkan_cpu_vulkan_icd
-                      vulkan_cpu_vulkan
-                      vulkan_cpu_util)
-file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vulkan_cpu_vulkan_icd.json INPUT ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_cpu_vulkan_icd.json.in)
+add_library(kazan_vulkan_icd MODULE ${sources})
+target_link_libraries(kazan_vulkan_icd
+                      kazan_vulkan
+                      kazan_util)
+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kazan_vulkan_icd.json INPUT ${CMAKE_CURRENT_SOURCE_DIR}/kazan_vulkan_icd.json.in)
 if(UNIX AND NOT CYGWIN)
-    target_link_libraries(vulkan_cpu_vulkan_icd -Wl,--no-undefined)
+    target_link_libraries(kazan_vulkan_icd -Wl,--no-undefined)
 endif()
diff --git a/src/vulkan_icd/kazan_vulkan_icd.json.in b/src/vulkan_icd/kazan_vulkan_icd.json.in
new file mode 100644 (file)
index 0000000..5b5e9bc
--- /dev/null
@@ -0,0 +1,7 @@
+{
+    "file_format_version": "1.0.0",
+    "ICD": {
+        "library_path": "$<TARGET_FILE:kazan_vulkan_icd>",
+        "api_version": "1.0.58"
+    }
+}
diff --git a/src/vulkan_icd/vulkan_cpu_vulkan_icd.json.in b/src/vulkan_icd/vulkan_cpu_vulkan_icd.json.in
deleted file mode 100644 (file)
index 3dc5840..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "file_format_version": "1.0.0",
-    "ICD": {
-        "library_path": "$<TARGET_FILE:vulkan_cpu_vulkan_icd>",
-        "api_version": "1.0.58"
-    }
-}
index 70ae76f32c2ec8577bab4adba7ef4bc882dd0fcf..3393dfb0b37d837eda148c5a97ace9a4f1281753 100644 (file)
@@ -25,7 +25,7 @@
 #include <initializer_list>
 #include <iostream>
 
-using namespace vulkan_cpu;
+using namespace kazan;
 
 #ifdef __ELF__
 #define DLLEXPORT_ATTR(original_attributes) \
@@ -1319,7 +1319,7 @@ extern "C" VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands(VkCommandBuffer comma
 #warning finish implementing vkCmdExecuteCommands
     assert(!"vkCmdExecuteCommands is not implemented");
 }
-namespace vulkan_cpu
+namespace kazan
 {
 namespace vulkan_icd
 {
index 8f637289d0f76c8d66f329368825ae06a6d78159..df28c8e919b52ab10f8acb622474e0803227f596 100644 (file)
@@ -40,7 +40,7 @@ extern "C" VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(Vk
 typedef PFN_vkVoidFunction (*VKAPI_PTR PFN_vk_icdGetInstanceProcAddr)(VkInstance instance,
                                                                       const char *pName);
 
-namespace vulkan_cpu
+namespace kazan
 {
 namespace vulkan_icd
 {