From 015bde8d5a46f32979c00dbb1feb4b3d80729c44 Mon Sep 17 00:00:00 2001
From: skallweitNV <64953474+skallweitNV@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:34:53 +0100
Subject: Add AdapterLUID to identify GPU adapters (#2492)

* Add AdapterLUID to identify GPU adapters

* Remove adapter option in render-test
---
 tools/render-test/options.cpp          | 4 ----
 tools/render-test/options.h            | 2 --
 tools/render-test/render-test-main.cpp | 5 -----
 3 files changed, 11 deletions(-)

(limited to 'tools/render-test')

diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index a4a643e22..ef15346c6 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -153,10 +153,6 @@ static gfx::DeviceType _toRenderType(Slang::RenderApiType apiType)
         {
             outOptions.performanceProfile = true;
         }
-        else if (argValue == "-adapter")
-        {
-            SLANG_RETURN_ON_FAIL(reader.expectArg(outOptions.adapter));
-        }
         else if (argValue == "-output-using-type")
         {
             outOptions.outputUsingType = true;
diff --git a/tools/render-test/options.h b/tools/render-test/options.h
index f41614360..22b14c862 100644
--- a/tools/render-test/options.h
+++ b/tools/render-test/options.h
@@ -65,8 +65,6 @@ struct Options
 
     Slang::List<Slang::String> renderFeatures;          /// Required render features for this test to run
 
-    Slang::String adapter;                              ///< The adapter to use either name or index
-
     uint32_t computeDispatchSize[3] = { 1, 1, 1 };
 
     Slang::String nvapiExtnSlot;                               ///< The nvapiRegister to use.
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index 16b47a001..805f08d10 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -1266,10 +1266,6 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi
     StringBuilder rendererName;
     auto info = 
     rendererName << "[" << gfxGetDeviceTypeName(options.deviceType) << "] ";
-    if (options.adapter.getLength())
-    {
-        rendererName << "'" << options.adapter << "'";
-    }
 
     if (options.onlyStartup)
     {
@@ -1318,7 +1314,6 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi
     {
         IDevice::Desc desc = {};
         desc.deviceType = options.deviceType;
-        desc.adapter = options.adapter.getBuffer();
 
         desc.slang.lineDirectiveMode = SLANG_LINE_DIRECTIVE_MODE_NONE;
         if (options.generateSPIRVDirectly)
-- 
cgit v1.2.3