fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Misc] Replaced const with constexpr where possible

Browse Source
This commit is contained in:
Xphalnos
2025-04-04 22:36:05 +02:00
committed by Radosław Gliński
parent c4f1bf27ef
commit 47f327e848
42 changed files with 154 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/ui/d3d12/d3d12_util.cc
View File

@@ -17,9 +17,11 @@ namespace ui {
namespace d3d12 {
namespace util {
const D3D12_HEAP_PROPERTIES kHeapPropertiesDefault = {D3D12_HEAP_TYPE_DEFAULT};
const D3D12_HEAP_PROPERTIES kHeapPropertiesUpload = {D3D12_HEAP_TYPE_UPLOAD};
const D3D12_HEAP_PROPERTIES kHeapPropertiesReadback = {
constexpr D3D12_HEAP_PROPERTIES kHeapPropertiesDefault = {
D3D12_HEAP_TYPE_DEFAULT};
constexpr D3D12_HEAP_PROPERTIES kHeapPropertiesUpload = {
D3D12_HEAP_TYPE_UPLOAD};
constexpr D3D12_HEAP_PROPERTIES kHeapPropertiesReadback = {
D3D12_HEAP_TYPE_READBACK};
ID3D12RootSignature* CreateRootSignature(

4
src/xenia/ui/imgui_drawer.cc
View File

File diff suppressed because one or more lines are too long

4
src/xenia/ui/resources.h
View File

@@ -4599,7 +4599,7 @@ static constexpr uint8_t locked_achievement_icon_data[] = {
0x68, 0x68, 0x68, 0x68, 0x68, 0xec, 0x24, 0xfe, 0x07, 0x09, 0xfe, 0x9c,
0xfd, 0xaa, 0x0b, 0xa9, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};
static const uint32_t locked_achievement_icon_len = 3941;
static constexpr uint32_t locked_achievement_icon_len = 3941;
static const std::vector<std::pair<const uint8_t*, uint32_t>>
notification_icons = {
@@ -4610,5 +4610,5 @@ static const std::vector<std::pair<const uint8_t*, uint32_t>>
{player_any_notification_icon, player_any_notification_icon_len},
};
static const std::pair<const uint8_t*, uint32_t> locked_achievement_icon = {
static constexpr std::pair<const uint8_t*, uint32_t> locked_achievement_icon = {
locked_achievement_icon_data, locked_achievement_icon_len};

10
src/xenia/ui/vulkan/vulkan_presenter.cc
View File

@@ -1027,12 +1027,12 @@ VkSwapchainKHR VulkanPresenter::PaintContext::CreateSwapchainForVulkanSurface(
}
#if XE_PLATFORM_ANDROID
// Android uses R8G8B8A8.
static const VkFormat kFormat8888Primary = VK_FORMAT_R8G8B8A8_UNORM;
static const VkFormat kFormat8888Secondary = VK_FORMAT_B8G8R8A8_UNORM;
static constexpr VkFormat kFormat8888Primary = VK_FORMAT_R8G8B8A8_UNORM;
static constexpr VkFormat kFormat8888Secondary = VK_FORMAT_B8G8R8A8_UNORM;
#else
// GNU/Linux X11 and Windows DWM use B8G8R8A8.
static const VkFormat kFormat8888Primary = VK_FORMAT_B8G8R8A8_UNORM;
static const VkFormat kFormat8888Secondary = VK_FORMAT_R8G8B8A8_UNORM;
static constexpr VkFormat kFormat8888Primary = VK_FORMAT_B8G8R8A8_UNORM;
static constexpr VkFormat kFormat8888Secondary = VK_FORMAT_R8G8B8A8_UNORM;
#endif
VkSurfaceFormatKHR image_format;
if (surface_formats.empty() ||
@@ -2504,7 +2504,7 @@ VkPipeline VulkanPresenter::CreateGuestOutputPaintPipeline(
color_blend_state.attachmentCount = 1;
color_blend_state.pAttachments = &color_blend_attachment_state;
static const VkDynamicState kPipelineDynamicStates[] = {
static constexpr VkDynamicState kPipelineDynamicStates[] = {
VK_DYNAMIC_STATE_VIEWPORT,
VK_DYNAMIC_STATE_SCISSOR,
};

2
src/xenia/ui/window_android.cc
View File

@@ -163,7 +163,7 @@ bool AndroidWindow::OnActivitySurfaceMotionEvent(jobject event) {
event, jni_ids.motion_event_get_y, 0),
0.0f, float(GetActualPhysicalHeight())) +
0.5f);
static const MouseEvent::Button kMouseEventButtons[] = {
static constexpr MouseEvent::Button kMouseEventButtons[] = {
MouseEvent::Button::kLeft, MouseEvent::Button::kRight,
MouseEvent::Button::kMiddle, MouseEvent::Button::kX1,
MouseEvent::Button::kX2,