diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-27 18:29:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 18:29:10 +0100 |
| commit | bf14f4be2263b4769e97800b35951717192c2d1c (patch) | |
| tree | 9c1c47f5a05e9907257f620d8426a0cebaf0cf78 /src/citra_qt | |
| parent | SDL: Select audio device (#2403) (diff) | |
| parent | VideoCore/Shader: Move entry_point to SetupBatch (diff) | |
| download | yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar.gz yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar.bz2 yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar.lz yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar.xz yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.tar.zst yuzu-bf14f4be2263b4769e97800b35951717192c2d1c.zip | |
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp | 7 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics/graphics_vertex_shader.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp index ff2e7e363..f37524190 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp @@ -18,7 +18,9 @@ #include "citra_qt/util/util.h" #include "video_core/pica.h" #include "video_core/pica_state.h" +#include "video_core/shader/debug_data.h" #include "video_core/shader/shader.h" +#include "video_core/shader/shader_interpreter.h" using nihstro::OpCode; using nihstro::Instruction; @@ -518,8 +520,9 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d info.labels.insert({entry_point, "main"}); // Generate debug information - debug_data = Pica::g_state.vs.ProduceDebugInfo(input_vertex, num_attributes, shader_config, - shader_setup); + Pica::Shader::InterpreterEngine shader_engine; + shader_engine.SetupBatch(shader_setup, entry_point); + debug_data = shader_engine.ProduceDebugInfo(shader_setup, input_vertex, num_attributes); // Reload widget state for (int attr = 0; attr < num_attributes; ++attr) { diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h index bedea0bed..3292573f3 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h +++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h @@ -8,6 +8,7 @@ #include <QTreeView> #include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h" #include "nihstro/parser_shbin.h" +#include "video_core/shader/debug_data.h" #include "video_core/shader/shader.h" class QLabel; |