diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-26 10:33:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 10:33:28 -0400 |
| commit | d3da1e6517fe27670b6c2d713d144872d55057d8 (patch) | |
| tree | ab5c72b17b15185ec40945c5ba29400569b50630 /src/video_core/query_cache.h | |
| parent | 6ffcc3d5d2aac8e095aed138d4113a384a35f50e (diff) | |
| parent | d7c532d8894ce806c9af13b8dd3eec975642b348 (diff) | |
Merge pull request #10990 from comex/ubsan
Fixes and workarounds to make UBSan happier on macOS
Diffstat (limited to 'src/video_core/query_cache.h')
| -rw-r--r-- | src/video_core/query_cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 1528cc1dd..7047e2e63 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -103,7 +103,9 @@ public: explicit QueryCacheBase(VideoCore::RasterizerInterface& rasterizer_, Core::Memory::Memory& cpu_memory_) : rasterizer{rasterizer_}, - cpu_memory{cpu_memory_}, streams{{CounterStream{static_cast<QueryCache&>(*this), + // Use reinterpret_cast instead of static_cast as workaround for + // UBSan bug (https://github.com/llvm/llvm-project/issues/59060) + cpu_memory{cpu_memory_}, streams{{CounterStream{reinterpret_cast<QueryCache&>(*this), VideoCore::QueryType::SamplesPassed}}} { (void)slot_async_jobs.insert(); // Null value } |