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/gfx/open-gl/render-gl.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'tools/gfx/open-gl/render-gl.cpp') diff --git a/tools/gfx/open-gl/render-gl.cpp b/tools/gfx/open-gl/render-gl.cpp index f6fe5c9af..9167266e9 100644 --- a/tools/gfx/open-gl/render-gl.cpp +++ b/tools/gfx/open-gl/render-gl.cpp @@ -1367,7 +1367,7 @@ public: auto subObjectLayout = subObjectRange.layout; auto const& bindingRange = layout->getBindingRange(subObjectRange.bindingRangeIndex); - + switch (bindingRange.bindingType) { case slang::BindingType::ConstantBuffer: @@ -2039,16 +2039,9 @@ SLANG_NO_THROW Result SLANG_MCALL GLDevice::initialize(const Desc& desc) auto renderer = glGetString(GL_RENDERER); m_info.adapterName = (char*)renderer; - if (renderer && desc.adapter) + if (desc.adapterLUID) { - String lowerAdapter = String(desc.adapter).toLower(); - String lowerRenderer = String((const char*)renderer).toLower(); - - // The adapter is not available - if (lowerRenderer.indexOf(lowerAdapter) == Index(-1)) - { - return SLANG_E_NOT_AVAILABLE; - } + return SLANG_E_INVALID_ARG; } if (m_desc.nvapiExtnSlot >= 0) -- cgit v1.2.3