citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

fix clang format

This commit is contained in:
BreadFish64 2020-07-07 16:43:42 -05:00
parent 662c348b6c
commit 60282f35fe
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -779,8 +779,9 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
temp_tex.Create(); temp_tex.Create();
glBindTexture(GL_TEXTURE_2D, temp_tex.handle); glBindTexture(GL_TEXTURE_2D, temp_tex.handle);
auto [internal_format, format, type] = GetFormatTuple(color_surface->pixel_format); auto [internal_format, format, type] = GetFormatTuple(color_surface->pixel_format);
OGLTexture::Allocate(GL_TEXTURE_2D, color_surface->max_level + 1, internal_format, format, type, OGLTexture::Allocate(GL_TEXTURE_2D, color_surface->max_level + 1, internal_format, format,
color_surface->GetScaledWidth(), color_surface->GetScaledHeight()); type, color_surface->GetScaledWidth(),
color_surface->GetScaledHeight());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); 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_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);

5
src/video_core/renderer_opengl/gl_resource_manager.cpp
View File

@ -52,9 +52,8 @@ void OGLTexture::Release() {
handle = 0; handle = 0;
} }
void OGLTexture::Allocate(GLenum target, GLsizei levels, GLenum internalformat, void OGLTexture::Allocate(GLenum target, GLsizei levels, GLenum internalformat, GLenum format,
GLenum format, GLenum type, GLsizei width, GLsizei height, GLenum type, GLsizei width, GLsizei height, GLsizei depth) {
GLsizei depth) {
const bool tex_storage = GLAD_GL_ARB_texture_storage || GLES; const bool tex_storage = GLAD_GL_ARB_texture_storage || GLES;
switch (target) { switch (target) {

3
src/video_core/renderer_opengl/gl_resource_manager.h
View File

@ -59,7 +59,8 @@ public:
/// Deletes the internal OpenGL resource /// Deletes the internal OpenGL resource
void Release(); 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; GLuint handle = 0;
}; };

2
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -384,7 +384,7 @@ void RendererOpenGL::SwapBuffers() {
if (frame_dumper.IsDumping()) { if (frame_dumper.IsDumping()) {
try { try {
RenderToMailbox(frame_dumper.GetLayout(), frame_dumper.mailbox, true); 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()); LOG_DEBUG(Render_OpenGL, "Frame dumper exception caught: {}", exception.what());
} }
} }