OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-21 03:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2317 from yuriks/vertex-copy

Browse Source 
VideoCore: Eliminate an unnecessary copy in the drawcall loop
This commit is contained in:
Sebastian Valle 2016-12-15 00:16:04 -05:00 committed by GitHub
commit ec9130de8d
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/command_processor.cpp
View File

@ -251,7 +251,6 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
ASSERT(vertex != -1); ASSERT(vertex != -1);
bool vertex_cache_hit = false; bool vertex_cache_hit = false;
Shader::OutputRegisters output_registers;
if (is_indexed) { if (is_indexed) {
if (g_debug_context && Pica::g_debug_context->recorder) { if (g_debug_context && Pica::g_debug_context->recorder) {
@ -279,10 +278,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation, g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation,
(void*)&input); (void*)&input);
g_state.vs.Run(shader_unit, input, loader.GetNumTotalAttributes()); g_state.vs.Run(shader_unit, input, loader.GetNumTotalAttributes());
output_registers = shader_unit.output_registers;
// Retrieve vertex from register data // Retrieve vertex from register data
output_vertex = output_registers.ToVertex(regs.vs); output_vertex = shader_unit.output_registers.ToVertex(regs.vs);
if (is_indexed) { if (is_indexed) {
vertex_cache[vertex_cache_pos] = output_vertex; vertex_cache[vertex_cache_pos] = output_vertex;

2
src/video_core/shader/shader.cpp
View File

@ -25,7 +25,7 @@ namespace Pica {
namespace Shader { namespace Shader {
OutputVertex OutputRegisters::ToVertex(const Regs::ShaderConfig& config) { OutputVertex OutputRegisters::ToVertex(const Regs::ShaderConfig& config) const {
// Setup output data // Setup output data
OutputVertex ret; OutputVertex ret;
// TODO(neobrain): Under some circumstances, up to 16 attributes may be output. We need to // TODO(neobrain): Under some circumstances, up to 16 attributes may be output. We need to

2
src/video_core/shader/shader.h
View File

@ -85,7 +85,7 @@ struct OutputRegisters {
alignas(16) Math::Vec4<float24> value[16]; alignas(16) Math::Vec4<float24> value[16];
OutputVertex ToVertex(const Regs::ShaderConfig& config); OutputVertex ToVertex(const Regs::ShaderConfig& config) const;
}; };
static_assert(std::is_pod<OutputRegisters>::value, "Structure is not POD"); static_assert(std::is_pod<OutputRegisters>::value, "Structure is not POD");