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

Merge pull request #552 from DrChat/spv_translator 

Fix push constants declaration
This commit is contained in:
Ben Vanik 2016-02-21 11:21:29 -08:00
parent 983479adb5 b83b9c28a1
commit fed6679b32
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,8 @@ void SpirvShaderTranslator::StartTranslation() {
Id push_constants_type = b.makeStructType( Id push_constants_type = b.makeStructType(
{vec4_float_type_, vec4_float_type_, vec4_float_type_, uint_type}, {vec4_float_type_, vec4_float_type_, vec4_float_type_, uint_type},
"push_consts_type"); "push_consts_type");
b.addDecoration(push_constants_type, spv::Decoration::DecorationBlock);
// float4 window_scale; // float4 window_scale;
b.addMemberDecoration( b.addMemberDecoration(
push_constants_type, 0, spv::Decoration::DecorationOffset, push_constants_type, 0, spv::Decoration::DecorationOffset,
@ -297,11 +299,8 @@ std::vector<uint8_t> SpirvShaderTranslator::CompleteTranslation() {
// Apply window scaling // Apply window scaling
// pos.xy *= window_scale.xy // pos.xy *= window_scale.xy
auto p_scaled = b.createUnaryOp(spv::Op::OpCopyObject, vec4_float_type_, p); auto p_scaled =
p_scaled = b.createBinOp(spv::Op::OpFMul, vec4_float_type_, p_scaled, b.createBinOp(spv::Op::OpFMul, vec4_float_type_, p, window_scale);
window_scale);
std::vector<uint32_t> operands({p, p_scaled});
p = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_, p = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_,
{p, p_scaled, 4, 5, 2, 3}); {p, p_scaled, 4, 5, 2, 3});
@ -591,8 +590,6 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
const ParsedAluInstruction& instr) { const ParsedAluInstruction& instr) {
auto& b = *builder_; auto& b = *builder_;
// TODO: instr.is_predicated
Id sources[3] = {0}; Id sources[3] = {0};
Id dest = 0; Id dest = 0;
for (size_t i = 0; i < instr.operand_count; i++) { for (size_t i = 0; i < instr.operand_count; i++) {
@ -732,8 +729,6 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
const ParsedAluInstruction& instr) { const ParsedAluInstruction& instr) {
auto& b = *builder_; auto& b = *builder_;
// TODO: instr.is_predicated
Id sources[3] = {0}; Id sources[3] = {0};
Id dest = 0; Id dest = 0;
for (size_t i = 0, x = 0; i < instr.operand_count; i++) { for (size_t i = 0, x = 0; i < instr.operand_count; i++) {