From 60282f35fe1e8f55958753ccceca02f853a69339 Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Tue, 7 Jul 2020 16:43:42 -0500 Subject: [PATCH] fix clang format --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 5 +++-- src/video_core/renderer_opengl/gl_resource_manager.cpp | 5 ++--- src/video_core/renderer_opengl/gl_resource_manager.h | 3 ++- src/video_core/renderer_opengl/renderer_opengl.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index cf3290109..93332b7a2 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -779,8 +779,9 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) { temp_tex.Create(); glBindTexture(GL_TEXTURE_2D, temp_tex.handle); auto [internal_format, format, type] = GetFormatTuple(color_surface->pixel_format); - OGLTexture::Allocate(GL_TEXTURE_2D, color_surface->max_level + 1, internal_format, format, type, - color_surface->GetScaledWidth(), color_surface->GetScaledHeight()); + OGLTexture::Allocate(GL_TEXTURE_2D, color_surface->max_level + 1, internal_format, format, + type, color_surface->GetScaledWidth(), + color_surface->GetScaledHeight()); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); diff --git a/src/video_core/renderer_opengl/gl_resource_manager.cpp b/src/video_core/renderer_opengl/gl_resource_manager.cpp index 846edd066..f185b2355 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.cpp +++ b/src/video_core/renderer_opengl/gl_resource_manager.cpp @@ -52,9 +52,8 @@ void OGLTexture::Release() { handle = 0; } -void OGLTexture::Allocate(GLenum target, GLsizei levels, GLenum internalformat, - GLenum format, GLenum type, GLsizei width, GLsizei height, - GLsizei depth) { +void OGLTexture::Allocate(GLenum target, GLsizei levels, GLenum internalformat, GLenum format, + GLenum type, GLsizei width, GLsizei height, GLsizei depth) { const bool tex_storage = GLAD_GL_ARB_texture_storage || GLES; switch (target) { diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h index db326ed9a..595b8c129 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.h +++ b/src/video_core/renderer_opengl/gl_resource_manager.h @@ -59,7 +59,8 @@ public: /// Deletes the internal OpenGL resource void Release(); - static void Allocate(GLenum target, GLsizei levels, GLenum internalformat, GLenum format, GLenum type, GLsizei width, GLsizei height = 1, GLsizei depth = 1); + static void Allocate(GLenum target, GLsizei levels, GLenum internalformat, GLenum format, + GLenum type, GLsizei width, GLsizei height = 1, GLsizei depth = 1); GLuint handle = 0; }; diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 4b946ef74..754ce43b6 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -384,7 +384,7 @@ void RendererOpenGL::SwapBuffers() { if (frame_dumper.IsDumping()) { try { RenderToMailbox(frame_dumper.GetLayout(), frame_dumper.mailbox, true); - } catch(const OGLTextureMailboxException& exception) { + } catch (const OGLTextureMailboxException& exception) { LOG_DEBUG(Render_OpenGL, "Frame dumper exception caught: {}", exception.what()); } }