summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-12-17 07:30:00 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-01-26 03:53:23 +0100
commit1e1f9398176e4f1ec608f31f22a576c749a0a723 (patch)
tree1c2ced663dcfe434ae0750f0ca64590c1f1dba5f /src/video_core/shader
parentVideoCore/Shader: Use self instead of g_state.vs in ShaderSetup (diff)
downloadyuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar.gz
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar.bz2
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar.lz
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar.xz
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.tar.zst
yuzu-1e1f9398176e4f1ec608f31f22a576c749a0a723.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/shader/shader.cpp16
-rw-r--r--src/video_core/shader/shader.h4
2 files changed, 11 insertions, 9 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 868be1360..936db0582 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -120,33 +120,35 @@ void ShaderSetup::Setup() {
MICROPROFILE_DEFINE(GPU_Shader, "GPU", "Shader", MP_RGB(50, 50, 240));
-void ShaderSetup::Run(UnitState& state) {
- auto& config = g_state.regs.vs;
+void ShaderSetup::Run(UnitState& state, unsigned int entry_point) {
+ ASSERT(entry_point < 1024);
MICROPROFILE_SCOPE(GPU_Shader);
#ifdef ARCHITECTURE_x86_64
if (VideoCore::g_shader_jit_enabled) {
- jit_shader->Run(*this, state, config.main_offset);
+ jit_shader->Run(*this, state, entry_point);
} else {
DebugData<false> dummy_debug_data;
- RunInterpreter(*this, state, dummy_debug_data, config.main_offset);
+ RunInterpreter(*this, state, dummy_debug_data, entry_point);
}
#else
DebugData<false> dummy_debug_data;
- RunInterpreter(*this, state, dummy_debug_data, config.main_offset);
+ RunInterpreter(*this, state, dummy_debug_data, entry_point);
#endif // ARCHITECTURE_x86_64
}
DebugData<true> ShaderSetup::ProduceDebugInfo(const InputVertex& input, int num_attributes,
- const Regs::ShaderConfig& config) {
+ unsigned int entry_point) {
+ ASSERT(entry_point < 1024);
+
UnitState state;
DebugData<true> debug_data;
// Setup input register table
boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero()));
state.LoadInputVertex(input, num_attributes);
- RunInterpreter(*this, state, debug_data, config.main_offset);
+ RunInterpreter(*this, state, debug_data, entry_point);
return debug_data;
}
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index 61becb6e5..d21f481ab 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -191,7 +191,7 @@ struct ShaderSetup {
* Runs the currently setup shader
* @param state Shader unit state, must be setup per shader and per shader unit
*/
- void Run(UnitState& state);
+ void Run(UnitState& state, unsigned int entry_point);
/**
* Produce debug information based on the given shader and input vertex
@@ -201,7 +201,7 @@ struct ShaderSetup {
* @return Debug information for this shader with regards to the given vertex
*/
DebugData<true> ProduceDebugInfo(const InputVertex& input, int num_attributes,
- const Regs::ShaderConfig& config);
+ unsigned int entry_point);
};
} // namespace Shader