diff options
| author | 2018-11-20 21:27:34 -0400 | |
|---|---|---|
| committer | 2018-11-21 07:33:34 -0400 | |
| commit | 0a9fedfac90e811f3c007df4484891c34eb1e6bb (patch) | |
| tree | 514423f24ee5929536c68b5d60656493b9ec1dcb /src | |
| parent | Merge pull request #1667 from DarkLordZach/swkbd (diff) | |
| download | yuzu-0a9fedfac90e811f3c007df4484891c34eb1e6bb.tar.gz yuzu-0a9fedfac90e811f3c007df4484891c34eb1e6bb.tar.xz yuzu-0a9fedfac90e811f3c007df4484891c34eb1e6bb.zip | |
Use default values for unknown framebuffer pixel format
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/gpu.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 83c7e5b0b..51b3904f6 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp | |||
| @@ -17,6 +17,8 @@ u32 FramebufferConfig::BytesPerPixel(PixelFormat format) { | |||
| 17 | switch (format) { | 17 | switch (format) { |
| 18 | case PixelFormat::ABGR8: | 18 | case PixelFormat::ABGR8: |
| 19 | return 4; | 19 | return 4; |
| 20 | default: | ||
| 21 | return 4; | ||
| 20 | } | 22 | } |
| 21 | 23 | ||
| 22 | UNREACHABLE(); | 24 | UNREACHABLE(); |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index ea38da932..27b5b8960 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -304,6 +304,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 304 | gl_framebuffer_data.resize(texture.width * texture.height * 4); | 304 | gl_framebuffer_data.resize(texture.width * texture.height * 4); |
| 305 | break; | 305 | break; |
| 306 | default: | 306 | default: |
| 307 | internal_format = GL_RGBA; | ||
| 308 | texture.gl_format = GL_RGBA; | ||
| 309 | texture.gl_type = GL_UNSIGNED_INT_8_8_8_8_REV; | ||
| 310 | gl_framebuffer_data.resize(texture.width * texture.height * 4); | ||
| 311 | LOG_CRITICAL(Render_OpenGL, "Unknown framebuffer pixel format: {}", | ||
| 312 | static_cast<u32>(framebuffer.pixel_format)); | ||
| 307 | UNREACHABLE(); | 313 | UNREACHABLE(); |
| 308 | } | 314 | } |
| 309 | 315 | ||