summaryrefslogtreecommitdiffstats
path: root/tools/gfx
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-05-31 17:20:37 -0400
committerGitHub <noreply@github.com>2019-05-31 17:20:37 -0400
commit6cbc3929a54d37bd23cb5efa8e3320ba02f78b2f (patch)
tree5a23cb47782e9e2a77762c90dd35da1005eba8d0 /tools/gfx
parentb81ff3ef968d1cc4e954b31a1812b3c391d17b02 (diff)
Use slang- prefix on slang compiler and core source (#973)
* Prefixing source files in source/slang with slang- * Prefix source in source/slang with slang- prefix. * Rename core source files with slang- prefix. * Update project files. * Fix problems from automatic merge.
Diffstat (limited to 'tools/gfx')
-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
11 files changed, 16 insertions, 16 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 {