From a294546bcc7c883edd113f2c80d7f278ff8219ed Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Thu, 29 Nov 2018 22:45:16 -0800
Subject: Improved type safety of flag enums

---
 TextureLoader/include/DDSLoader.h       |  6 +++---
 TextureLoader/interface/TextureLoader.h |  6 +++---
 TextureLoader/src/DDSLoader.cpp         | 20 ++++++++++----------
 TextureLoader/src/TextureLoader.cpp     |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'TextureLoader')

diff --git a/TextureLoader/include/DDSLoader.h b/TextureLoader/include/DDSLoader.h
index 242d856..792c97b 100644
--- a/TextureLoader/include/DDSLoader.h
+++ b/TextureLoader/include/DDSLoader.h
@@ -63,9 +63,9 @@ void CreateDDSTextureFromMemoryEx(
     size_t maxsize,
     Diligent::USAGE usage,
     const char* name,
-    unsigned int bindFlags,
-    unsigned int cpuAccessFlags,
-    unsigned int miscFlags,
+    Diligent::BIND_FLAGS bindFlags,
+    Diligent::CPU_ACCESS_FLAGS cpuAccessFlags,
+    Diligent::MISC_TEXTURE_FLAGS miscFlags,
     bool forceSRGB,
     Diligent::ITexture** texture/*,
     D2D1_ALPHA_MODE* alphaMode*/
diff --git a/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h
index 3cb1d24..49b01d0 100644
--- a/TextureLoader/interface/TextureLoader.h
+++ b/TextureLoader/interface/TextureLoader.h
@@ -40,13 +40,13 @@ namespace Diligent
         USAGE Usage;
 
         /// Bind flags
-        Uint32 BindFlags;
+        BIND_FLAGS BindFlags;
 
         /// Number of mip levels
         Uint32 MipLevels;
 
         /// CPU access flags
-        Uint32 CPUAccessFlags;
+        CPU_ACCESS_FLAGS CPUAccessFlags;
 
         /// Flag indicating if this texture uses sRGB gamma encoding
         Bool IsSRGB;
@@ -62,7 +62,7 @@ namespace Diligent
             Usage( USAGE_STATIC ),
             BindFlags( BIND_SHADER_RESOURCE ),
             MipLevels(0),
-            CPUAccessFlags(0),
+            CPUAccessFlags(CPU_ACCESS_NONE),
             IsSRGB(false),
             GenerateMips(true),
             Format(TEX_FORMAT_UNKNOWN)
diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp
index 4f30fd9..d347433 100644
--- a/TextureLoader/src/DDSLoader.cpp
+++ b/TextureLoader/src/DDSLoader.cpp
@@ -932,9 +932,9 @@ static void CreateTexture(
     _In_ DXGI_FORMAT format,
     _In_ USAGE usage,
     _In_ const char *name,
-    _In_ unsigned int bindFlags,
-    _In_ unsigned int cpuAccessFlags,
-    _In_ unsigned int miscFlags,
+    _In_ BIND_FLAGS bindFlags,
+    _In_ CPU_ACCESS_FLAGS cpuAccessFlags,
+    _In_ MISC_TEXTURE_FLAGS miscFlags,
     _In_ bool forceSRGB,
     _In_ bool isCubeMap,
     _In_ TextureSubResData* initData,
@@ -1154,9 +1154,9 @@ static void CreateTextureFromDDS(
     _In_ size_t maxsize,
     _In_ USAGE usage,
     _In_ const char *name,
-    _In_ unsigned int bindFlags,
-    _In_ unsigned int cpuAccessFlags,
-    _In_ unsigned int miscFlags,
+    _In_ BIND_FLAGS bindFlags,
+    _In_ CPU_ACCESS_FLAGS cpuAccessFlags,
+    _In_ MISC_TEXTURE_FLAGS miscFlags,
     _In_ bool forceSRGB,
     _Outptr_opt_ ITexture** texture
     )
@@ -1411,7 +1411,7 @@ void CreateDDSTextureFromMemory(
     /*D2D1_ALPHA_MODE* alphaMode,*/
     const char* name)
 {
-    return CreateDDSTextureFromMemoryEx(pDevice, ddsData, ddsDataSize, maxsize, USAGE_DEFAULT, name, BIND_SHADER_RESOURCE, 0, 0, false, texture/*, alphaMode*/);
+    return CreateDDSTextureFromMemoryEx(pDevice, ddsData, ddsDataSize, maxsize, USAGE_DEFAULT, name, BIND_SHADER_RESOURCE, CPU_ACCESS_NONE, MISC_TEXTURE_FLAG_NONE, false, texture/*, alphaMode*/);
 }
 
 
@@ -1423,9 +1423,9 @@ void CreateDDSTextureFromMemoryEx(
     size_t maxsize,
     USAGE usage,
     const char *name,
-    unsigned int bindFlags,
-    unsigned int cpuAccessFlags,
-    unsigned int miscFlags,
+    BIND_FLAGS bindFlags,
+    CPU_ACCESS_FLAGS cpuAccessFlags,
+    MISC_TEXTURE_FLAGS miscFlags,
     bool forceSRGB,
     ITexture** texture/*,
     D2D1_ALPHA_MODE* alphaMode*/
diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp
index 9a660fd..7fc9a40 100644
--- a/TextureLoader/src/TextureLoader.cpp
+++ b/TextureLoader/src/TextureLoader.cpp
@@ -249,7 +249,7 @@ namespace Diligent
                                      TexLoadInfo.Name,
                                      TexLoadInfo.BindFlags,
                                      TexLoadInfo.CPUAccessFlags,
-                                     0, // miscFlags
+                                     MISC_TEXTURE_FLAG_NONE, // miscFlags
                                      TexLoadInfo.IsSRGB, // forceSRGB
                                      ppTexture );
     }
-- 
cgit v1.2.3