diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-25 15:00:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 15:00:36 -0400 |
| commit | b5ca6352416995b5edd358623a6ae5db38d5e634 (patch) | |
| tree | 8fa30243c974a18565756956f77045e034a7524d /tools/gfx | |
| parent | c84e7c0fa526de51f380227a6667f723af36aea2 (diff) | |
Feature/uint int definition (#954)
* * Moved CPU determination macros to slang.h
* Determine SlangUInt/SlangInt from the pointer width (determined from CPU macros)
* Removed the UnambiguousInt and UnambigousUInt types - as a previous fragile work around
* Removed UInt/Int definition from smart-pointer.h as now in common.h
* * Remove ambiguity for PrettyWriter and ints
* Improve comment around SlangInt/UInt
* More fixes around ambiguity with PrettyWriter and integral types.
* Disable VK on OSX.
* Force CI to rebuild as spurious error.
Diffstat (limited to 'tools/gfx')
| -rw-r--r-- | tools/gfx/render.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/gfx/render.h b/tools/gfx/render.h index eebeaa170..c95652cd0 100644 --- a/tools/gfx/render.h +++ b/tools/gfx/render.h @@ -13,6 +13,8 @@ #include "../../source/core/list.h" #include "../../source/core/dictionary.h" +#include "../../slang.h" + namespace gfx { using Slang::RefObject; @@ -25,8 +27,8 @@ using Slang::List; typedef SlangResult Result; // Had to move here, because Options needs types defined here -typedef intptr_t Int; -typedef uintptr_t UInt; +typedef SlangInt Int; +typedef SlangUInt UInt; // pre declare types class Surface; |