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

SPIR-V: Fix a few improper usages of pointers 

Change StoreToResult conversion
This commit is contained in:
Dr. Chat 2016-06-28 09:10:04 -05:00
parent 753911146b
commit 14a6fd838a
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,8 +353,9 @@ void SpirvShaderTranslator::StartTranslation() {
interface_ids_.push_back(frag_coord); interface_ids_.push_back(frag_coord);
interface_ids_.push_back(point_coord); interface_ids_.push_back(point_coord);
auto param = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_, auto param = b.createOp(
{frag_coord, point_coord, 0, 1, 4, 5}); spv::Op::OpVectorShuffle, vec4_float_type_,
{b.createLoad(frag_coord), b.createLoad(point_coord), 0, 1, 4, 5});
/* /*
// TODO: gl_FrontFacing // TODO: gl_FrontFacing
auto param_x = b.createCompositeExtract(param, float_type_, 0); auto param_x = b.createCompositeExtract(param, float_type_, 0);
@ -461,16 +462,26 @@ std::vector<uint8_t> SpirvShaderTranslator::CompleteTranslation() {
b.createStore(p, pos_); b.createStore(p, pos_);
} else { } else {
// Alpha test // Alpha test
auto alpha_test_ptr = b.createAccessChain(
spv::StorageClass::StorageClassPushConstant, push_consts_,
std::vector<Id>({b.makeUintConstant(2)}));
auto alpha_test = b.createLoad(alpha_test_ptr);
auto alpha_test_enabled = b.createCompositeExtract( auto alpha_test_enabled = b.createCompositeExtract(
push_consts_, float_type_, std::vector<uint32_t>{2, 0}); alpha_test, float_type_, std::vector<uint32_t>{0});
auto alpha_test_func = b.createCompositeExtract( auto alpha_test_func = b.createCompositeExtract(alpha_test, float_type_,
push_consts_, float_type_, std::vector<uint32_t>{2, 1}); std::vector<uint32_t>{1});
auto alpha_test_ref = b.createCompositeExtract(push_consts_, float_type_, auto alpha_test_ref = b.createCompositeExtract(alpha_test, float_type_,
std::vector<uint32_t>{2, 2}); std::vector<uint32_t>{2});
alpha_test_func = alpha_test_func =
b.createUnaryOp(spv::Op::OpConvertFToU, uint_type_, alpha_test_func); b.createUnaryOp(spv::Op::OpConvertFToU, uint_type_, alpha_test_func);
auto oC0_alpha = b.createCompositeExtract(frag_outputs_, float_type_,
std::vector<uint32_t>({0, 3})); auto oC0_ptr = b.createAccessChain(
spv::StorageClass::StorageClassOutput, frag_outputs_,
std::vector<Id>({b.makeUintConstant(0)}));
auto oC0_alpha =
b.createCompositeExtract(b.createLoad(oC0_ptr), float_type_, 3);
auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_,
alpha_test_enabled, b.makeFloatConstant(1.f)); alpha_test_enabled, b.makeFloatConstant(1.f));
@ -540,7 +551,7 @@ void SpirvShaderTranslator::PostTranslation(Shader* shader) {
if (FLAGS_spv_validate) { if (FLAGS_spv_validate) {
auto validation = validator_.Validate( auto validation = validator_.Validate(
reinterpret_cast<const uint32_t*>(shader->translated_binary().data()), reinterpret_cast<const uint32_t*>(shader->translated_binary().data()),
shader->translated_binary().size() / 4); shader->translated_binary().size() / sizeof(uint32_t));
if (validation->has_error()) { if (validation->has_error()) {
XELOGE("SPIR-V Shader Validation failed! Error: %s", XELOGE("SPIR-V Shader Validation failed! Error: %s",
validation->error_string()); validation->error_string());
@ -2443,24 +2454,14 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
std::vector<Id> constituents; std::vector<Id> constituents;
auto n_el = b.getNumComponents(source_value_id); auto n_el = b.getNumComponents(source_value_id);
auto n_dst = b.getNumTypeComponents(storage_type); auto n_dst = b.getNumTypeComponents(storage_type);
assert_true(n_el < n_dst);
if (n_el == 1) { std::vector<uint32_t> channels;
// Smear scalar. for (int i = 0; i < n_dst; i++) {
for (int i = 0; i < n_dst; i++) { channels.push_back(i % n_el);
constituents.push_back(source_value_id);
}
} else {
// FIXME: This may not work as intended.
constituents.push_back(source_value_id);
for (int i = n_el; i < n_dst; i++) {
// Pad with zeroes.
constituents.push_back(b.makeFloatConstant(0.f));
}
} }
source_value_id = source_value_id = b.createRvalueSwizzle(spv::NoPrecision, storage_type,
b.createConstructor(spv::NoPrecision, constituents, storage_type); source_value_id, channels);
} }
// swizzle // swizzle
@ -2474,13 +2475,13 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
// Components start from left and are duplicated rightwards // Components start from left and are duplicated rightwards
// e.g. count = 1, xxxx / count = 2, xyyy ... // e.g. count = 1, xxxx / count = 2, xyyy ...
for (int i = 0; i < b.getNumTypeComponents(storage_type); i++) { for (int i = 0; i < b.getNumTypeComponents(storage_type); i++) {
auto swiz = result.components[i];
if (!result.write_mask[i]) { if (!result.write_mask[i]) {
// Undefined / don't care. // Undefined / don't care.
operands.push_back(0); operands.push_back(0);
continue; continue;
} }
auto swiz = result.components[i];
switch (swiz) { switch (swiz) {
case SwizzleSource::kX: case SwizzleSource::kX:
operands.push_back(0); operands.push_back(0);