summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/hle/kernel/k_session_request.h31
-rw-r--r--src/video_core/texture_cache/format_lookup_table.cpp2
2 files changed, 17 insertions, 16 deletions
diff --git a/src/core/hle/kernel/k_session_request.h b/src/core/hle/kernel/k_session_request.h
index fcf521597..e5558bc2c 100644
--- a/src/core/hle/kernel/k_session_request.h
+++ b/src/core/hle/kernel/k_session_request.h
@@ -3,6 +3,8 @@
#pragma once
+#include <array>
+
#include "core/hle/kernel/k_auto_object.h"
#include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_memory_block.h"
@@ -52,8 +54,7 @@ public:
};
public:
- explicit SessionMappings(KernelCore& kernel_)
- : kernel(kernel_), m_mappings(nullptr), m_num_send(), m_num_recv(), m_num_exch() {}
+ explicit SessionMappings(KernelCore& kernel_) : kernel(kernel_) {}
void Initialize() {}
void Finalize();
@@ -149,17 +150,15 @@ public:
private:
KernelCore& kernel;
- Mapping m_static_mappings[NumStaticMappings];
- Mapping* m_mappings;
- u8 m_num_send;
- u8 m_num_recv;
- u8 m_num_exch;
+ std::array<Mapping, NumStaticMappings> m_static_mappings;
+ Mapping* m_mappings{};
+ u8 m_num_send{};
+ u8 m_num_recv{};
+ u8 m_num_exch{};
};
public:
- explicit KSessionRequest(KernelCore& kernel_)
- : KAutoObject(kernel_), m_mappings(kernel_), m_thread(nullptr), m_server(nullptr),
- m_event(nullptr) {}
+ explicit KSessionRequest(KernelCore& kernel_) : KAutoObject(kernel_), m_mappings(kernel_) {}
static KSessionRequest* Create(KernelCore& kernel) {
KSessionRequest* req = KSessionRequest::Allocate(kernel);
@@ -281,7 +280,7 @@ public:
private:
// NOTE: This is public and virtual in Nintendo's kernel.
- void Finalize() {
+ void Finalize() override {
m_mappings.Finalize();
if (m_thread) {
@@ -297,11 +296,11 @@ private:
private:
SessionMappings m_mappings;
- KThread* m_thread;
- KProcess* m_server;
- KEvent* m_event;
- uintptr_t m_address;
- size_t m_size;
+ KThread* m_thread{};
+ KProcess* m_server{};
+ KEvent* m_event{};
+ uintptr_t m_address{};
+ size_t m_size{};
};
} // namespace Kernel
diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp
index ad935d386..08aa8ca33 100644
--- a/src/video_core/texture_cache/format_lookup_table.cpp
+++ b/src/video_core/texture_cache/format_lookup_table.cpp
@@ -150,6 +150,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,
return PixelFormat::D24_UNORM_S8_UINT;
case Hash(TextureFormat::D32S8, FLOAT, UINT, UNORM, UNORM, LINEAR):
return PixelFormat::D32_FLOAT_S8_UINT;
+ case Hash(TextureFormat::R32_B24G8, FLOAT, UINT, UNORM, UNORM, LINEAR):
+ return PixelFormat::D32_FLOAT_S8_UINT;
case Hash(TextureFormat::BC1_RGBA, UNORM, LINEAR):
return PixelFormat::BC1_RGBA_UNORM;
case Hash(TextureFormat::BC1_RGBA, UNORM, SRGB):