diff options
| author | 2021-11-11 18:13:35 -0800 | |
|---|---|---|
| committer | 2022-03-24 18:13:32 -0700 | |
| commit | d456b9d554da32e4353ba6e837e1cb8690782a9d (patch) | |
| tree | 75029812af06aabfcc83d29098db4ff85e929ea5 /src/video_core/renderer_opengl | |
| parent | hle: nvflinger: Add implementation for GraphicBuffer class. (diff) | |
| download | yuzu-d456b9d554da32e4353ba6e837e1cb8690782a9d.tar.gz yuzu-d456b9d554da32e4353ba6e837e1cb8690782a9d.tar.xz yuzu-d456b9d554da32e4353ba6e837e1cb8690782a9d.zip | |
hle: nvflinger: Move PixelFormat to its own header.
Diffstat (limited to 'src/video_core/renderer_opengl')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 795c97831..279421962 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -323,12 +323,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 323 | 323 | ||
| 324 | GLint internal_format; | 324 | GLint internal_format; |
| 325 | switch (framebuffer.pixel_format) { | 325 | switch (framebuffer.pixel_format) { |
| 326 | case Tegra::FramebufferConfig::PixelFormat::A8B8G8R8_UNORM: | 326 | case android::PixelFormat::Rgba8888: |
| 327 | internal_format = GL_RGBA8; | 327 | internal_format = GL_RGBA8; |
| 328 | texture.gl_format = GL_RGBA; | 328 | texture.gl_format = GL_RGBA; |
| 329 | texture.gl_type = GL_UNSIGNED_INT_8_8_8_8_REV; | 329 | texture.gl_type = GL_UNSIGNED_INT_8_8_8_8_REV; |
| 330 | break; | 330 | break; |
| 331 | case Tegra::FramebufferConfig::PixelFormat::RGB565_UNORM: | 331 | case android::PixelFormat::Rgb565: |
| 332 | internal_format = GL_RGB565; | 332 | internal_format = GL_RGB565; |
| 333 | texture.gl_format = GL_RGB; | 333 | texture.gl_format = GL_RGB; |
| 334 | texture.gl_type = GL_UNSIGNED_SHORT_5_6_5; | 334 | texture.gl_type = GL_UNSIGNED_SHORT_5_6_5; |
| @@ -464,8 +464,8 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { | |||
| 464 | const auto& texcoords = screen_info.display_texcoords; | 464 | const auto& texcoords = screen_info.display_texcoords; |
| 465 | auto left = texcoords.left; | 465 | auto left = texcoords.left; |
| 466 | auto right = texcoords.right; | 466 | auto right = texcoords.right; |
| 467 | if (framebuffer_transform_flags != Tegra::FramebufferConfig::TransformFlags::Unset) { | 467 | if (framebuffer_transform_flags != android::BufferTransformFlags::Unset) { |
| 468 | if (framebuffer_transform_flags == Tegra::FramebufferConfig::TransformFlags::FlipV) { | 468 | if (framebuffer_transform_flags == android::BufferTransformFlags::FlipV) { |
| 469 | // Flip the framebuffer vertically | 469 | // Flip the framebuffer vertically |
| 470 | left = texcoords.right; | 470 | left = texcoords.right; |
| 471 | right = texcoords.left; | 471 | right = texcoords.left; |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 35706cf05..e6395b900 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h | |||
| @@ -46,7 +46,7 @@ struct TextureInfo { | |||
| 46 | GLsizei height; | 46 | GLsizei height; |
| 47 | GLenum gl_format; | 47 | GLenum gl_format; |
| 48 | GLenum gl_type; | 48 | GLenum gl_type; |
| 49 | Tegra::FramebufferConfig::PixelFormat pixel_format; | 49 | android::PixelFormat pixel_format; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /// Structure used for storing information about the display target for the Switch screen | 52 | /// Structure used for storing information about the display target for the Switch screen |
| @@ -135,7 +135,7 @@ private: | |||
| 135 | std::vector<u8> gl_framebuffer_data; | 135 | std::vector<u8> gl_framebuffer_data; |
| 136 | 136 | ||
| 137 | /// Used for transforming the framebuffer orientation | 137 | /// Used for transforming the framebuffer orientation |
| 138 | Tegra::FramebufferConfig::TransformFlags framebuffer_transform_flags{}; | 138 | android::BufferTransformFlags framebuffer_transform_flags{}; |
| 139 | Common::Rectangle<int> framebuffer_crop_rect; | 139 | Common::Rectangle<int> framebuffer_crop_rect; |
| 140 | }; | 140 | }; |
| 141 | 141 | ||