diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index de742d11c..a4acb3796 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp | |||
| @@ -34,9 +34,6 @@ using VideoCommon::Shader::ShaderIR; | |||
| 34 | 34 | ||
| 35 | namespace { | 35 | namespace { |
| 36 | 36 | ||
| 37 | // One UBO is always reserved for emulation values on staged shaders | ||
| 38 | constexpr u32 STAGE_RESERVED_UBOS = 1; | ||
| 39 | |||
| 40 | constexpr u32 STAGE_MAIN_OFFSET = 10; | 37 | constexpr u32 STAGE_MAIN_OFFSET = 10; |
| 41 | constexpr u32 KERNEL_MAIN_OFFSET = 0; | 38 | constexpr u32 KERNEL_MAIN_OFFSET = 0; |
| 42 | 39 | ||
| @@ -243,7 +240,6 @@ CachedProgram BuildShader(const Device& device, u64 unique_identifier, ShaderTyp | |||
| 243 | if (!code_b.empty()) { | 240 | if (!code_b.empty()) { |
| 244 | ir_b.emplace(code_b, main_offset, COMPILER_SETTINGS, locker); | 241 | ir_b.emplace(code_b, main_offset, COMPILER_SETTINGS, locker); |
| 245 | } | 242 | } |
| 246 | const auto entries = GLShader::GetEntries(ir); | ||
| 247 | 243 | ||
| 248 | std::string source = fmt::format(R"(// {} | 244 | std::string source = fmt::format(R"(// {} |
| 249 | #version 430 core | 245 | #version 430 core |
| @@ -314,9 +310,10 @@ std::unordered_set<GLenum> GetSupportedFormats() { | |||
| 314 | 310 | ||
| 315 | CachedShader::CachedShader(const ShaderParameters& params, ShaderType shader_type, | 311 | CachedShader::CachedShader(const ShaderParameters& params, ShaderType shader_type, |
| 316 | GLShader::ShaderEntries entries, ProgramCode code, ProgramCode code_b) | 312 | GLShader::ShaderEntries entries, ProgramCode code, ProgramCode code_b) |
| 317 | : RasterizerCacheObject{params.host_ptr}, system{params.system}, disk_cache{params.disk_cache}, | 313 | : RasterizerCacheObject{params.host_ptr}, system{params.system}, |
| 318 | device{params.device}, cpu_addr{params.cpu_addr}, unique_identifier{params.unique_identifier}, | 314 | disk_cache{params.disk_cache}, device{params.device}, cpu_addr{params.cpu_addr}, |
| 319 | shader_type{shader_type}, entries{entries}, code{std::move(code)}, code_b{std::move(code_b)} { | 315 | unique_identifier{params.unique_identifier}, shader_type{shader_type}, |
| 316 | entries{std::move(entries)}, code{std::move(code)}, code_b{std::move(code_b)} { | ||
| 320 | if (!params.precompiled_variants) { | 317 | if (!params.precompiled_variants) { |
| 321 | return; | 318 | return; |
| 322 | } | 319 | } |