From b406e4e1f2c696ba5f6bec04ea2e6a8cc03a02d1 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sun, 14 Dec 2014 21:23:13 +0100 Subject: VideoCommon: Add a separate constants buffer for the geometry shader. --- Source/Core/VideoCommon/GeometryShaderManager.cpp | 82 +++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 Source/Core/VideoCommon/GeometryShaderManager.cpp (limited to 'Source/Core/VideoCommon/GeometryShaderManager.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp new file mode 100644 index 0000000000..f754961cbc --- /dev/null +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -0,0 +1,82 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include +#include + +#include "VideoCommon/GeometryShaderGen.h" +#include "VideoCommon/GeometryShaderManager.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" + +// track changes +static bool s_projection_changed, s_viewport_changed; + +GeometryShaderConstants GeometryShaderManager::constants; +bool GeometryShaderManager::dirty; + +void GeometryShaderManager::Init() +{ + memset(&constants, 0, sizeof(constants)); + + Dirty(); +} + +void GeometryShaderManager::Shutdown() +{ +} + +void GeometryShaderManager::Dirty() +{ + s_projection_changed = true; + s_viewport_changed = true; + + dirty = true; +} + +// Syncs the shader constant buffers with xfmem +void GeometryShaderManager::SetConstants() +{ + if (s_projection_changed) + { + s_projection_changed = false; + + if (g_ActiveConfig.iStereoMode > 0 && xfmem.projection.type == GX_PERSPECTIVE) + { + float offset = (g_ActiveConfig.iStereoSeparation / 1000.0f) * (g_ActiveConfig.iStereoSeparationPercent / 100.0f); + constants.stereoparams[0] = (g_ActiveConfig.bStereoSwapEyes) ? offset : -offset; + constants.stereoparams[1] = (g_ActiveConfig.bStereoSwapEyes) ? -offset : offset; + constants.stereoparams[2] = (g_ActiveConfig.iStereoConvergence / 10.0f) * (g_ActiveConfig.iStereoConvergencePercent / 100.0f); + } + else + { + constants.stereoparams[0] = constants.stereoparams[1] = 0; + } + } + + dirty = true; +} + +void GeometryShaderManager::SetViewportChanged() +{ + s_viewport_changed = true; +} + +void GeometryShaderManager::SetProjectionChanged() +{ + s_projection_changed = true; +} + +void GeometryShaderManager::DoState(PointerWrap &p) +{ + p.Do(dirty); + + if (p.GetMode() == PointerWrap::MODE_READ) + { + // Reload current state from global GPU state + // NOTE: This requires that all GPU memory has been loaded already. + Dirty(); + } +} -- cgit v1.2.3 From 332ba4b2100ec4dcda4b2e83eb5b0e2d21e6abc4 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sun, 14 Dec 2014 21:44:33 +0100 Subject: GeometryShaderManager: Upload Line/Point width constants. --- Source/Core/VideoCommon/GeometryShaderManager.cpp | 43 ++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/GeometryShaderManager.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index f754961cbc..70bb151666 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -5,6 +5,7 @@ #include #include +#include "VideoCommon/BPMemory.h" #include "VideoCommon/GeometryShaderGen.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/VideoCommon.h" @@ -12,7 +13,11 @@ #include "VideoCommon/XFMemory.h" // track changes -static bool s_projection_changed, s_viewport_changed; +static bool s_projection_changed, s_viewport_changed, s_lineptwidth_changed; + +static const float LINE_PT_TEX_OFFSETS[8] = { + 0.f, 0.0625f, 0.125f, 0.25f, 0.5f, 1.f, 1.f, 1.f +}; GeometryShaderConstants GeometryShaderManager::constants; bool GeometryShaderManager::dirty; @@ -32,6 +37,16 @@ void GeometryShaderManager::Dirty() { s_projection_changed = true; s_viewport_changed = true; + s_lineptwidth_changed = true; + + SetTexCoordChanged(0); + SetTexCoordChanged(1); + SetTexCoordChanged(2); + SetTexCoordChanged(3); + SetTexCoordChanged(4); + SetTexCoordChanged(5); + SetTexCoordChanged(6); + SetTexCoordChanged(7); dirty = true; } @@ -39,6 +54,20 @@ void GeometryShaderManager::Dirty() // Syncs the shader constant buffers with xfmem void GeometryShaderManager::SetConstants() { + if (s_lineptwidth_changed) + { + constants.lineptwidth[0] = bpmem.lineptwidth.linesize / 6.f; + constants.lineptwidth[1] = bpmem.lineptwidth.pointsize / 6.f; + constants.lineptwidth[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff]; + constants.lineptwidth[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff]; + } + + if (s_viewport_changed) + { + constants.viewport[0] = 2.0f * xfmem.viewport.wd; + constants.viewport[1] = -2.0f * xfmem.viewport.ht; + } + if (s_projection_changed) { s_projection_changed = false; @@ -69,6 +98,18 @@ void GeometryShaderManager::SetProjectionChanged() s_projection_changed = true; } +void GeometryShaderManager::SetLinePtWidthChanged() +{ + s_lineptwidth_changed = true; +} + +void GeometryShaderManager::SetTexCoordChanged(u8 texmapid) +{ + TCoordInfo& tc = bpmem.texcoords[texmapid]; + constants.texoffsetflags[texmapid] = tc.s.line_offset + tc.s.point_offset * 2; + dirty = true; +} + void GeometryShaderManager::DoState(PointerWrap &p) { p.Do(dirty); -- cgit v1.2.3 From 0ac710339100dc6dc2f1f4c094b372846decdce5 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Tue, 16 Dec 2014 00:21:07 +0100 Subject: GeometryShaderGen: Pack uniforms more tightly. --- Source/Core/VideoCommon/GeometryShaderManager.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderManager.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index 70bb151666..3d05a7161c 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -15,8 +15,8 @@ // track changes static bool s_projection_changed, s_viewport_changed, s_lineptwidth_changed; -static const float LINE_PT_TEX_OFFSETS[8] = { - 0.f, 0.0625f, 0.125f, 0.25f, 0.5f, 1.f, 1.f, 1.f +static const int LINE_PT_TEX_OFFSETS[8] = { + 0, 16, 8, 4, 2, 1, 1, 1 }; GeometryShaderConstants GeometryShaderManager::constants; @@ -56,16 +56,16 @@ void GeometryShaderManager::SetConstants() { if (s_lineptwidth_changed) { - constants.lineptwidth[0] = bpmem.lineptwidth.linesize / 6.f; - constants.lineptwidth[1] = bpmem.lineptwidth.pointsize / 6.f; - constants.lineptwidth[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff]; - constants.lineptwidth[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff]; + constants.lineptparams[2] = bpmem.lineptwidth.linesize / 6.f; + constants.lineptparams[3] = bpmem.lineptwidth.pointsize / 6.f; + constants.texoffset[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff]; + constants.texoffset[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff]; } if (s_viewport_changed) { - constants.viewport[0] = 2.0f * xfmem.viewport.wd; - constants.viewport[1] = -2.0f * xfmem.viewport.ht; + constants.lineptparams[0] = 2.0f * xfmem.viewport.wd; + constants.lineptparams[1] = -2.0f * xfmem.viewport.ht; } if (s_projection_changed) @@ -106,7 +106,11 @@ void GeometryShaderManager::SetLinePtWidthChanged() void GeometryShaderManager::SetTexCoordChanged(u8 texmapid) { TCoordInfo& tc = bpmem.texcoords[texmapid]; - constants.texoffsetflags[texmapid] = tc.s.line_offset + tc.s.point_offset * 2; + int bitmask = 1 << texmapid; + constants.texoffset[0] &= ~bitmask; + constants.texoffset[0] |= tc.s.line_offset << texmapid; + constants.texoffset[1] &= ~bitmask; + constants.texoffset[1] |= tc.s.point_offset << texmapid; dirty = true; } -- cgit v1.2.3 From 1af3d8447a47ea7a8be86060ca879cafe1c57824 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 17 Dec 2014 03:11:23 +0100 Subject: GeometryShaderManager: Set the constants within the callbacks. --- Source/Core/VideoCommon/GeometryShaderManager.cpp | 78 ++++++++--------------- 1 file changed, 25 insertions(+), 53 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderManager.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index 3d05a7161c..2ca0965343 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -12,9 +12,6 @@ #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" -// track changes -static bool s_projection_changed, s_viewport_changed, s_lineptwidth_changed; - static const int LINE_PT_TEX_OFFSETS[8] = { 0, 16, 8, 4, 2, 1, 1, 1 }; @@ -35,72 +32,47 @@ void GeometryShaderManager::Shutdown() void GeometryShaderManager::Dirty() { - s_projection_changed = true; - s_viewport_changed = true; - s_lineptwidth_changed = true; - - SetTexCoordChanged(0); - SetTexCoordChanged(1); - SetTexCoordChanged(2); - SetTexCoordChanged(3); - SetTexCoordChanged(4); - SetTexCoordChanged(5); - SetTexCoordChanged(6); - SetTexCoordChanged(7); + SetViewportChanged(); + SetProjectionChanged(); + SetLinePtWidthChanged(); + + for (int i = 0; i < 8; i++) + SetTexCoordChanged(i); dirty = true; } -// Syncs the shader constant buffers with xfmem -void GeometryShaderManager::SetConstants() +void GeometryShaderManager::SetViewportChanged() { - if (s_lineptwidth_changed) - { - constants.lineptparams[2] = bpmem.lineptwidth.linesize / 6.f; - constants.lineptparams[3] = bpmem.lineptwidth.pointsize / 6.f; - constants.texoffset[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff]; - constants.texoffset[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff]; - } + constants.lineptparams[0] = 2.0f * xfmem.viewport.wd; + constants.lineptparams[1] = -2.0f * xfmem.viewport.ht; + dirty = true; +} - if (s_viewport_changed) +void GeometryShaderManager::SetProjectionChanged() +{ + if (g_ActiveConfig.iStereoMode > 0 && xfmem.projection.type == GX_PERSPECTIVE) { - constants.lineptparams[0] = 2.0f * xfmem.viewport.wd; - constants.lineptparams[1] = -2.0f * xfmem.viewport.ht; + float offset = (g_ActiveConfig.iStereoSeparation / 1000.0f) * (g_ActiveConfig.iStereoSeparationPercent / 100.0f); + constants.stereoparams[0] = (g_ActiveConfig.bStereoSwapEyes) ? offset : -offset; + constants.stereoparams[1] = (g_ActiveConfig.bStereoSwapEyes) ? -offset : offset; + constants.stereoparams[2] = (g_ActiveConfig.iStereoConvergence / 10.0f) * (g_ActiveConfig.iStereoConvergencePercent / 100.0f); } - - if (s_projection_changed) + else { - s_projection_changed = false; - - if (g_ActiveConfig.iStereoMode > 0 && xfmem.projection.type == GX_PERSPECTIVE) - { - float offset = (g_ActiveConfig.iStereoSeparation / 1000.0f) * (g_ActiveConfig.iStereoSeparationPercent / 100.0f); - constants.stereoparams[0] = (g_ActiveConfig.bStereoSwapEyes) ? offset : -offset; - constants.stereoparams[1] = (g_ActiveConfig.bStereoSwapEyes) ? -offset : offset; - constants.stereoparams[2] = (g_ActiveConfig.iStereoConvergence / 10.0f) * (g_ActiveConfig.iStereoConvergencePercent / 100.0f); - } - else - { - constants.stereoparams[0] = constants.stereoparams[1] = 0; - } + constants.stereoparams[0] = constants.stereoparams[1] = 0; } dirty = true; } -void GeometryShaderManager::SetViewportChanged() -{ - s_viewport_changed = true; -} - -void GeometryShaderManager::SetProjectionChanged() -{ - s_projection_changed = true; -} - void GeometryShaderManager::SetLinePtWidthChanged() { - s_lineptwidth_changed = true; + constants.lineptparams[2] = bpmem.lineptwidth.linesize / 6.f; + constants.lineptparams[3] = bpmem.lineptwidth.pointsize / 6.f; + constants.texoffset[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff]; + constants.texoffset[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff]; + dirty = true; } void GeometryShaderManager::SetTexCoordChanged(u8 texmapid) -- cgit v1.2.3 From 69df23f725205a4bcd10c6315f2421d3041e614e Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 17 Dec 2014 09:18:40 +0100 Subject: VideoCommon: Only use interface blocks when geometry shaders are supported. --- Source/Core/VideoCommon/GeometryShaderManager.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderManager.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index 2ca0965343..09adad56c0 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -88,8 +88,6 @@ void GeometryShaderManager::SetTexCoordChanged(u8 texmapid) void GeometryShaderManager::DoState(PointerWrap &p) { - p.Do(dirty); - if (p.GetMode() == PointerWrap::MODE_READ) { // Reload current state from global GPU state -- cgit v1.2.3