Remove generation of OpenCLDebugInfo100.h

.vscode/c_cpp_properties.json

@@ -54,7 +54,6 @@
                 "VERIFY_LLVM_IR=1"
             ],
             "includePath": [
-                "${workspaceFolder}/build/spirv-tools-ext/include",
                 "${workspaceFolder}/include",
                 "${workspaceFolder}/src",
                 "${workspaceFolder}/third_party/benchmark/include",

src/Pipeline/CMakeLists.txt

@@ -67,23 +67,6 @@ set_target_properties(extinst_tables PROPERTIES FOLDER "SPIRV-Tools build")
 set_target_properties(spirv-tools-pkg-config PROPERTIES FOLDER "SPIRV-Tools build")
 set_target_properties(spirv-tools-shared-pkg-config PROPERTIES FOLDER "SPIRV-Tools build")
 
-# Copy the OpenCLDebugInfo100.h header that's generated by SPIRV-Tools
-# out to a separate directory that can be added to the include path.
-# Ideally, this header would just be pre-built and part of SPIRV-Headers.
-# See: https://github.com/KhronosGroup/SPIRV-Headers/issues/137
-set(SPIRV_TOOLS_EXT_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/spirv-tools-ext/include)
-add_custom_command(
-    OUTPUT "${SPIRV_TOOLS_EXT_INC_DIR}/spirv-tools/ext/OpenCLDebugInfo100.h"
-    DEPENDS spirv-tools-header-OpenCLDebugInfo100
-    COMMAND ${CMAKE_COMMAND} -E copy
-        "${spirv-tools_BINARY_DIR}/OpenCLDebugInfo100.h"
-        "${SPIRV_TOOLS_EXT_INC_DIR}/spirv-tools/ext/OpenCLDebugInfo100.h"
-)
-add_custom_target(spirv_tools_ext_includes
-    DEPENDS "${SPIRV_TOOLS_EXT_INC_DIR}/spirv-tools/ext/OpenCLDebugInfo100.h")
-set_target_properties(spirv_tools_ext_includes PROPERTIES FOLDER "SPIRV-Tools build")
-add_dependencies(vk_pipeline spirv_tools_ext_includes)
-
 set_target_properties(vk_pipeline PROPERTIES
     POSITION_INDEPENDENT_CODE 1
     FOLDER "SwiftShader VK"

src/Pipeline/SpirvShaderDebugger.cpp

@@ -26,7 +26,7 @@
 #	include "Vulkan/Debug/Thread.hpp"
 #	include "Vulkan/Debug/Variable.hpp"
 
-#	include "spirv-tools/ext/OpenCLDebugInfo100.h"
+#	include "spirv/unified1/OpenCLDebugInfo100.h"
 #	include "spirv-tools/libspirv.h"
 
 #	include <algorithm>

third_party/SPIRV-Tools/Android.bp

@@ -63,23 +63,6 @@ genrule {
         "$(location) --extinst-glsl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json) --glsl-insts-output=$(location glsl.std.450.insts.inc); "
 }
 
-
-genrule {
-    name: "swiftshader_spvtools_generate_language_headers",
-    out: [
-        "DebugInfo.h",
-        "OpenCLDebugInfo100.h",
-    ],
-    srcs: [
-        "source/extinst.debuginfo.grammar.json",
-        "source/extinst.opencl.debuginfo.100.grammar.json",
-    ],
-    tool_files: ["utils/generate_language_headers.py"],
-    cmd: 
-        "$(location) --extinst-grammar=$(location source/extinst.debuginfo.grammar.json) --extinst-output-path=$(location DebugInfo.h); "+
-        "$(location) --extinst-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --extinst-output-path=$(location OpenCLDebugInfo100.h); "
-}
-
 genrule {
     name: "swiftshader_spvtools_generate_registry_tables",
     out: [
@@ -117,11 +100,11 @@ cc_library_static {
         "include",
     ],
     include_dirs: [
-        "external/swiftshader/third_party/SPIRV-Headers/include"
+        "external/swiftshader/third_party/SPIRV-Headers/include/",
+        "external/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1/",
     ],
     generated_headers: [
         "swiftshader_spvtools_generate_grammar_tables",
-        "swiftshader_spvtools_generate_language_headers",
         "swiftshader_spvtools_update_build_version",
         "swiftshader_spvtools_generate_registry_tables",
     ],