diff options
| author | skallweitNV <64953474+skallweitNV@users.noreply.github.com> | 2022-11-04 17:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 17:34:53 +0100 |
| commit | 015bde8d5a46f32979c00dbb1feb4b3d80729c44 (patch) | |
| tree | b95713bb080d0fbcb11d9b2519b9166e11fe5dde /tools/gfx/open-gl/render-gl.cpp | |
| parent | 9a3a4b08c8817905c2f608549c0e57216f8068c5 (diff) | |
Add AdapterLUID to identify GPU adapters (#2492)
* Add AdapterLUID to identify GPU adapters
* Remove adapter option in render-test
Diffstat (limited to 'tools/gfx/open-gl/render-gl.cpp')
| -rw-r--r-- | tools/gfx/open-gl/render-gl.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
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) |
