early-access version 3404

src/video_core/engines/maxwell_3d.cpp

@@ -259,7 +259,7 @@ u32 Maxwell3D::GetMaxCurrentVertices() {
 size_t Maxwell3D::EstimateIndexBufferSize() {
     GPUVAddr start_address = regs.index_buffer.StartAddress();
     GPUVAddr end_address = regs.index_buffer.EndAddress();
-    constexpr std::array<size_t, 4> max_sizes = {
+    static constexpr std::array<size_t, 4> max_sizes = {
         std::numeric_limits<u8>::max(), std::numeric_limits<u16>::max(),
         std::numeric_limits<u32>::max(), std::numeric_limits<u32>::max()};
     const size_t byte_size = regs.index_buffer.FormatSizeInBytes();

src/video_core/memory_manager.h

@@ -216,7 +216,7 @@ private:
     std::vector<u64> big_page_continous;
     std::vector<std::pair<VAddr, std::size_t>> page_stash{};
 
-    constexpr static size_t continous_bits = 64;
+    static constexpr size_t continous_bits = 64;
 
     const size_t unique_identifier;
     std::unique_ptr<VideoCommon::InvalidationAccumulator> accumulator;

src/video_core/renderer_vulkan/vk_smaa.cpp

@@ -468,7 +468,7 @@ VkWriteDescriptorSet CreateWriteDescriptorSet(std::vector<VkDescriptorImageInfo>
 }
 
 void ClearColorImage(vk::CommandBuffer& cmdbuf, VkImage image) {
-    constexpr std::array<VkImageSubresourceRange, 1> subresources{{{
+    static constexpr std::array<VkImageSubresourceRange, 1> subresources{{{
         .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
         .baseMipLevel = 0,
         .levelCount = 1,
@@ -528,8 +528,8 @@ SMAA::SMAA(const Device& device, MemoryAllocator& allocator, size_t image_count,
 }
 
 void SMAA::CreateImages() {
-    constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT};
-    constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT};
+    static constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT};
+    static constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT};
 
     std::tie(m_static_images[Area], m_static_buffer_commits[Area]) =
         CreateWrappedImage(m_device, m_allocator, area_extent, VK_FORMAT_R8G8_UNORM);
@@ -586,12 +586,12 @@ void SMAA::CreateSampler() {
 
 void SMAA::CreateShaders() {
     // These match the order of the SMAAStage enum
-    constexpr std::array vert_shader_sources{
+    static constexpr std::array vert_shader_sources{
         ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_VERT_SPV),
         ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_VERT_SPV),
         ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_VERT_SPV),
     };
-    constexpr std::array frag_shader_sources{
+    static constexpr std::array frag_shader_sources{
         ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_FRAG_SPV),
         ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_FRAG_SPV),
         ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_FRAG_SPV),
@@ -675,8 +675,8 @@ void SMAA::UploadImages(Scheduler& scheduler) {
         return;
     }
 
-    constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT};
-    constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT};
+    static constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT};
+    static constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT};
 
     UploadImage(m_device, m_allocator, scheduler, m_static_images[Area], area_extent,
                 VK_FORMAT_R8G8_UNORM, ARRAY_TO_SPAN(areaTexBytes));

src/video_core/renderer_vulkan/vk_texture_cache.h

@@ -113,7 +113,7 @@ public:
     std::optional<ASTCDecoderPass> astc_decoder_pass;
     const Settings::ResolutionScalingInfo& resolution;
 
-    constexpr static size_t indexing_slots = 8 * sizeof(size_t);
+    static constexpr size_t indexing_slots = 8 * sizeof(size_t);
     std::array<vk::Buffer, indexing_slots> buffers{};
     std::array<std::unique_ptr<MemoryCommit>, indexing_slots> buffer_commits{};
 };

src/video_core/renderer_vulkan/vk_turbo_mode.cpp

@@ -48,7 +48,7 @@ void TurboMode::Run(std::stop_token stop_token) {
     auto commit = m_allocator.Commit(buffer, MemoryUsage::DeviceLocal);
 
     // Create the descriptor pool to contain our descriptor.
-    constexpr VkDescriptorPoolSize pool_size{
+    static constexpr VkDescriptorPoolSize pool_size{
         .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
         .descriptorCount = 1,
     };
@@ -63,7 +63,7 @@ void TurboMode::Run(std::stop_token stop_token) {
     });
 
     // Create the descriptor set layout from the pool.
-    constexpr VkDescriptorSetLayoutBinding layout_binding{
+    static constexpr VkDescriptorSetLayoutBinding layout_binding{
         .binding = 0,
         .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
         .descriptorCount = 1,

src/video_core/textures/decoders.cpp

@@ -29,7 +29,7 @@ constexpr u32 pdep(u32 value) {
 
 template <u32 mask, u32 incr_amount>
 void incrpdep(u32& value) {
-    constexpr u32 swizzled_incr = pdep<mask>(incr_amount);
+    static constexpr u32 swizzled_incr = pdep<mask>(incr_amount);
     value = ((value | ~mask) + swizzled_incr) & mask;
 }