summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gfx/circular-resource-heap-d3d12.h4
-rw-r--r--tools/gfx/d3d-util.h4
-rw-r--r--tools/gfx/descriptor-heap-d3d12.h2
-rw-r--r--tools/gfx/flag-combiner.h2
-rw-r--r--tools/gfx/render-gl.cpp4
-rw-r--r--tools/gfx/render-vk.cpp2
-rw-r--r--tools/gfx/render.h6
-rw-r--r--tools/gfx/surface.cpp2
-rw-r--r--tools/gfx/vk-api.cpp2
-rw-r--r--tools/gfx/vk-swap-chain.cpp2
-rw-r--r--tools/gfx/vk-swap-chain.h2
-rw-r--r--tools/render-test/options.cpp2
-rw-r--r--tools/render-test/shader-input-layout.cpp2
-rw-r--r--tools/render-test/shader-input-layout.h2
-rw-r--r--tools/slang-generate/main.cpp4
-rw-r--r--tools/slang-test/options.h4
-rw-r--r--tools/slang-test/slang-test-main.cpp2
-rw-r--r--tools/slang-test/slangc-tool.cpp2
-rw-r--r--tools/slang-test/test-context.h4
-rw-r--r--tools/slang-test/test-reporter.h4
-rw-r--r--tools/slang-test/unit-test-byte-encode.cpp2
-rw-r--r--tools/slang-test/unit-test-free-list.cpp2
-rw-r--r--tools/slang-test/unit-test-memory-arena.cpp2
23 files changed, 32 insertions, 32 deletions
diff --git a/tools/gfx/circular-resource-heap-d3d12.h b/tools/gfx/circular-resource-heap-d3d12.h
index cca981601..bf9f412cf 100644
--- a/tools/gfx/circular-resource-heap-d3d12.h
+++ b/tools/gfx/circular-resource-heap-d3d12.h
@@ -1,7 +1,7 @@
-#pragma once
+#pragma once
#include "../../slang-com-ptr.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
#include "../../source/core/slang-free-list.h"
#include "resource-d3d12.h"
diff --git a/tools/gfx/d3d-util.h b/tools/gfx/d3d-util.h
index 0c05bed46..6bcee054c 100644
--- a/tools/gfx/d3d-util.h
+++ b/tools/gfx/d3d-util.h
@@ -1,4 +1,4 @@
-// d3d-util.h
+// d3d-util.h
#pragma once
#include <stdint.h>
@@ -6,7 +6,7 @@
#include "../../slang-com-helper.h"
#include "../../slang-com-ptr.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
#include "flag-combiner.h"
diff --git a/tools/gfx/descriptor-heap-d3d12.h b/tools/gfx/descriptor-heap-d3d12.h
index 638c1f752..a546395d8 100644
--- a/tools/gfx/descriptor-heap-d3d12.h
+++ b/tools/gfx/descriptor-heap-d3d12.h
@@ -5,7 +5,7 @@
#include <d3d12.h>
#include "../../slang-com-ptr.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
namespace gfx {
diff --git a/tools/gfx/flag-combiner.h b/tools/gfx/flag-combiner.h
index 83962d2dd..db8c6863b 100644
--- a/tools/gfx/flag-combiner.h
+++ b/tools/gfx/flag-combiner.h
@@ -1,7 +1,7 @@
#ifndef GFX_FLAG_COMBINER_H
#define GFX_FLAG_COMBINER_H
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
namespace gfx {
diff --git a/tools/gfx/render-gl.cpp b/tools/gfx/render-gl.cpp
index c20eb7e6d..3249b8620 100644
--- a/tools/gfx/render-gl.cpp
+++ b/tools/gfx/render-gl.cpp
@@ -6,8 +6,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include "core/basic.h"
-#include "core/secure-crt.h"
+#include "core/slang-basic.h"
+#include "core/slang-secure-crt.h"
#include "external/stb/stb_image_write.h"
#include "surface.h"
diff --git a/tools/gfx/render-vk.cpp b/tools/gfx/render-vk.cpp
index c76a8e42d..77b593565 100644
--- a/tools/gfx/render-vk.cpp
+++ b/tools/gfx/render-vk.cpp
@@ -4,7 +4,7 @@
//WORKING:#include "options.h"
#include "render.h"
-#include "../../source/core/smart-pointer.h"
+#include "../../source/core/slang-smart-pointer.h"
#include "vk-api.h"
#include "vk-util.h"
diff --git a/tools/gfx/render.h b/tools/gfx/render.h
index 292b4f8f8..247932bd5 100644
--- a/tools/gfx/render.h
+++ b/tools/gfx/render.h
@@ -9,9 +9,9 @@
#include "../../slang-com-helper.h"
-#include "../../source/core/smart-pointer.h"
-#include "../../source/core/list.h"
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-smart-pointer.h"
+#include "../../source/core/slang-list.h"
+#include "../../source/core/slang-dictionary.h"
#include "../../slang.h"
diff --git a/tools/gfx/surface.cpp b/tools/gfx/surface.cpp
index 63fd7087c..28fe744de 100644
--- a/tools/gfx/surface.cpp
+++ b/tools/gfx/surface.cpp
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
namespace gfx {
using namespace Slang;
diff --git a/tools/gfx/vk-api.cpp b/tools/gfx/vk-api.cpp
index 304513d24..50f80aa26 100644
--- a/tools/gfx/vk-api.cpp
+++ b/tools/gfx/vk-api.cpp
@@ -1,7 +1,7 @@
// vk-api.cpp
#include "vk-api.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
namespace gfx {
using namespace Slang;
diff --git a/tools/gfx/vk-swap-chain.cpp b/tools/gfx/vk-swap-chain.cpp
index bde68c413..5cf2e96ae 100644
--- a/tools/gfx/vk-swap-chain.cpp
+++ b/tools/gfx/vk-swap-chain.cpp
@@ -3,7 +3,7 @@
#include "vk-util.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/tools/gfx/vk-swap-chain.h b/tools/gfx/vk-swap-chain.h
index ad2357315..f8ad98a83 100644
--- a/tools/gfx/vk-swap-chain.h
+++ b/tools/gfx/vk-swap-chain.h
@@ -6,7 +6,7 @@
#include "render.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
namespace gfx {
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index 17ba864f7..9423b5b6e 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -9,7 +9,7 @@
#include "../../source/core/slang-writer.h"
#include "../../source/core/slang-render-api-util.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
#include "../../source/core/slang-string-util.h"
namespace renderer_test {
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index 644b0889e..8205c979e 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -1,5 +1,5 @@
#include "shader-input-layout.h"
-#include "core/token-reader.h"
+#include "core/slang-token-reader.h"
#include "render.h"
diff --git a/tools/render-test/shader-input-layout.h b/tools/render-test/shader-input-layout.h
index d9188fadd..d5a1b6fd5 100644
--- a/tools/render-test/shader-input-layout.h
+++ b/tools/render-test/shader-input-layout.h
@@ -1,7 +1,7 @@
#ifndef SLANG_TEST_SHADER_INPUT_LAYOUT_H
#define SLANG_TEST_SHADER_INPUT_LAYOUT_H
-#include "core/basic.h"
+#include "core/slang-basic.h"
#include "render.h"
diff --git a/tools/slang-generate/main.cpp b/tools/slang-generate/main.cpp
index ed5af370b..ddd087072 100644
--- a/tools/slang-generate/main.cpp
+++ b/tools/slang-generate/main.cpp
@@ -3,9 +3,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "../../source/core/secure-crt.h"
+#include "../../source/core/slang-secure-crt.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
#include "../../source/core/slang-string.h"
using namespace Slang;
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h
index 48c06463c..c78952625 100644
--- a/tools/slang-test/options.h
+++ b/tools/slang-test/options.h
@@ -3,11 +3,11 @@
#ifndef OPTIONS_H_INCLUDED
#define OPTIONS_H_INCLUDED
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#include "test-reporter.h"
#include "../../source/core/slang-render-api-util.h"
-#include "../../source/core/smart-pointer.h"
+#include "../../source/core/slang-smart-pointer.h"
// A category that a test can be tagged with
struct TestCategory: public Slang::RefObject
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index b7de3082f..f030dc8aa 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1,7 +1,7 @@
// slang-test-main.cpp
#include "../../source/core/slang-io.h"
-#include "../../source/core/token-reader.h"
+#include "../../source/core/slang-token-reader.h"
#include "../../source/core/slang-std-writers.h"
#include "../../slang-com-helper.h"
diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp
index 40fdf05dd..2a30b10e9 100644
--- a/tools/slang-test/slangc-tool.cpp
+++ b/tools/slang-test/slangc-tool.cpp
@@ -1,7 +1,7 @@
// test-context.cpp
#include "slangc-tool.h"
-#include "../../source/core/exception.h"
+#include "../../source/core/slang-exception.h"
using namespace Slang;
diff --git a/tools/slang-test/test-context.h b/tools/slang-test/test-context.h
index 95b46fe6e..afc5bb427 100644
--- a/tools/slang-test/test-context.h
+++ b/tools/slang-test/test-context.h
@@ -4,9 +4,9 @@
#define TEST_CONTEXT_H_INCLUDED
#include "../../source/core/slang-string-util.h"
-#include "../../source/core/platform.h"
+#include "../../source/core/slang-platform.h"
#include "../../source/core/slang-std-writers.h"
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#include "../../source/core/slang-test-tool-util.h"
#include "../../source/core/slang-render-api-util.h"
diff --git a/tools/slang-test/test-reporter.h b/tools/slang-test/test-reporter.h
index 38e0d2cc3..95f9950e8 100644
--- a/tools/slang-test/test-reporter.h
+++ b/tools/slang-test/test-reporter.h
@@ -4,9 +4,9 @@
#define TEST_REPORTER_H_INCLUDED
#include "../../source/core/slang-string-util.h"
-#include "../../source/core/platform.h"
+#include "../../source/core/slang-platform.h"
#include "../../source/core/slang-std-writers.h"
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#define SLANG_CHECK(x) TestReporter::get()->addResultWithLocation((x), #x, __FILE__, __LINE__);
diff --git a/tools/slang-test/unit-test-byte-encode.cpp b/tools/slang-test/unit-test-byte-encode.cpp
index 83b20d4e0..8ffac3ee3 100644
--- a/tools/slang-test/unit-test-byte-encode.cpp
+++ b/tools/slang-test/unit-test-byte-encode.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;
diff --git a/tools/slang-test/unit-test-free-list.cpp b/tools/slang-test/unit-test-free-list.cpp
index fd7b4844f..28973d9e5 100644
--- a/tools/slang-test/unit-test-free-list.cpp
+++ b/tools/slang-test/unit-test-free-list.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;
diff --git a/tools/slang-test/unit-test-memory-arena.cpp b/tools/slang-test/unit-test-memory-arena.cpp
index 5aa0262e5..2aa898c9d 100644
--- a/tools/slang-test/unit-test-memory-arena.cpp
+++ b/tools/slang-test/unit-test-memory-arena.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;