Updates

Author: nums11

Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json

@@ -89,8 +89,8 @@
       "Description": "The sample showcases how to create and bind OrtValue objects from ID3D12 Resources using the ONNX Runtime C-API.",
       "Icon": "\uE155",
       "Tag": "DXResourceBindingORT",
-      "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/AdapterSelection/AdapterSelection.xaml",
-      "CSharpGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/AdapterSelection/AdapterSelection.xaml.cs",
+      "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/DXResourceBindingORT/DXResourceBindingORT.xaml",
+      "CSharpGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/DXResourceBindingORT/DXResourceBindingORT.xaml.cs",
       "Docs": [],
       "IsRecentlyAdded": true
     }

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/D3D12Quad.cpp

@@ -38,7 +38,7 @@ void D3D12Quad::OnInit()
     updateCounter = 0;
     LoadPipeline();
     LoadAssets();
-    is_initialized = true;
+    initializationSemaphore.release();
     copy_texture = false;
 }
 
@@ -592,22 +592,38 @@ WICPixelFormatGUID D3D12Quad::GetConvertToWICFormat(WICPixelFormatGUID wicFormat
 // get the number of bits per pixel for a dxgi format
 int D3D12Quad::GetDXGIFormatBitsPerPixel(DXGI_FORMAT dxgiFormat)
 {
-    if (dxgiFormat == DXGI_FORMAT_R32G32B32A32_FLOAT) return 128;
-    else if (dxgiFormat == DXGI_FORMAT_R16G16B16A16_FLOAT) return 64;
-    else if (dxgiFormat == DXGI_FORMAT_R16G16B16A16_UNORM) return 64;
-    else if (dxgiFormat == DXGI_FORMAT_R8G8B8A8_UNORM) return 32;
-    else if (dxgiFormat == DXGI_FORMAT_B8G8R8A8_UNORM) return 32;
-    else if (dxgiFormat == DXGI_FORMAT_B8G8R8X8_UNORM) return 32;
-    else if (dxgiFormat == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM) return 32;
-
-    else if (dxgiFormat == DXGI_FORMAT_R10G10B10A2_UNORM) return 32;
-    else if (dxgiFormat == DXGI_FORMAT_B5G5R5A1_UNORM) return 16;
-    else if (dxgiFormat == DXGI_FORMAT_B5G6R5_UNORM) return 16;
-    else if (dxgiFormat == DXGI_FORMAT_R32_FLOAT) return 32;
-    else if (dxgiFormat == DXGI_FORMAT_R16_FLOAT) return 16;
-    else if (dxgiFormat == DXGI_FORMAT_R16_UNORM) return 16;
-    else if (dxgiFormat == DXGI_FORMAT_R8_UNORM) return 8;
-    else if (dxgiFormat == DXGI_FORMAT_A8_UNORM) return 8;
+    switch (dxgiFormat) {
+    case DXGI_FORMAT_R32G32B32A32_FLOAT:
+        return 128;
+    case DXGI_FORMAT_R16G16B16A16_FLOAT:
+        return 64;
+    case DXGI_FORMAT_R16G16B16A16_UNORM:
+        return 64;
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+        return 32;
+    case DXGI_FORMAT_B8G8R8A8_UNORM:
+        return 32;
+    case DXGI_FORMAT_B8G8R8X8_UNORM:
+        return 32;
+    case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
+        return 32;
+    case DXGI_FORMAT_R10G10B10A2_UNORM:
+        return 32;
+    case DXGI_FORMAT_B5G5R5A1_UNORM:
+        return 16;
+    case DXGI_FORMAT_B5G6R5_UNORM:
+        return 16;
+    case DXGI_FORMAT_R32_FLOAT:
+        return 32;
+    case DXGI_FORMAT_R16_FLOAT:
+        return 16;
+    case DXGI_FORMAT_R16_UNORM:
+        return 16;
+    case DXGI_FORMAT_R8_UNORM:
+        return 8;
+    case DXGI_FORMAT_A8_UNORM:
+        return 8;
+    }
 }
 
 // load and decode image from file, returning the number of image bytes

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/D3D12Quad.h

@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include <wincodec.h>
+#include <semaphore>
 
 using namespace DirectX;
 using Microsoft::WRL::ComPtr;
@@ -24,8 +25,7 @@ class D3D12Quad
     ComPtr<ID3D12Resource> GetCurrentBuffer();
     void ShowNextImage();
 
-    bool is_initialized = false;
-
+    std::binary_semaphore initializationSemaphore{ 0 };
 
 private:
     static const UINT FrameCount = 2;
@@ -76,11 +76,11 @@ class D3D12Quad
 
     ComPtr<ID3D12Resource> textureBuffer; // the resource heap containing our texture
 
-    int LoadImageDataFromFile(BYTE** imageData, D3D12_RESOURCE_DESC& resourceDescription, LPCWSTR filename, int& bytesPerRow);
+    static int LoadImageDataFromFile(BYTE** imageData, D3D12_RESOURCE_DESC& resourceDescription, LPCWSTR filename, int& bytesPerRow);
 
-    DXGI_FORMAT GetDXGIFormatFromWICFormat(WICPixelFormatGUID wicFormatGUID);
-    WICPixelFormatGUID GetConvertToWICFormat(WICPixelFormatGUID wicFormatGUID);
-    int GetDXGIFormatBitsPerPixel(DXGI_FORMAT dxgiFormat);
+    static DXGI_FORMAT GetDXGIFormatFromWICFormat(WICPixelFormatGUID wicFormatGUID);
+    static WICPixelFormatGUID GetConvertToWICFormat(WICPixelFormatGUID wicFormatGUID);
+    static int GetDXGIFormatBitsPerPixel(DXGI_FORMAT dxgiFormat);
     void LoadImageTexture();
     void Reset();
     void ThrowIfFailed(HRESULT hr);

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/DXResourceBinding.cpp

@@ -26,7 +26,7 @@ namespace winrt::WinMLSamplesGalleryNative::implementation
         std::jthread d3d_th(Win32Application::Run, &sample, 10);
 
         // Wait until the D3D pipeline finishes
-        while (!sample.is_initialized) {}
+        sample.initializationSemaphore.acquire();
 
         // Detach the thread so it doesn't block the UI
         d3d_th.detach();

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Win32Application.cpp

@@ -148,7 +148,7 @@ std::wstring Win32Application::GetAssetPath(LPCWSTR assetName)
     UINT modulePathSize = std::size(modulePath);
     GetModuleFileName(nullptr, modulePath, modulePathSize);
 
-    const wchar_t* gallery = L"WinMLSamplesGallery";
+    constexpr std::wstring_view gallery = L"WinMLSamplesGallery";
     UINT gallerySize = 19; // length of the gallery string
 
     // Erase everything after the first occurence of the gallery string
@@ -157,7 +157,7 @@ std::wstring Win32Application::GetAssetPath(LPCWSTR assetName)
     assert(offset != std::string::npos);
     path.erase(path.begin() + offset + gallerySize, path.end());
 
-    std::wstring native = L"\\WinMLSamplesGalleryNative\\";
-    path = path + native + assetName;
+    std::wstring_view galleryPathNative = L"\\WinMLSamplesGalleryNative\\";
+    path = path + galleryPathNative.data() + assetName;
     return path;
 }

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj

@@ -112,10 +112,6 @@
     <UseOpenCV>False</UseOpenCV>
     <UseOpenCV Condition="Exists('$(OpenCVLibFullPath)')">True</UseOpenCV>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.19041.0\um;C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.19041.0\shared;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Program Files %28x86%29\Windows Kits\10\Lib\10.0.19041.0\um\x64;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="$(UseOpenCV)">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\build\external\opencv\cmake_config\$(PlatformString)\install\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>