diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-12-02 13:17:27 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-12-02 13:38:33 -0500 |
| commit | 139d4fc76e4ddf45179ca5ec5e42c52ef513ea4d (patch) | |
| tree | a639ad5dfd8a1b85eb32d408e2068dce9f41ce00 /Source/Core/VideoBackends/OGL | |
| parent | 5abae61a8c7e0e4ac03bb8d3031793037e87fdd3 (diff) | |
General: Convert PanicAlerts over to fmt equivalent
Converts lingering panic alert calls over to the fmt-capable ones.
Diffstat (limited to 'Source/Core/VideoBackends/OGL')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLTexture.cpp | 17 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 39 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 16 |
5 files changed, 49 insertions, 45 deletions
diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index c95e1f8472..6057c8878c 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -48,11 +48,11 @@ static void SetPointer(u32 attrib, u32 stride, const AttributeFormat& format) GLVertexFormat::GLVertexFormat(const PortableVertexDeclaration& vtx_decl) : NativeVertexFormat(vtx_decl) { - u32 vertex_stride = vtx_decl.stride; + const u32 vertex_stride = vtx_decl.stride; // We will not allow vertex components causing uneven strides. if (vertex_stride & 3) - PanicAlert("Uneven vertex stride: %i", vertex_stride); + PanicAlertFmt("Uneven vertex stride: {}", vertex_stride); VertexManager* const vm = static_cast<VertexManager*>(g_vertex_manager.get()); diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp index 3cdbaca301..6a378f6b86 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp +++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp @@ -42,7 +42,7 @@ GLenum GetGLInternalFormatForTextureFormat(AbstractTextureFormat format, bool st case AbstractTextureFormat::D32F_S8: return GL_DEPTH32F_STENCIL8; default: - PanicAlert("Unhandled texture format."); + PanicAlertFmt("Unhandled texture format."); return storage ? GL_RGBA8 : GL_RGBA; } } @@ -216,12 +216,15 @@ void OGLTexture::Load(u32 level, u32 width, u32 height, u32 row_length, const u8 size_t buffer_size) { if (level >= m_config.levels) - PanicAlert("Texture only has %d levels, can't update level %d", m_config.levels, level); - if (width != std::max(1u, m_config.width >> level) || - height != std::max(1u, m_config.height >> level)) - PanicAlert("size of level %d must be %dx%d, but %dx%d requested", level, - std::max(1u, m_config.width >> level), std::max(1u, m_config.height >> level), width, - height); + PanicAlertFmt("Texture only has {} levels, can't update level {}", m_config.levels, level); + + const auto expected_width = std::max(1U, m_config.width >> level); + const auto expected_height = std::max(1U, m_config.height >> level); + if (width != expected_width || height != expected_height) + { + PanicAlertFmt("Size of level {} must be {}x{}, but {}x{} requested", level, expected_width, + expected_height, width, height); + } const GLenum target = GetGLTarget(); glActiveTexture(GL_MUTABLE_TEXTURE_INDEX); diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 06be6b8d7a..e4afbf0ccd 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -368,10 +368,10 @@ bool ProgramShaderCache::CheckShaderCompileResult(GLuint id, GLenum type, std::s file << "Video Backend: " + g_video_backend->GetDisplayName(); file.close(); - PanicAlert("Failed to compile %s shader: %s\n" - "Debug info (%s, %s, %s):\n%s", - prefix, filename.c_str(), g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, - g_ogl_config.gl_version, info_log.c_str()); + PanicAlertFmt("Failed to compile {} shader: {}\n" + "Debug info ({}, {}, {}):\n{}", + prefix, filename, g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, + g_ogl_config.gl_version, info_log); return false; } @@ -413,10 +413,10 @@ bool ProgramShaderCache::CheckProgramLinkResult(GLuint id, std::string_view vcod file << "Video Backend: " + g_video_backend->GetDisplayName(); file.close(); - PanicAlert("Failed to link shaders: %s\n" - "Debug info (%s, %s, %s):\n%s", - filename.c_str(), g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, - g_ogl_config.gl_version, info_log.c_str()); + PanicAlertFmt("Failed to link shaders: {}\n" + "Debug info ({}, {}, {}):\n{}", + filename, g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, + g_ogl_config.gl_version, info_log); return false; } @@ -847,7 +847,7 @@ bool SharedContextAsyncShaderCompiler::WorkerThreadInitMainThread(void** param) static_cast<Renderer*>(g_renderer.get())->GetMainGLContext()->CreateSharedContext(); if (!context) { - PanicAlert("Failed to create shared context for shader compiling."); + PanicAlertFmt("Failed to create shared context for shader compiling."); return false; } diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 04f0415547..042aaeaaa0 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -357,8 +357,8 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { // We want the ogl3 framebuffer instead of the ogl2 one for better blitting support. // It's also compatible with the gles3 one. - PanicAlert("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -366,8 +366,8 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { // This extension is used to replace lots of pointer setting function. // Also gles3 requires to use it. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -375,8 +375,8 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { // ogl3 buffer mapping for better streaming support. // The ogl2 one also isn't in gles3. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -384,13 +384,13 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { // ubo allow us to keep the current constants on shader switches // we also can stream them much nicer and pack into it whatever we want to - PanicAlert("GPU: OGL ERROR: Need GL_ARB_uniform_buffer_object.\n" - "GPU: Does your video card support OpenGL 3.1?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_uniform_buffer_object.\n" + "GPU: Does your video card support OpenGL 3.1?"); bSuccess = false; } else if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_UBO)) { - PanicAlert( + PanicAlertFmtT( "Buggy GPU driver detected.\n" "Please either install the closed-source GPU driver or update your Mesa 3D version."); bSuccess = false; @@ -400,8 +400,8 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { // Our sampler cache uses this extension. It could easyly be workaround and it's by far the // highest requirement, but it seems that no driver lacks support for it. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n" - "GPU: Does your video card support OpenGL 3.3?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n" + "GPU: Does your video card support OpenGL 3.3?"); bSuccess = false; } @@ -588,10 +588,10 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ { if (GLExtensions::Version() < 300) { - PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n" - "GPU: Does your video card support OpenGL 3.0?\n" - "GPU: Your driver supports GLSL %s", - (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)); + PanicAlertFmtT("GPU: OGL ERROR: Need at least GLSL 1.30\n" + "GPU: Does your video card support OpenGL 3.0?\n" + "GPU: Your driver supports GLSL {0}", + reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION))); bSuccess = false; } else if (GLExtensions::Version() == 300) @@ -718,10 +718,11 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_ // MSAA on default framebuffer isn't working because of glBlitFramebuffer. // It also isn't useful as we don't render anything to the default framebuffer. // We also try to get a non-msaa fb, so this only happens when forced by the driver. - PanicAlertT("The graphics driver is forcibly enabling anti-aliasing for Dolphin. You need to " - "turn this off in the graphics driver's settings in order for Dolphin to work.\n\n" - "(MSAA with %d samples found on default framebuffer)", - samples); + PanicAlertFmtT( + "The graphics driver is forcibly enabling anti-aliasing for Dolphin. You need to " + "turn this off in the graphics driver's settings in order for Dolphin to work.\n\n" + "(MSAA with {0} samples found on default framebuffer)", + samples); bSuccess = false; } diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index d1e71d55e6..864de57624 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -123,15 +123,15 @@ bool VideoBackend::InitializeGLExtensions(GLContext* context) { // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by // extensions - PanicAlert("GPU: OGL ERROR: Does your video card support OpenGL 2.0?"); + PanicAlertFmtT("GPU: OGL ERROR: Does your video card support OpenGL 2.0?"); return false; } if (GLExtensions::Version() < 300) { // integer vertex attributes require a gl3 only function - PanicAlert("GPU: OGL ERROR: Need OpenGL version 3.\n" - "GPU: Does your video card support OpenGL 3?"); + PanicAlertFmtT("GPU: OGL ERROR: Need OpenGL version 3.\n" + "GPU: Does your video card support OpenGL 3?"); return false; } @@ -147,9 +147,9 @@ bool VideoBackend::FillBackendInfo() glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs); if (numvertexattribs < 16) { - PanicAlert("GPU: OGL ERROR: Number of attributes %d not enough.\n" - "GPU: Does your video card support OpenGL 2.x?", - numvertexattribs); + PanicAlertFmtT("GPU: OGL ERROR: Number of attributes {0} not enough.\n" + "GPU: Does your video card support OpenGL 2.x?", + numvertexattribs); return false; } @@ -159,7 +159,7 @@ bool VideoBackend::FillBackendInfo() g_Config.backend_info.MaxTextureSize = static_cast<u32>(max_texture_size); if (max_texture_size < 1024) { - PanicAlert("GL_MAX_TEXTURE_SIZE too small at %i - must be at least 1024.", max_texture_size); + PanicAlertFmtT("GL_MAX_TEXTURE_SIZE is {0} - must be at least 1024.", max_texture_size); return false; } @@ -193,7 +193,7 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi) !g_renderer->Initialize() || !g_framebuffer_manager->Initialize() || !g_texture_cache->Initialize()) { - PanicAlert("Failed to initialize renderer classes"); + PanicAlertFmtT("Failed to initialize renderer classes"); Shutdown(); return false; } |
