Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hle: nvflinger: Migrate android namespace -> Service::android.

Browse source
This commit is contained in:
bunnei 2022-03-19 21:51:16 -07:00
parent 5849c9a4cd
commit ca12a77670
35 changed files with 76 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/framebuffer_config.h
View file

@ -20,8 +20,8 @@ struct FramebufferConfig {
u32 width{};
u32 height{};
u32 stride{};
android::PixelFormat pixel_format{};
android::BufferTransformFlags transform_flags{};
Service::android::PixelFormat pixel_format{};
Service::android::BufferTransformFlags transform_flags{};
Common::Rectangle<int> crop_rect;
};

8
src/video_core/renderer_opengl/renderer_opengl.cpp
View file

@ -323,12 +323,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
GLint internal_format;
switch (framebuffer.pixel_format) {
case android::PixelFormat::Rgba8888:
case Service::android::PixelFormat::Rgba8888:
internal_format = GL_RGBA8;
texture.gl_format = GL_RGBA;
texture.gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
case android::PixelFormat::Rgb565:
case Service::android::PixelFormat::Rgb565:
internal_format = GL_RGB565;
texture.gl_format = GL_RGB;
texture.gl_type = GL_UNSIGNED_SHORT_5_6_5;
@ -464,8 +464,8 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) {
const auto& texcoords = screen_info.display_texcoords;
auto left = texcoords.left;
auto right = texcoords.right;
if (framebuffer_transform_flags != android::BufferTransformFlags::Unset) {
if (framebuffer_transform_flags == android::BufferTransformFlags::FlipV) {
if (framebuffer_transform_flags != Service::android::BufferTransformFlags::Unset) {
if (framebuffer_transform_flags == Service::android::BufferTransformFlags::FlipV) {
// Flip the framebuffer vertically
left = texcoords.right;
right = texcoords.left;

4
src/video_core/renderer_opengl/renderer_opengl.h
View file

@ -46,7 +46,7 @@ struct TextureInfo {
GLsizei height;
GLenum gl_format;
GLenum gl_type;
android::PixelFormat pixel_format;
Service::android::PixelFormat pixel_format;
};
/// Structure used for storing information about the display target for the Switch screen
@ -135,7 +135,7 @@ private:
std::vector<u8> gl_framebuffer_data;
/// Used for transforming the framebuffer orientation
android::BufferTransformFlags framebuffer_transform_flags{};
Service::android::BufferTransformFlags framebuffer_transform_flags{};
Common::Rectangle<int> framebuffer_crop_rect;
};

10
src/video_core/renderer_vulkan/vk_blit_screen.cpp
View file

@ -94,11 +94,11 @@ std::size_t GetSizeInBytes(const Tegra::FramebufferConfig& framebuffer) {
VkFormat GetFormat(const Tegra::FramebufferConfig& framebuffer) {
switch (framebuffer.pixel_format) {
case android::PixelFormat::Rgba8888:
case Service::android::PixelFormat::Rgba8888:
return VK_FORMAT_A8B8G8R8_UNORM_PACK32;
case android::PixelFormat::Rgb565:
case Service::android::PixelFormat::Rgb565:
return VK_FORMAT_R5G6B5_UNORM_PACK16;
case android::PixelFormat::Bgra8888:
case Service::android::PixelFormat::Bgra8888:
return VK_FORMAT_B8G8R8A8_UNORM;
default:
UNIMPLEMENTED_MSG("Unknown framebuffer pixel format: {}",
@ -1390,9 +1390,9 @@ void VKBlitScreen::SetVertexData(BufferData& data, const Tegra::FramebufferConfi
auto right = texcoords.right;
switch (framebuffer_transform_flags) {
case android::BufferTransformFlags::Unset:
case Service::android::BufferTransformFlags::Unset:
break;
case android::BufferTransformFlags::FlipV:
case Service::android::BufferTransformFlags::FlipV:
// Flip the framebuffer vertically
left = texcoords.right;
right = texcoords.left;

8
src/video_core/surface.cpp
View file

@ -190,13 +190,13 @@ PixelFormat PixelFormatFromRenderTargetFormat(Tegra::RenderTargetFormat format)
}
}
PixelFormat PixelFormatFromGPUPixelFormat(android::PixelFormat format) {
PixelFormat PixelFormatFromGPUPixelFormat(Service::android::PixelFormat format) {
switch (format) {
case android::PixelFormat::Rgba8888:
case Service::android::PixelFormat::Rgba8888:
return PixelFormat::A8B8G8R8_UNORM;
case android::PixelFormat::Rgb565:
case Service::android::PixelFormat::Rgb565:
return PixelFormat::R5G6B5_UNORM;
case android::PixelFormat::Bgra8888:
case Service::android::PixelFormat::Bgra8888:
return PixelFormat::B8G8R8A8_UNORM;
default:
UNIMPLEMENTED_MSG("Unimplemented format={}", format);

2
src/video_core/surface.h
View file

@ -460,7 +460,7 @@ PixelFormat PixelFormatFromDepthFormat(Tegra::DepthFormat format);
PixelFormat PixelFormatFromRenderTargetFormat(Tegra::RenderTargetFormat format);
PixelFormat PixelFormatFromGPUPixelFormat(android::PixelFormat format);
PixelFormat PixelFormatFromGPUPixelFormat(Service::android::PixelFormat format);
SurfaceType GetFormatType(PixelFormat pixel_format);