diff --git a/src/libdecaf/src/gpu/latte_constants.h b/src/libdecaf/src/gpu/latte_constants.h index 70715bac..a83f22cd 100755 --- a/src/libdecaf/src/gpu/latte_constants.h +++ b/src/libdecaf/src/gpu/latte_constants.h @@ -12,6 +12,9 @@ MaxRenderTargets = 8u; static const unsigned MaxSamplers = 16u; +static const unsigned +MaxStreamOutBuffers = 4u; + static const unsigned MaxTextures = 16u; diff --git a/src/libdecaf/src/gpu/opengl/glsl2_exp.cpp b/src/libdecaf/src/gpu/opengl/glsl2_exp.cpp index 4e3811a2..00daa498 100644 --- a/src/libdecaf/src/gpu/opengl/glsl2_exp.cpp +++ b/src/libdecaf/src/gpu/opengl/glsl2_exp.cpp @@ -205,9 +205,7 @@ registerFeedback(State &state, xfb.streamIndex = streamIndex; xfb.offset = offset; xfb.size = size; - state.shader->feedbacks.push_back(xfb); - - state.shader->usedFeedbackBuffers[streamIndex] = true; + state.shader->feedbacks[streamIndex].push_back(xfb); } } diff --git a/src/libdecaf/src/gpu/opengl/glsl2_translate.cpp b/src/libdecaf/src/gpu/opengl/glsl2_translate.cpp index 4cde7f3e..f9543dfb 100644 --- a/src/libdecaf/src/gpu/opengl/glsl2_translate.cpp +++ b/src/libdecaf/src/gpu/opengl/glsl2_translate.cpp @@ -676,21 +676,6 @@ insertFileHeader(State &state) << "out gl_PerVertex {\n" << " vec4 gl_Position;\n" << "};\n"; - - for (auto &xfb : state.shader->feedbacks) { - out - << "layout(xfb_buffer = " << xfb.streamIndex - << ", xfb_offset = " << xfb.offset - << ") out "; - - if (xfb.size == 1) { - out << "float"; - } else { - out << "vec" << xfb.size; - } - - out << " feedback_" << xfb.streamIndex << "_" << xfb.offset << ";\n"; - } } } @@ -742,7 +727,6 @@ translate(Shader &shader, const gsl::span &binary) state.binary = binary; state.shader = &shader; state.shader->usedUniformBlocks.fill(false); - state.shader->usedFeedbackBuffers.fill(false); state.shader->samplerUsage.fill(SamplerUsage::Invalid); initialise(); diff --git a/src/libdecaf/src/gpu/opengl/glsl2_translate.h b/src/libdecaf/src/gpu/opengl/glsl2_translate.h index e44ec9c4..0ba7192e 100644 --- a/src/libdecaf/src/gpu/opengl/glsl2_translate.h +++ b/src/libdecaf/src/gpu/opengl/glsl2_translate.h @@ -7,6 +7,7 @@ #include #include #include +#include "gpu/latte_constants.h" #include "gpu/microcode/latte_instructions.h" namespace glsl2 @@ -66,10 +67,9 @@ struct Shader std::string codeHeader; std::string codeBody; std::vector exports; - std::vector feedbacks; - std::array samplerUsage; - std::array usedUniformBlocks; - std::array usedFeedbackBuffers; + std::array, latte::MaxStreamOutBuffers> feedbacks; + std::array samplerUsage; + std::array usedUniformBlocks; }; struct LoopState diff --git a/src/libdecaf/src/gpu/opengl/opengl_driver.h b/src/libdecaf/src/gpu/opengl/opengl_driver.h index 04c20565..aeaf38a3 100644 --- a/src/libdecaf/src/gpu/opengl/opengl_driver.h +++ b/src/libdecaf/src/gpu/opengl/opengl_driver.h @@ -349,8 +349,8 @@ private: ScanBufferChain mDrcScanBuffers; gl::GLuint mFeedbackQuery = 0; - uint32_t mFeedbackBaseOffset[4]; - uint32_t mFeedbackCurrentOffset[4]; + uint32_t mFeedbackBaseOffset[latte::MaxStreamOutBuffers]; + uint32_t mFeedbackCurrentOffset[latte::MaxStreamOutBuffers]; gl::GLuint mOccQuery = 0; uint32_t mLastOccQueryAddress = 0; @@ -363,7 +363,7 @@ private: DepthBufferCache mDepthBufferCache; std::array mPixelTextureCache; std::array mPixelSamplerCache; - std::array mFeedbackBufferCache; + std::array mFeedbackBufferCache; using duration_system_clock = std::chrono::duration; using duration_ms = std::chrono::duration; diff --git a/src/libdecaf/src/gpu/opengl/opengl_shader.cpp b/src/libdecaf/src/gpu/opengl/opengl_shader.cpp index 80d3b35d..82fdc105 100644 --- a/src/libdecaf/src/gpu/opengl/opengl_shader.cpp +++ b/src/libdecaf/src/gpu/opengl/opengl_shader.cpp @@ -186,7 +186,13 @@ bool GLDriver::checkActiveShader() auto fsShaderKey = static_cast(fsPgmAddress) << 32; auto vsShaderKey = static_cast(vsPgmAddress) << 32; - vsShaderKey ^= vgt_strmout_en.STREAMOUT() ? 1 : 0; + if (vgt_strmout_en.STREAMOUT()) { + vsShaderKey ^= 1; + for (auto i = 0u; i < latte::MaxStreamOutBuffers; ++i) { + auto vgt_strmout_vtx_stride = getRegister(latte::Register::VGT_STRMOUT_VTX_STRIDE_0 + 16 * i); + vsShaderKey ^= vgt_strmout_vtx_stride << (1 + 7 * i); + } + } auto psShaderKey = static_cast(psPgmAddress) << 32; psShaderKey ^= static_cast(alphaTestFunc) << 28; psShaderKey ^= cb_shader_mask.value & 0xFF; @@ -737,7 +743,7 @@ bool GLDriver::checkActiveFeedbackBuffers() return true; } - for (auto index = 0u; index < 4; ++index) { + for (auto index = 0u; index < latte::MaxStreamOutBuffers; ++index) { if (!(vgt_strmout_buffer_en.value & (1 << index))) { if (mFeedbackBufferCache[index].enable) { mFeedbackBufferCache[index].enable = false; @@ -749,10 +755,6 @@ bool GLDriver::checkActiveFeedbackBuffers() mFeedbackBufferCache[index].enable = true; auto vgt_strmout_buffer_base = getRegister(latte::Register::VGT_STRMOUT_BUFFER_BASE_0 + 16 * index); - auto vgt_strmout_vtx_stride = getRegister(latte::Register::VGT_STRMOUT_VTX_STRIDE_0 + 16 * index); - - mFeedbackBufferCache[index].enable = true; - auto addr = vgt_strmout_buffer_base << 8; auto &buffer = mFeedbackBuffers[addr]; @@ -1030,7 +1032,6 @@ bool GLDriver::compileVertexShader(VertexShader &vertex, FetchShader &fetch, uin } vertex.usedUniformBlocks = shader.usedUniformBlocks; - vertex.usedFeedbackBuffers = shader.usedFeedbackBuffers; fmt::MemoryWriter out; out << shader.fileHeader; @@ -1077,6 +1078,36 @@ bool GLDriver::compileVertexShader(VertexShader &vertex, FetchShader &fetch, uin } out << '\n'; + // Transform feedback outputs + for (auto buffer = 0u; buffer < latte::MaxStreamOutBuffers; ++buffer) { + vertex.usedFeedbackBuffers[buffer] = !shader.feedbacks[buffer].empty(); + + if (vertex.usedFeedbackBuffers[buffer]) { + auto vgt_strmout_vtx_stride = getRegister(latte::Register::VGT_STRMOUT_VTX_STRIDE_0 + 16 * buffer); + auto stride = vgt_strmout_vtx_stride * 4; + + out + << "layout(xfb_buffer = " << buffer + << ", xfb_stride = " << stride + << ") out block {\n"; + + for (auto &xfb : shader.feedbacks[buffer]) { + out << " layout(xfb_offset = " << xfb.offset << ") out "; + + if (xfb.size == 1) { + out << "float"; + } else { + out << "vec" << xfb.size; + } + + out << " feedback_" << xfb.streamIndex << "_" << xfb.offset << ";\n"; + } + + out << "};\n"; + } + } + out << '\n'; + out << "void main()\n" << "{\n"