From 6cbc3929a54d37bd23cb5efa8e3320ba02f78b2f Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 31 May 2019 17:20:37 -0400 Subject: 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. --- tools/render-test/options.cpp | 2 +- tools/render-test/shader-input-layout.cpp | 2 +- tools/render-test/shader-input-layout.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/render-test') 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" -- cgit v1.2.3