N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-12-23 00:40:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoCore/Shader: Move ProduceDebugInfo to InterpreterEngine

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2016-12-17 01:30:55 -08:00
parent a9b7752b9d
commit ade7ed7c5f
5 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/citra_qt/debugger/graphics/graphics_vertex_shader.h
View file

@ -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;

11
src/video_core/shader/shader.h
View file

@ -14,7 +14,6 @@
#include "common/vector_math.h"
#include "video_core/pica.h"
#include "video_core/pica_types.h"
#include "video_core/shader/debug_data.h"
using nihstro::RegisterType;
using nihstro::SourceRegister;
@ -192,16 +191,6 @@ public:
* @param state Shader unit state, must be setup per shader and per shader unit
*/
virtual void Run(UnitState& state, unsigned int entry_point) const = 0;
/**
* Produce debug information based on the given shader and input vertex
* @param input Input vertex into the shader
* @param num_attributes The number of vertex shader attributes
* @param config Configuration object for the shader pipeline
* @return Debug information for this shader with regards to the given vertex
*/
virtual DebugData<true> ProduceDebugInfo(const InputVertex& input, int num_attributes,
unsigned int entry_point) const = 0;
};
// TODO(yuriks): Remove and make it non-global state somewhere

11
src/video_core/shader/shader_interpreter.h
View file

@ -4,6 +4,7 @@
#pragma once
#include "video_core/shader/debug_data.h"
#include "video_core/shader/shader.h"
namespace Pica {
@ -14,8 +15,16 @@ class InterpreterEngine final : public ShaderEngine {
public:
void SetupBatch(const ShaderSetup* setup) override;
void Run(UnitState& state, unsigned int entry_point) const override;
/**
* Produce debug information based on the given shader and input vertex
* @param input Input vertex into the shader
* @param num_attributes The number of vertex shader attributes
* @param config Configuration object for the shader pipeline
* @return Debug information for this shader with regards to the given vertex
*/
DebugData<true> ProduceDebugInfo(const InputVertex& input, int num_attributes,
unsigned int entry_point) const override;
unsigned int entry_point) const;
private:
const ShaderSetup* setup = nullptr;

5
src/video_core/shader/shader_jit_x64.cpp
View file

@ -47,10 +47,5 @@ void JitX64Engine::Run(UnitState& state, unsigned int entry_point) const {
cached_shader->Run(*setup, state, entry_point);
}
DebugData<true> JitX64Engine::ProduceDebugInfo(const InputVertex& input, int num_attributes,
unsigned int entry_point) const {
UNIMPLEMENTED_MSG("Shader tracing/debugging is not supported by the JIT.");
}
} // namespace Shader
} // namespace Pica

2
src/video_core/shader/shader_jit_x64.h
View file

@ -21,8 +21,6 @@ public:
void SetupBatch(const ShaderSetup* setup) override;
void Run(UnitState& state, unsigned int entry_point) const override;
DebugData<true> ProduceDebugInfo(const InputVertex& input, int num_attributes,
unsigned int entry_point) const override;
private:
const ShaderSetup* setup = nullptr;