opengl: Write transform feedback declarations after translation.

This allows us to properly include the streamout buffer stride in the
output declaration.

Also add a named constant for the number of streamout buffers.
This commit is contained in:
Andrew Church
2016-08-10 00:50:09 +09:00
parent 2e6b6d3b91
commit 70f50b62ed
6 changed files with 49 additions and 33 deletions

View File

@@ -12,6 +12,9 @@ MaxRenderTargets = 8u;
static const unsigned
MaxSamplers = 16u;
static const unsigned
MaxStreamOutBuffers = 4u;
static const unsigned
MaxTextures = 16u;

View File

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

View File

@@ -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<const uint8_t> &binary)
state.binary = binary;
state.shader = &shader;
state.shader->usedUniformBlocks.fill(false);
state.shader->usedFeedbackBuffers.fill(false);
state.shader->samplerUsage.fill(SamplerUsage::Invalid);
initialise();

View File

@@ -7,6 +7,7 @@
#include <string>
#include <spdlog/fmt/fmt.h>
#include <vector>
#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<Export> exports;
std::vector<Feedback> feedbacks;
std::array<SamplerUsage, 16> samplerUsage;
std::array<bool, 16> usedUniformBlocks;
std::array<bool, 4> usedFeedbackBuffers;
std::array<std::vector<Feedback>, latte::MaxStreamOutBuffers> feedbacks;
std::array<SamplerUsage, latte::MaxSamplers> samplerUsage;
std::array<bool, latte::MaxUniformBlocks> usedUniformBlocks;
};
struct LoopState

View File

@@ -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<TextureCache, latte::MaxTextures> mPixelTextureCache;
std::array<SamplerCache, latte::MaxSamplers> mPixelSamplerCache;
std::array<FeedbackBufferCache, 4> mFeedbackBufferCache;
std::array<FeedbackBufferCache, latte::MaxStreamOutBuffers> mFeedbackBufferCache;
using duration_system_clock = std::chrono::duration<double, std::chrono::system_clock::period>;
using duration_ms = std::chrono::duration<double, std::chrono::milliseconds::period>;

View File

@@ -186,7 +186,13 @@ bool GLDriver::checkActiveShader()
auto fsShaderKey = static_cast<uint64_t>(fsPgmAddress) << 32;
auto vsShaderKey = static_cast<uint64_t>(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<uint32_t>(latte::Register::VGT_STRMOUT_VTX_STRIDE_0 + 16 * i);
vsShaderKey ^= vgt_strmout_vtx_stride << (1 + 7 * i);
}
}
auto psShaderKey = static_cast<uint64_t>(psPgmAddress) << 32;
psShaderKey ^= static_cast<uint64_t>(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<uint32_t>(latte::Register::VGT_STRMOUT_BUFFER_BASE_0 + 16 * index);
auto vgt_strmout_vtx_stride = getRegister<uint32_t>(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<uint32_t>(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"