diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-04-12 21:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 21:40:29 +0200 |
| commit | b2de380d162c4805edb94808f38a214725d2724e (patch) | |
| tree | 1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/VideoBackends/OGL/FramebufferManager.cpp | |
| parent | 0bfeb37a1f50193d39559d29802cb48f45db2b02 (diff) | |
| parent | 40bb9974f21878e64fb03d70e717cb996bf13a29 (diff) | |
Merge pull request #6635 from spycrab/fix_linter
Tools: Bump lint.sh version
Diffstat (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/FramebufferManager.cpp | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index b82d6d89cf..51d48e95df 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -263,11 +263,13 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms "vec4 sampleEFB(ivec3 pos) {\n" " vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n" " for(int i=0; i<" + - samples.str() + "; i++)\n" - " color += texelFetch(samp9, pos, i);\n" - " return color / " + - samples.str() + ";\n" - "}\n"; + samples.str() + + "; i++)\n" + " color += texelFetch(samp9, pos, i);\n" + " return color / " + + samples.str() + + ";\n" + "}\n"; } else { @@ -275,11 +277,13 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms "vec4 sampleEFB(ivec3 pos) {\n" " vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n" " for(int i=0; i<" + - samples.str() + "; i++)\n" - " color += texelFetch(samp9, pos.xy, i);\n" - " return color / " + - samples.str() + ";\n" - "}\n"; + samples.str() + + "; i++)\n" + " color += texelFetch(samp9, pos.xy, i);\n" + " return color / " + + samples.str() + + ";\n" + "}\n"; } } @@ -316,21 +320,23 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms layers << m_EFBLayers; std::string gs = "layout(triangles) in;\n" "layout(triangle_strip, max_vertices = " + - vertices.str() + ") out;\n" - "flat out int layer;\n" - "void main()\n" - "{\n" - " for (int j = 0; j < " + - layers.str() + "; ++j) {\n" - " for (int i = 0; i < 3; ++i) {\n" - " layer = j;\n" - " gl_Layer = j;\n" - " gl_Position = gl_in[i].gl_Position;\n" - " EmitVertex();\n" - " }\n" - " EndPrimitive();\n" - " }\n" - "}\n"; + vertices.str() + + ") out;\n" + "flat out int layer;\n" + "void main()\n" + "{\n" + " for (int j = 0; j < " + + layers.str() + + "; ++j) {\n" + " for (int i = 0; i < 3; ++i) {\n" + " layer = j;\n" + " gl_Layer = j;\n" + " gl_Position = gl_in[i].gl_Position;\n" + " EmitVertex();\n" + " }\n" + " EndPrimitive();\n" + " }\n" + "}\n"; ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6, (m_EFBLayers > 1) ? gs : ""); |