Revert "video_out: HDR support (shadps4-emu#2381)"

This reverts commit 8f2883a.

Author: LlysiX

src/common/config.cpp

@@ -31,7 +31,6 @@ std::filesystem::path find_fs_path_or(const basic_value<TC>& v, const K& ky,
 
 namespace Config {
 
-static bool isHDRAllowed = false;
 static bool isNeo = false;
 static bool isFullscreen = false;
 static std::string fullscreenMode = "borderless";
@@ -102,10 +101,6 @@ static bool showBackgroundImage = true;
 // Language
 u32 m_language = 1; // english
 
-bool allowHDR() {
-    return isHDRAllowed;
-}
-
 bool GetUseUnifiedInputConfig() {
     return useUnifiedInputConfig;
 }
@@ -656,7 +651,6 @@ void load(const std::filesystem::path& path) {
     if (data.contains("General")) {
         const toml::value& general = data.at("General");
 
-        isHDRAllowed = toml::find_or<bool>(general, "allowHDR", false);
         isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
         isFullscreen = toml::find_or<bool>(general, "Fullscreen", false);
         fullscreenMode = toml::find_or<std::string>(general, "FullscreenMode", "borderless");
@@ -792,7 +786,6 @@ void save(const std::filesystem::path& path) {
         fmt::print("Saving new configuration file {}\n", fmt::UTF(path.u8string()));
     }
 
-    data["General"]["allowHDR"] = isHDRAllowed;
     data["General"]["isPS4Pro"] = isNeo;
     data["General"]["Fullscreen"] = isFullscreen;
     data["General"]["FullscreenMode"] = fullscreenMode;
@@ -901,7 +894,6 @@ void saveMainWindow(const std::filesystem::path& path) {
 }
 
 void setDefaultValues() {
-    isHDRAllowed = false;
     isNeo = false;
     isFullscreen = false;
     isTrophyPopupDisabled = false;

src/common/config.h

@@ -51,7 +51,6 @@ void SetUseUnifiedInputConfig(bool use);
 u32 getScreenWidth();
 u32 getScreenHeight();
 s32 getGpuId();
-bool allowHDR();
 
 bool debugDump();
 bool collectShadersForDebug();

src/core/libraries/videoout/driver.h

@@ -18,6 +18,7 @@ struct Frame;
 namespace Libraries::VideoOut {
 
 struct VideoOutPort {
+    bool is_open = false;
     SceVideoOutResolutionStatus resolution;
     std::array<VideoOutBuffer, MaxDisplayBuffers> buffer_slots;
     std::array<u64, MaxDisplayBuffers> buffer_labels; // should be contiguous in memory
@@ -32,8 +33,6 @@ struct VideoOutPort {
     std::condition_variable vo_cv;
     std::condition_variable vblank_cv;
     int flip_rate = 0;
-    bool is_open = false;
-    bool is_mode_changing = false; // Used to prevent flip during mode change
 
     s32 FindFreeGroup() const {
         s32 index = 0;

src/core/libraries/videoout/video_out.cpp

@@ -3,7 +3,6 @@
 
 #include "common/assert.h"
 #include "common/config.h"
-#include "common/elf_info.h"
 #include "common/logging/log.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/system/userservice.h"
@@ -316,12 +315,6 @@ s32 sceVideoOutSubmitEopFlip(s32 handle, u32 buf_id, u32 mode, u32 arg, void** u
 s32 PS4_SYSV_ABI sceVideoOutGetDeviceCapabilityInfo(
     s32 handle, SceVideoOutDeviceCapabilityInfo* pDeviceCapabilityInfo) {
     pDeviceCapabilityInfo->capability = 0;
-    if (presenter->IsHDRSupported()) {
-        auto& game_info = Common::ElfInfo::Instance();
-        if (game_info.GetPSFAttributes().support_hdr) {
-            pDeviceCapabilityInfo->capability |= ORBIS_VIDEO_OUT_DEVICE_CAPABILITY_BT2020_PQ;
-        }
-    }
     return ORBIS_OK;
 }
 
@@ -359,49 +352,6 @@ s32 PS4_SYSV_ABI sceVideoOutAdjustColor(s32 handle, const SceVideoOutColorSettin
     return ORBIS_OK;
 }
 
-struct Mode {
-    u32 size;
-    u8 encoding;
-    u8 range;
-    u8 colorimetry;
-    u8 depth;
-    u64 refresh_rate;
-    u64 resolution;
-    u8 reserved[8];
-};
-
-void PS4_SYSV_ABI sceVideoOutModeSetAny_(Mode* mode, u32 size) {
-    std::memset(mode, 0xff, size);
-    mode->size = size;
-}
-
-s32 PS4_SYSV_ABI sceVideoOutConfigureOutputMode_(s32 handle, u32 reserved, const Mode* mode,
-                                                 const void* options, u32 size_mode,
-                                                 u32 size_options) {
-    auto* port = driver->GetPort(handle);
-    if (!port) {
-        return ORBIS_VIDEO_OUT_ERROR_INVALID_HANDLE;
-    }
-
-    if (reserved != 0) {
-        return ORBIS_VIDEO_OUT_ERROR_INVALID_VALUE;
-    }
-
-    if (mode->colorimetry != OrbisVideoOutColorimetry::Any) {
-        auto& game_info = Common::ElfInfo::Instance();
-        if (mode->colorimetry == OrbisVideoOutColorimetry::Bt2020PQ &&
-            game_info.GetPSFAttributes().support_hdr) {
-            port->is_mode_changing = true;
-            presenter->SetHDR(true);
-            port->is_mode_changing = false;
-        } else {
-            return ORBIS_VIDEO_OUT_ERROR_INVALID_VALUE;
-        }
-    }
-
-    return ORBIS_OK;
-}
-
 void RegisterLib(Core::Loader::SymbolsResolver* sym) {
     driver = std::make_unique<VideoOutDriver>(Config::getScreenWidth(), Config::getScreenHeight());
 
@@ -440,10 +390,6 @@ void RegisterLib(Core::Loader::SymbolsResolver* sym) {
                  sceVideoOutAdjustColor);
     LIB_FUNCTION("-Ozn0F1AFRg", "libSceVideoOut", 1, "libSceVideoOut", 0, 0,
                  sceVideoOutDeleteFlipEvent);
-    LIB_FUNCTION("pjkDsgxli6c", "libSceVideoOut", 1, "libSceVideoOut", 0, 0,
-                 sceVideoOutModeSetAny_);
-    LIB_FUNCTION("N1bEoJ4SRw4", "libSceVideoOut", 1, "libSceVideoOut", 0, 0,
-                 sceVideoOutConfigureOutputMode_);
 
     // openOrbis appears to have libSceVideoOut_v1 module libSceVideoOut_v1.1
     LIB_FUNCTION("Up36PTk687E", "libSceVideoOut", 1, "libSceVideoOut", 1, 1, sceVideoOutOpen);

src/core/libraries/videoout/video_out.h

@@ -40,13 +40,6 @@ constexpr int SCE_VIDEO_OUT_BUFFER_ATTRIBUTE_OPTION_NONE = 0;
 constexpr int SCE_VIDEO_OUT_BUFFER_ATTRIBUTE_OPTION_VR = 7;
 constexpr int SCE_VIDEO_OUT_BUFFER_ATTRIBUTE_OPTION_STRICT_COLORIMETRY = 8;
 
-constexpr int ORBIS_VIDEO_OUT_DEVICE_CAPABILITY_BT2020_PQ = 0x80;
-
-enum OrbisVideoOutColorimetry : u8 {
-    Bt2020PQ = 12,
-    Any = 0xFF,
-};
-
 enum class OrbisVideoOutEventId : s16 {
     Flip = 0,
     Vblank = 1,

src/imgui/renderer/imgui_core.cpp

@@ -118,10 +118,6 @@ void OnResize() {
     Sdl::OnResize();
 }
 
-void OnSurfaceFormatChange(vk::Format surface_format) {
-    Vulkan::OnSurfaceFormatChange(surface_format);
-}
-
 void Shutdown(const vk::Device& device) {
     auto result = device.waitIdle();
     if (result != vk::Result::eSuccess) {

src/imgui/renderer/imgui_core.h

@@ -22,8 +22,6 @@ void Initialize(const Vulkan::Instance& instance, const Frontend::WindowSDL& win
 
 void OnResize();
 
-void OnSurfaceFormatChange(vk::Format surface_format);
-
 void Shutdown(const vk::Device& device);
 
 bool ProcessEvent(SDL_Event* event);

src/imgui/renderer/imgui_impl_vulkan.cpp

@@ -1265,20 +1265,4 @@ void Shutdown() {
     IM_DELETE(bd);
 }
 
-void OnSurfaceFormatChange(vk::Format surface_format) {
-    VkData* bd = GetBackendData();
-    const InitInfo& v = bd->init_info;
-    auto& pl_format = const_cast<vk::Format&>(
-        bd->init_info.pipeline_rendering_create_info.pColorAttachmentFormats[0]);
-    if (pl_format != surface_format) {
-        pl_format = surface_format;
-        if (bd->pipeline) {
-            v.device.destroyPipeline(bd->pipeline, v.allocator);
-            bd->pipeline = VK_NULL_HANDLE;
-            CreatePipeline(v.device, v.allocator, v.pipeline_cache, nullptr, &bd->pipeline,
-                           v.subpass);
-        }
-    }
-}
-
 } // namespace ImGui::Vulkan

src/imgui/renderer/imgui_impl_vulkan.h

@@ -67,6 +67,5 @@ void RenderDrawData(ImDrawData& draw_data, vk::CommandBuffer command_buffer,
                     vk::Pipeline pipeline = VK_NULL_HANDLE);
 
 void SetBlendEnabled(bool enabled);
-void OnSurfaceFormatChange(vk::Format surface_format);
 
-} // namespace ImGui::Vulkan
+} // namespace ImGui::Vulkan

src/video_core/host_shaders/post_process.frag

@@ -10,23 +10,16 @@ layout (binding = 0) uniform sampler2D texSampler;
 
 layout(push_constant) uniform settings {
     float gamma;
-    bool hdr;
 } pp;
 
 const float cutoff = 0.0031308, a = 1.055, b = 0.055, d = 12.92;
-vec3 gamma(vec3 rgb) {
-    return mix(
-        a * pow(rgb, vec3(1.0 / (2.4 + 1.0 - pp.gamma))) - b,
-        d * rgb / pp.gamma,
-        lessThan(rgb, vec3(cutoff))
-    );
+vec3 gamma(vec3 rgb)
+{
+    return mix(a * pow(rgb, vec3(1.0 / (2.4 + 1.0 - pp.gamma))) - b, d * rgb / pp.gamma, lessThan(rgb, vec3(cutoff)));
 }
 
-void main() {
+void main()
+{
     vec4 color_linear = texture(texSampler, uv);
-    if (pp.hdr) {
-        color = color_linear;
-    } else {
-        color = vec4(gamma(color_linear.rgb), color_linear.a);
-    }
+    color = vec4(gamma(color_linear.rgb), color_linear.a);
 }

src/video_core/renderer_vulkan/vk_platform.cpp

@@ -160,10 +160,6 @@ std::vector<const char*> GetInstanceExtensions(Frontend::WindowSystemType window
         extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
     }
 
-    if (Config::allowHDR()) {
-        extensions.push_back(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME);
-    }
-
     if (enable_debug_utils) {
         extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
     }

src/video_core/renderer_vulkan/vk_presenter.cpp

@@ -397,7 +397,6 @@ void Presenter::RecreateFrame(Frame* frame, u32 width, u32 height) {
     frame->height = height;
 
     frame->imgui_texture = ImGui::Vulkan::AddTexture(view, vk::ImageLayout::eShaderReadOnlyOptimal);
-    frame->is_hdr = swapchain.GetHDR();
 }
 
 Frame* Presenter::PrepareLastFrame() {
@@ -563,8 +562,7 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
     if (image_id != VideoCore::NULL_IMAGE_ID) {
         const auto& image = texture_cache.GetImage(image_id);
         const auto extent = image.info.size;
-        if (frame->width != extent.width || frame->height != extent.height ||
-            frame->is_hdr != swapchain.GetHDR()) {
+        if (frame->width != extent.width || frame->height != extent.height) {
             RecreateFrame(frame, extent.width, extent.height);
         }
     }
@@ -915,7 +913,7 @@ Frame* Presenter::GetRenderFrame() {
     }
 
     // Initialize default frame image
-    if (frame->width == 0 || frame->height == 0 || frame->is_hdr != swapchain.GetHDR()) {
+    if (frame->width == 0 || frame->height == 0) {
         RecreateFrame(frame, 1920, 1080);
     }
 

src/video_core/renderer_vulkan/vk_presenter.h

@@ -31,7 +31,6 @@ struct Frame {
     vk::Fence present_done;
     vk::Semaphore ready_semaphore;
     u64 ready_tick;
-    bool is_hdr{false};
 
     ImTextureID imgui_texture;
 };
@@ -47,7 +46,6 @@ class Rasterizer;
 class Presenter {
     struct PostProcessSettings {
         float gamma = 1.0f;
-        bool hdr = false;
     };
 
 public:
@@ -104,18 +102,6 @@ class Presenter {
         return *rasterizer.get();
     }
 
-    bool IsHDRSupported() const {
-        return swapchain.HasHDR();
-    }
-
-    void SetHDR(bool enable) {
-        if (!IsHDRSupported()) {
-            return;
-        }
-        swapchain.SetHDR(enable);
-        pp_settings.hdr = enable;
-    }
-
 private:
     void CreatePostProcessPipeline();
     Frame* PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop = true);