diff options
| author | 2019-12-10 23:49:43 -0300 | |
|---|---|---|
| committer | 2019-12-10 23:52:51 -0300 | |
| commit | 48e16c4c496474793da36fde89a3f0d5c5f69b28 (patch) | |
| tree | f53bf8283c65ad9322084be92985130e58604bad /src | |
| parent | Merge pull request #3208 from ReinUsesLisp/vk-shader-decompiler (diff) | |
| download | yuzu-48e16c4c496474793da36fde89a3f0d5c5f69b28.tar.gz yuzu-48e16c4c496474793da36fde89a3f0d5c5f69b28.tar.xz yuzu-48e16c4c496474793da36fde89a3f0d5c5f69b28.zip | |
gl_shader_cache: Add missing new-line on emitted GLSL
Add missing new-line. This caused shaders using local memory and shared
memory to inject a preprocessor GLSL line after an expression (resulting
in invalid code).
It looked like this:
shared uint smem[8];#define LOCAL_MEMORY_SIZE 16
It should look like this (addressed by this commit):
shared uint smem[8];
\#define LOCAL_MEMORY_SIZE 16
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 370bdf052..270a9dc2b 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp | |||
| @@ -281,11 +281,11 @@ CachedProgram BuildShader(const Device& device, u64 unique_identifier, ShaderTyp | |||
| 281 | if (variant.shared_memory_size > 0) { | 281 | if (variant.shared_memory_size > 0) { |
| 282 | // TODO(Rodrigo): We should divide by four here, but having a larger shared memory pool | 282 | // TODO(Rodrigo): We should divide by four here, but having a larger shared memory pool |
| 283 | // avoids out of bound stores. Find out why shared memory size is being invalid. | 283 | // avoids out of bound stores. Find out why shared memory size is being invalid. |
| 284 | source += fmt::format("shared uint smem[{}];", variant.shared_memory_size); | 284 | source += fmt::format("shared uint smem[{}];\n", variant.shared_memory_size); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | if (variant.local_memory_size > 0) { | 287 | if (variant.local_memory_size > 0) { |
| 288 | source += fmt::format("#define LOCAL_MEMORY_SIZE {}", | 288 | source += fmt::format("#define LOCAL_MEMORY_SIZE {}\n", |
| 289 | Common::AlignUp(variant.local_memory_size, 4) / 4); | 289 | Common::AlignUp(variant.local_memory_size, 4) / 4); |
| 290 | } | 290 | } |
| 291 | } | 291 | } |