ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SPIR-V] Fix invalid 1D texture offsets

This commit is contained in:
DrChat 2017-12-22 22:23:43 -06:00
parent fb89973266
commit 366e8b1b6a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/gpu/spirv_shader_translator.cc
View File

@ -905,11 +905,9 @@ void SpirvShaderTranslator::ProcessLoopStartInstruction(
// loop_count_ = uvec4(loop_count_value, loop_count_.xyz); // loop_count_ = uvec4(loop_count_value, loop_count_.xyz);
auto loop_count = b.createLoad(loop_count_); auto loop_count = b.createLoad(loop_count_);
loop_count = loop_count = b.createRvalueSwizzle(spv::NoPrecision, vec4_uint_type_, loop_count,
b.createRvalueSwizzle(spv::NoPrecision, vec4_uint_type_, loop_count,
std::vector<uint32_t>({0, 0, 1, 2})); std::vector<uint32_t>({0, 0, 1, 2}));
loop_count = loop_count = b.createCompositeInsert(loop_count_value, loop_count, vec4_uint_type_, 0);
b.createCompositeInsert(loop_count_value, loop_count, vec4_uint_type_, 0);
b.createStore(loop_count, loop_count_); b.createStore(loop_count, loop_count_);
// aL = aL.xxyz; // aL = aL.xxyz;
@ -1461,9 +1459,14 @@ void SpirvShaderTranslator::ProcessTextureFetchInstruction(
if (instr.dimension == TextureDimension::k1D) { if (instr.dimension == TextureDimension::k1D) {
if (instr.attributes.offset_x) { if (instr.attributes.offset_x) {
auto offset = b.makeFloatConstant(instr.attributes.offset_x + 0.5f); auto offset = b.makeCompositeConstant(
offset = b.createBinOp(spv::Op::OpFDiv, float_type_, offset, size); vec2_float_type_,
src = b.createBinOp(spv::Op::OpFAdd, float_type_, src, offset); std::vector<Id>(
{b.makeFloatConstant(instr.attributes.offset_x + 0.5f),
b.makeFloatConstant(0.f)}));
offset =
b.createBinOp(spv::Op::OpFDiv, vec2_float_type_, offset, size);
src = b.createBinOp(spv::Op::OpFAdd, vec2_float_type_, src, offset);
} }
// https://msdn.microsoft.com/en-us/library/windows/desktop/bb944006.aspx // https://msdn.microsoft.com/en-us/library/windows/desktop/bb944006.aspx
// "Because the runtime does not support 1D textures, the compiler will // "Because the runtime does not support 1D textures, the compiler will