From 632e2e16ff8aa7ed81530bd3d57cae0d4a057af8 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 10 Aug 2023 21:30:35 +0300 Subject: [PATCH] proper variable naming --- src/Core/PS4/HLE/Graphics/video_out.cpp | 16 +++++++------- src/Core/PS4/HLE/Graphics/video_out.h | 28 ++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Core/PS4/HLE/Graphics/video_out.cpp b/src/Core/PS4/HLE/Graphics/video_out.cpp index 641e56aa..d5bcf6b7 100644 --- a/src/Core/PS4/HLE/Graphics/video_out.cpp +++ b/src/Core/PS4/HLE/Graphics/video_out.cpp @@ -13,13 +13,13 @@ constexpr bool log_file_videoout = true; // disable it to disable logging std::string getPixelFormatString(s32 format) { switch (format) { - case SCE_VIDEO_OUT_PIXEL_FORMAT_A8R8G8B8_SRGB: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A8R8G8B8_SRGB"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_A8B8G8R8_SRGB: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A8B8G8R8_SRGB"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_SRGB: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_SRGB"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_BT2020_PQ: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_BT2020_PQ"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_A16R16G16B16_FLOAT: return "SCE_VIDEO_OUT_PIXEL_FORMAT_A16R16G16B16_FLOAT"; - case SCE_VIDEO_OUT_PIXEL_FORMAT_YCBCR420_BT709: return "SCE_VIDEO_OUT_PIXEL_FORMAT_YCBCR420_BT709"; + case PIXEL_FORMAT_A8R8G8B8_SRGB: return "PIXEL_FORMAT_A8R8G8B8_SRGB"; + case PIXEL_FORMAT_A8B8G8R8_SRGB: return "PIXEL_FORMAT_A8B8G8R8_SRGB"; + case PIXEL_FORMAT_A2R10G10B10: return "PIXEL_FORMAT_A2R10G10B10"; + case PIXEL_FORMAT_A2R10G10B10_SRGB: return "PIXEL_FORMAT_A2R10G10B10_SRGB"; + case PIXEL_FORMAT_A2R10G10B10_BT2020_PQ: return "PIXEL_FORMAT_A2R10G10B10_BT2020_PQ"; + case PIXEL_FORMAT_A16R16G16B16_FLOAT: return "PIXEL_FORMAT_A16R16G16B16_FLOAT"; + case PIXEL_FORMAT_YCBCR420_BT709: return "PIXEL_FORMAT_YCBCR420_BT709"; default: return "Unknown pixel format"; } } @@ -46,6 +46,6 @@ void PS4_SYSV_ABI sceVideoOutSetBufferAttribute(SceVideoOutBufferAttribute* attr attribute->width = width; attribute->height = height; attribute->pitchInPixel = pitchInPixel; - attribute->option = SCE_VIDEO_OUT_BUFFER_ATTRIBUTE_OPTION_NONE; + attribute->option = BUFFER_ATTRIBUTE_OPTION_NONE; } } // namespace HLE::Libs::Graphics::VideoOut \ No newline at end of file diff --git a/src/Core/PS4/HLE/Graphics/video_out.h b/src/Core/PS4/HLE/Graphics/video_out.h index acb3a6aa..849fcabe 100644 --- a/src/Core/PS4/HLE/Graphics/video_out.h +++ b/src/Core/PS4/HLE/Graphics/video_out.h @@ -13,25 +13,25 @@ struct SceVideoOutBufferAttribute { u32 height; u32 pitchInPixel; u32 option; - u32 _reserved0; - u64 _reserved1; + u32 reserved0; + u64 reserved1; }; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A8R8G8B8_SRGB = 0x80000000; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A8B8G8R8_SRGB = 0x80002200; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10 = 0x88060000; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_SRGB = 0x88000000; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A2R10G10B10_BT2020_PQ = 0x88740000; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_A16R16G16B16_FLOAT = 0xC1060000; -constexpr int SCE_VIDEO_OUT_PIXEL_FORMAT_YCBCR420_BT709 = 0x08322200; +constexpr int PIXEL_FORMAT_A8R8G8B8_SRGB = 0x80000000; +constexpr int PIXEL_FORMAT_A8B8G8R8_SRGB = 0x80002200; +constexpr int PIXEL_FORMAT_A2R10G10B10 = 0x88060000; +constexpr int PIXEL_FORMAT_A2R10G10B10_SRGB = 0x88000000; +constexpr int PIXEL_FORMAT_A2R10G10B10_BT2020_PQ = 0x88740000; +constexpr int PIXEL_FORMAT_A16R16G16B16_FLOAT = 0xC1060000; +constexpr int PIXEL_FORMAT_YCBCR420_BT709 = 0x08322200; -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 BUFFER_ATTRIBUTE_OPTION_NONE = 0; +constexpr int BUFFER_ATTRIBUTE_OPTION_VR = 7; +constexpr int BUFFER_ATTRIBUTE_OPTION_STRICT_COLORIMETRY = 8; -enum SceVideoOutTilingMode : s32 { SCE_VIDEO_OUT_TILING_MODE_TILE = 0, SCE_VIDEO_OUT_TILING_MODE_LINEAR = 1 }; +enum SceVideoOutTilingMode : s32 { TILING_MODE_TILE = 0, TILING_MODE_LINEAR = 1 }; -enum AspectRatioMode : s32 { SCE_VIDEO_OUT_ASPECT_RATIO_16_9 = 0 }; +enum AspectRatioMode : s32 { ASPECT_RATIO_16_9 = 0 }; std::string getPixelFormatString(s32 format);