From 7537f415ce0fad3cdcf5f32549203794a15bcb40 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Mar 2023 10:43:27 +0200 Subject: [PATCH] - update comment on SSBOs. --- src/common/rendering/v_video.h | 6 ++---- src/maploader/specials.cpp | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/rendering/v_video.h b/src/common/rendering/v_video.h index 050094181..bb3c8bb4d 100644 --- a/src/common/rendering/v_video.h +++ b/src/common/rendering/v_video.h @@ -179,12 +179,10 @@ public: #endif } - // Hack alert: On Intel's GL driver SSBO's perform quite worse than UBOs. - // We only want to disable using SSBOs for lights but not disable the feature entirely. - // Note that using an uniform buffer here will limit the number of lights per surface so it isn't done for NVidia and AMD. + // SSBOs have quite worse performance for read only data, so keep this around only as long as Vulkan has not been adapted yet. bool useSSBO() { - return IsVulkan();// || ((hwcaps & RFL_SHADER_STORAGE_BUFFER) && allowSSBO() && !strstr(vendorstring, "Intel")); + return IsVulkan(); } virtual DCanvas* GetCanvas() { return nullptr; } diff --git a/src/maploader/specials.cpp b/src/maploader/specials.cpp index ce921fd07..117e266c9 100644 --- a/src/maploader/specials.cpp +++ b/src/maploader/specials.cpp @@ -794,6 +794,7 @@ void MapLoader::SpawnSpecials () // This also cannot consider lifts triggered by scripts etc. case Generic_Lift: if (line.args[3] != 1) continue; + [[fallthrough]]; case Plat_DownWaitUpStay: case Plat_DownWaitUpStayLip: case Plat_UpWaitDownStay: