From d8430c39df979a29082e93c4814baa0b53997c51 Mon Sep 17 00:00:00 2001 From: Erin Maus Date: Fri, 24 Jul 2026 08:06:52 -0400 Subject: [PATCH] Respond to PR feedback. --- src/modules/graphics/Graphics.cpp | 1 - src/modules/graphics/Graphics.h | 1 - src/modules/graphics/metal/Graphics.mm | 5 +---- src/modules/graphics/opengl/Graphics.cpp | 3 +-- src/modules/graphics/vulkan/Graphics.cpp | 3 +-- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 870eb8a7f..50930f11c 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -2990,7 +2990,6 @@ STRINGMAP_CLASS_BEGIN(Graphics, Graphics::Feature, Graphics::FEATURE_MAX_ENUM, f { "indirectdraw", Graphics::FEATURE_INDIRECT_DRAW }, { "vertexwrite", Graphics::FEATURE_VERTEX_WRITE }, { "pixelwrite", Graphics::FEATURE_PIXEL_WRITE }, - { "imageatomics", Graphics::FEATURE_IMAGE_ATOMICS }, } STRINGMAP_CLASS_END(Graphics, Graphics::Feature, Graphics::FEATURE_MAX_ENUM, feature) diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index 83c1abbf6..0ef90b8b3 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -165,7 +165,6 @@ public: FEATURE_INDIRECT_DRAW, FEATURE_VERTEX_WRITE, FEATURE_PIXEL_WRITE, - FEATURE_IMAGE_ATOMICS, FEATURE_MAX_ENUM }; diff --git a/src/modules/graphics/metal/Graphics.mm b/src/modules/graphics/metal/Graphics.mm index 338ed5b6f..fdbeefbe3 100644 --- a/src/modules/graphics/metal/Graphics.mm +++ b/src/modules/graphics/metal/Graphics.mm @@ -2263,11 +2263,8 @@ void Graphics::initCapabilities() capabilities.features[FEATURE_VERTEX_WRITE] = false; capabilities.features[FEATURE_PIXEL_WRITE] = false; } - - // Not supported until Metal 3 - capabilities.features[FEATURE_IMAGE_ATOMICS] = false; - static_assert(FEATURE_MAX_ENUM == 16, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); + static_assert(FEATURE_MAX_ENUM == 15, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); // https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf capabilities.limits[LIMIT_POINT_SIZE] = 511; diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index b5ce4cd2d..4baa7b9e3 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -1634,8 +1634,7 @@ void Graphics::initCapabilities() capabilities.features[FEATURE_INDIRECT_DRAW] = capabilities.features[FEATURE_GLSL4]; capabilities.features[FEATURE_VERTEX_WRITE] = capabilities.features[FEATURE_GLSL4]; capabilities.features[FEATURE_PIXEL_WRITE] = capabilities.features[FEATURE_GLSL4]; - capabilities.features[FEATURE_IMAGE_ATOMICS] = capabilities.features[FEATURE_GLSL4]; - static_assert(FEATURE_MAX_ENUM == 16, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); + static_assert(FEATURE_MAX_ENUM == 15, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); capabilities.limits[LIMIT_POINT_SIZE] = gl.getMaxPointSize(); capabilities.limits[LIMIT_TEXTURE_SIZE] = gl.getMax2DTextureSize(); diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp index b59ca081b..854832de0 100644 --- a/src/modules/graphics/vulkan/Graphics.cpp +++ b/src/modules/graphics/vulkan/Graphics.cpp @@ -838,8 +838,7 @@ void Graphics::initCapabilities() capabilities.features[FEATURE_INDIRECT_DRAW] = true; capabilities.features[FEATURE_VERTEX_WRITE] = features.vertexPipelineStoresAndAtomics; capabilities.features[FEATURE_PIXEL_WRITE] = features.fragmentStoresAndAtomics; - capabilities.features[FEATURE_IMAGE_ATOMICS] = true; - static_assert(FEATURE_MAX_ENUM == 16, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); + static_assert(FEATURE_MAX_ENUM == 15, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); VkPhysicalDeviceProperties properties; vkGetPhysicalDeviceProperties(physicalDevice, &properties);