diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-06-22 13:09:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 13:09:01 -0400 |
| commit | d0c9571be3a2167a9f019310aca8f7cd326972c0 (patch) | |
| tree | 52aa2f14ec2c9d8d42bc6fcbd381ed9799c19533 /tools/slang-test | |
| parent | e66d66b88e1c6ef8499708952fcbe3ba873f6e4c (diff) | |
Expose macros/functionality for defining interfaces (#604)
* Added Result definitions to the slang.h
* Removed slang-result.h and added slang-com-helper.h
* Move slang-com-ptr.h to be publically available.
* Add SLANG_IUNKNOWN macros to simplify implementing interfaces.
Use the SLANG_IUNKNOWN macros to in slang.c
* Removed slang-defines.h added outstanding defines to slang.h
Diffstat (limited to 'tools/slang-test')
| -rw-r--r-- | tools/slang-test/main.cpp | 5 | ||||
| -rw-r--r-- | tools/slang-test/render-api-util.cpp | 4 | ||||
| -rw-r--r-- | tools/slang-test/render-api-util.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tools/slang-test/main.cpp b/tools/slang-test/main.cpp index 32f1c9d4c..12434301c 100644 --- a/tools/slang-test/main.cpp +++ b/tools/slang-test/main.cpp @@ -1,9 +1,10 @@ -// main.cpp +// main.cpp #include "../../source/core/slang-io.h" #include "../../source/core/token-reader.h" -#include "../../source/core/slang-result.h" +#include "../../slang-com-helper.h" + #include "../../source/core/slang-string-util.h" using namespace Slang; diff --git a/tools/slang-test/render-api-util.cpp b/tools/slang-test/render-api-util.cpp index b8697c54b..5f47f3b49 100644 --- a/tools/slang-test/render-api-util.cpp +++ b/tools/slang-test/render-api-util.cpp @@ -1,7 +1,7 @@ - + #include "render-api-util.h" -#include "../../source/core/slang-defines.h" +#include "../../slang.h" #include "../../source/core/list.h" #include "../../source/core/slang-string-util.h" diff --git a/tools/slang-test/render-api-util.h b/tools/slang-test/render-api-util.h index eec447af9..a44528faf 100644 --- a/tools/slang-test/render-api-util.h +++ b/tools/slang-test/render-api-util.h @@ -1,9 +1,9 @@ -#ifndef SLANG_RENDER_API_UTIL_H +#ifndef SLANG_RENDER_API_UTIL_H #define SLANG_RENDER_API_UTIL_H #include "../../source/core/slang-string.h" -#include "../../source/core/slang-result.h" +#include "../../slang-com-helper.h" enum class RenderApiType { |