From 11792682fbbc53f57d92f5363a4541518016cb64 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 8 Jun 2020 06:44:01 -0400 Subject: [PATCH] gl_shader_gen: Collapse several format calls into one Same behavior, but performs one formatting pass without altering the readability of the formatting. --- .../renderer_opengl/gl_shader_gen.cpp | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index cbd1b44c6..302c93626 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -1583,22 +1583,19 @@ ShaderDecompiler::ProgramResult GenerateTrivialVertexShader(bool separable_shade out += "#extension GL_ARB_separate_shader_objects : enable\n"; } - out += fmt::format("layout(location = {}) in vec4 vert_position;\n", - static_cast(ATTRIBUTE_POSITION)); - out += fmt::format("layout(location = {}) in vec4 vert_color;\n", - static_cast(ATTRIBUTE_COLOR)); - out += fmt::format("layout(location = {}) in vec2 vert_texcoord0;\n", - static_cast(ATTRIBUTE_TEXCOORD0)); - out += fmt::format("layout(location = {}) in vec2 vert_texcoord1;\n", - static_cast(ATTRIBUTE_TEXCOORD1)); - out += fmt::format("layout(location = {}) in vec2 vert_texcoord2;\n", - static_cast(ATTRIBUTE_TEXCOORD2)); - out += fmt::format("layout(location = {}) in float vert_texcoord0_w;\n", - static_cast(ATTRIBUTE_TEXCOORD0_W)); - out += fmt::format("layout(location = {}) in vec4 vert_normquat;\n", - static_cast(ATTRIBUTE_NORMQUAT)); out += - fmt::format("layout(location = {}) in vec3 vert_view;\n", static_cast(ATTRIBUTE_VIEW)); + fmt::format("layout(location = {}) in vec4 vert_position;\n" + "layout(location = {}) in vec4 vert_color;\n" + "layout(location = {}) in vec2 vert_texcoord0;\n" + "layout(location = {}) in vec2 vert_texcoord1;\n" + "layout(location = {}) in vec2 vert_texcoord2;\n" + "layout(location = {}) in float vert_texcoord0_w;\n" + "layout(location = {}) in vec4 vert_normquat;\n" + "layout(location = {}) in vec3 vert_view;\n", + static_cast(ATTRIBUTE_POSITION), static_cast(ATTRIBUTE_COLOR), + static_cast(ATTRIBUTE_TEXCOORD0), static_cast(ATTRIBUTE_TEXCOORD1), + static_cast(ATTRIBUTE_TEXCOORD2), static_cast(ATTRIBUTE_TEXCOORD0_W), + static_cast(ATTRIBUTE_NORMQUAT), static_cast(ATTRIBUTE_VIEW)); out += GetVertexInterfaceDeclaration(true, separable_shader);