summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_shader_cache.h
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-05-25 23:58:28 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:33 +0200
commiteacf18cce9a05a28f50e916a752c04b0c9337707 (patch)
treec01a2c6ea1bb7c0aefd21b101c979a03da861e74 /src/video_core/renderer_opengl/gl_shader_cache.h
parentglasm: Release phi node registers after they are no longer needed (diff)
downloadyuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar.gz
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar.bz2
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar.lz
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar.xz
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.tar.zst
yuzu-eacf18cce9a05a28f50e916a752c04b0c9337707.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_cache.h')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h
index b49cd0ac7..a56559ea9 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_cache.h
@@ -15,8 +15,8 @@
#include "shader_recompiler/frontend/maxwell/control_flow.h"
#include "shader_recompiler/object_pool.h"
#include "video_core/engines/shader_type.h"
-#include "video_core/renderer_opengl/gl_compute_program.h"
-#include "video_core/renderer_opengl/gl_graphics_program.h"
+#include "video_core/renderer_opengl/gl_compute_pipeline.h"
+#include "video_core/renderer_opengl/gl_graphics_pipeline.h"
#include "video_core/shader_cache.h"
namespace Tegra {
@@ -55,24 +55,24 @@ public:
ProgramManager& program_manager_, StateTracker& state_tracker_);
~ShaderCache();
- [[nodiscard]] GraphicsProgram* CurrentGraphicsProgram();
+ [[nodiscard]] GraphicsPipeline* CurrentGraphicsPipeline();
- [[nodiscard]] ComputeProgram* CurrentComputeProgram();
+ [[nodiscard]] ComputePipeline* CurrentComputePipeline();
private:
- std::unique_ptr<GraphicsProgram> CreateGraphicsProgram();
+ std::unique_ptr<GraphicsPipeline> CreateGraphicsPipeline();
- std::unique_ptr<GraphicsProgram> CreateGraphicsProgram(
- ShaderPools& pools, const GraphicsProgramKey& key,
+ std::unique_ptr<GraphicsPipeline> CreateGraphicsPipeline(
+ ShaderPools& pools, const GraphicsPipelineKey& key,
std::span<Shader::Environment* const> envs, bool build_in_parallel);
- std::unique_ptr<ComputeProgram> CreateComputeProgram(const ComputeProgramKey& key,
- const VideoCommon::ShaderInfo* shader);
+ std::unique_ptr<ComputePipeline> CreateComputePipeline(const ComputePipelineKey& key,
+ const VideoCommon::ShaderInfo* shader);
- std::unique_ptr<ComputeProgram> CreateComputeProgram(ShaderPools& pools,
- const ComputeProgramKey& key,
- Shader::Environment& env,
- bool build_in_parallel);
+ std::unique_ptr<ComputePipeline> CreateComputePipeline(ShaderPools& pools,
+ const ComputePipelineKey& key,
+ Shader::Environment& env,
+ bool build_in_parallel);
Core::Frontend::EmuWindow& emu_window;
const Device& device;
@@ -81,11 +81,11 @@ private:
ProgramManager& program_manager;
StateTracker& state_tracker;
- GraphicsProgramKey graphics_key{};
+ GraphicsPipelineKey graphics_key{};
ShaderPools main_pools;
- std::unordered_map<GraphicsProgramKey, std::unique_ptr<GraphicsProgram>> graphics_cache;
- std::unordered_map<ComputeProgramKey, std::unique_ptr<ComputeProgram>> compute_cache;
+ std::unordered_map<GraphicsPipelineKey, std::unique_ptr<GraphicsPipeline>> graphics_cache;
+ std::unordered_map<ComputePipelineKey, std::unique_ptr<ComputePipeline>> compute_cache;
Shader::Profile profile;
};