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

Merge branch 'master' of github.com:benvanik/xenia

This commit is contained in:
DrChat 2017-03-14 18:48:58 -05:00
parent 855ebb9cfe 44e7c3712a
commit 3120fab85d
1 changed files with 8 additions and 9 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

@ -117,6 +117,14 @@ void SpirvShaderTranslator::StartTranslation() {
Id loop_consts_type = b.makeArrayType(uint_type_, b.makeUintConstant(32), 1); Id loop_consts_type = b.makeArrayType(uint_type_, b.makeUintConstant(32), 1);
Id bool_consts_type = b.makeArrayType(uint_type_, b.makeUintConstant(8), 1); Id bool_consts_type = b.makeArrayType(uint_type_, b.makeUintConstant(8), 1);
// Strides
b.addDecoration(float_consts_type, spv::Decoration::DecorationArrayStride,
4 * sizeof(float));
b.addDecoration(loop_consts_type, spv::Decoration::DecorationArrayStride,
sizeof(uint32_t));
b.addDecoration(bool_consts_type, spv::Decoration::DecorationArrayStride,
sizeof(uint32_t));
Id consts_struct_type = b.makeStructType( Id consts_struct_type = b.makeStructType(
{float_consts_type, loop_consts_type, bool_consts_type}, "consts_type"); {float_consts_type, loop_consts_type, bool_consts_type}, "consts_type");
b.addDecoration(consts_struct_type, spv::Decoration::DecorationBlock); b.addDecoration(consts_struct_type, spv::Decoration::DecorationBlock);
@ -124,25 +132,16 @@ void SpirvShaderTranslator::StartTranslation() {
// Constants member decorations. // Constants member decorations.
b.addMemberDecoration(consts_struct_type, 0, b.addMemberDecoration(consts_struct_type, 0,
spv::Decoration::DecorationOffset, 0); spv::Decoration::DecorationOffset, 0);
b.addMemberDecoration(consts_struct_type, 0,
spv::Decoration::DecorationArrayStride,
4 * sizeof(float));
b.addMemberName(consts_struct_type, 0, "float_consts"); b.addMemberName(consts_struct_type, 0, "float_consts");
b.addMemberDecoration(consts_struct_type, 1, b.addMemberDecoration(consts_struct_type, 1,
spv::Decoration::DecorationOffset, spv::Decoration::DecorationOffset,
512 * 4 * sizeof(float)); 512 * 4 * sizeof(float));
b.addMemberDecoration(consts_struct_type, 1,
spv::Decoration::DecorationArrayStride,
sizeof(uint32_t));
b.addMemberName(consts_struct_type, 1, "loop_consts"); b.addMemberName(consts_struct_type, 1, "loop_consts");
b.addMemberDecoration(consts_struct_type, 2, b.addMemberDecoration(consts_struct_type, 2,
spv::Decoration::DecorationOffset, spv::Decoration::DecorationOffset,
512 * 4 * sizeof(float) + 32 * sizeof(uint32_t)); 512 * 4 * sizeof(float) + 32 * sizeof(uint32_t));
b.addMemberDecoration(consts_struct_type, 2,
spv::Decoration::DecorationArrayStride,
sizeof(uint32_t));
b.addMemberName(consts_struct_type, 2, "bool_consts"); b.addMemberName(consts_struct_type, 2, "bool_consts");
consts_ = b.createVariable(spv::StorageClass::StorageClassUniform, consts_ = b.createVariable(spv::StorageClass::StorageClassUniform,