From b5ca6352416995b5edd358623a6ae5db38d5e634 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 25 Apr 2019 15:00:36 -0400
Subject: 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.
---
 tools/gfx/render.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools/gfx')

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;
-- 
cgit v1.2.3