From 79e92395f8ce3d92c446e3bb3250d19ce33decd5 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 16 Apr 2021 10:34:26 -0700
Subject: Update `model-viewer` example and fixing compiler bugs. (#1795)

---
 tools/platform/model.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'tools/platform/model.h')

diff --git a/tools/platform/model.h b/tools/platform/model.h
index 8cff2c67d..b4aff9273 100644
--- a/tools/platform/model.h
+++ b/tools/platform/model.h
@@ -7,7 +7,9 @@
 #include <vector>
 #include <string>
 
-namespace gfx {
+#include "platform-api.h"
+
+namespace platform {
 
 struct ModelLoader
 {
@@ -17,7 +19,7 @@ struct ModelLoader
         glm::vec3                   specularColor;
         float                       specularity;
 
-        ComPtr<ITextureResource>     diffuseMap;
+        Slang::ComPtr<gfx::ITextureResource>     diffuseMap;
     };
 
     struct Vertex
@@ -39,9 +41,9 @@ struct ModelLoader
 
     struct ModelData
     {
-        ComPtr<IBufferResource> vertexBuffer;
-        ComPtr<IBufferResource> indexBuffer;
-        PrimitiveTopology       primitiveTopology;
+        Slang::ComPtr<gfx::IBufferResource> vertexBuffer;
+        Slang::ComPtr<gfx::IBufferResource> indexBuffer;
+        gfx::PrimitiveTopology       primitiveTopology;
         int                     vertexCount;
         int                     indexCount;
         int                     meshCount;
@@ -65,12 +67,12 @@ struct ModelLoader
         FlipWinding = 1 << 0,
     };
 
-    ICallbacks*              callbacks = nullptr;
-    Slang::ComPtr<IDevice> device;
-    LoadFlags                loadFlags = 0;
-    float                    scale = 1.0f;
+    ICallbacks* callbacks = nullptr;
+    gfx::IDevice* device;
+    LoadFlags loadFlags = 0;
+    float scale = 1.0f;
 
-    Result load(char const* inputPath, void** outModel);
+    SLANG_PLATFORM_API SlangResult load(char const* inputPath, void** outModel);
 };
 
 
-- 
cgit v1.2.3