Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14ea14cd1eb1
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ff26cff8f87
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 17, 2021

  1. DetectGPUFeatures: gracefully catch CL_PLATFORM_NOT_FOUND_KHR error

    @azonenberg
    azonenberg committed May 17, 2021
    Copy the full SHA
    6ff26cf View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 scopehal/scopehal.cpp
6 changes: 5 additions & 1 deletion scopehal/scopehal.cpp
View file
Original file line number Diff line number Diff line change
@@ -218,7 +218,11 @@ void DetectGPUFeatures()
}
catch(const cl::Error& e)
{
LogError("OpenCL error: %s (%d)\n", e.what(), e.err() );
//CL_PLATFORM_NOT_FOUND_KHR is an expected error if there's no GPU on the system
if( (string(e.what()) == "clGetPlatformIDs") && (e.err() == -1001) )
LogNotice("No platforms found, disabling OpenCL\n");
else
LogError("OpenCL error: %s (%d)\n", e.what(), e.err() );
delete g_clContext;
g_clContext = NULL;
return;