summaryrefslogtreecommitdiffstats
path: root/src/shader_recompiler/backend/spirv/emit_context.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-06-18 01:34:58 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:38 +0200
commit59fead3a47227b513c0ca35090919823f44faecf (patch)
tree0e80ab3e37cb6dd6d350b9e582268085a5c52a99 /src/shader_recompiler/backend/spirv/emit_context.cpp
parentspirv: Handle small storage buffer loads on devices with no support (diff)
downloadyuzu-59fead3a47227b513c0ca35090919823f44faecf.tar
yuzu-59fead3a47227b513c0ca35090919823f44faecf.tar.gz
yuzu-59fead3a47227b513c0ca35090919823f44faecf.tar.bz2
yuzu-59fead3a47227b513c0ca35090919823f44faecf.tar.lz
yuzu-59fead3a47227b513c0ca35090919823f44faecf.tar.xz
yuzu-59fead3a47227b513c0ca35090919823f44faecf.tar.zst
yuzu-59fead3a47227b513c0ca35090919823f44faecf.zip
Diffstat (limited to '')
-rw-r--r--src/shader_recompiler/backend/spirv/emit_context.cpp52
1 files changed, 30 insertions, 22 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp
index 32c21f3b4..4c6501129 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_context.cpp
@@ -911,37 +911,45 @@ void EmitContext::DefineConstantBuffers(const Info& info, u32& binding) {
if (info.constant_buffer_descriptors.empty()) {
return;
}
- if (profile.support_descriptor_aliasing) {
- if (True(info.used_constant_buffer_types & IR::Type::U8)) {
+ IR::Type types{info.used_constant_buffer_types};
+ if (!profile.support_descriptor_aliasing) {
+ DefineConstBuffers(*this, info, &UniformDefinitions::U32x4, binding, U32[4], 'u',
+ sizeof(u32[4]));
+ for (const ConstantBufferDescriptor& desc : info.constant_buffer_descriptors) {
+ binding += desc.count;
+ }
+ }
+ if (True(types & IR::Type::U8)) {
+ if (profile.support_int8) {
DefineConstBuffers(*this, info, &UniformDefinitions::U8, binding, U8, 'u', sizeof(u8));
DefineConstBuffers(*this, info, &UniformDefinitions::S8, binding, S8, 's', sizeof(s8));
+ } else {
+ types |= IR::Type::U32;
}
- if (True(info.used_constant_buffer_types & IR::Type::U16)) {
+ }
+ if (True(types & IR::Type::U16)) {
+ if (profile.support_int16) {
DefineConstBuffers(*this, info, &UniformDefinitions::U16, binding, U16, 'u',
sizeof(u16));
DefineConstBuffers(*this, info, &UniformDefinitions::S16, binding, S16, 's',
sizeof(s16));
+ } else {
+ types |= IR::Type::U32;
}
- if (True(info.used_constant_buffer_types & IR::Type::U32)) {
- DefineConstBuffers(*this, info, &UniformDefinitions::U32, binding, U32[1], 'u',
- sizeof(u32));
- }
- if (True(info.used_constant_buffer_types & IR::Type::F32)) {
- DefineConstBuffers(*this, info, &UniformDefinitions::F32, binding, F32[1], 'f',
- sizeof(f32));
- }
- if (True(info.used_constant_buffer_types & IR::Type::U32x2)) {
- DefineConstBuffers(*this, info, &UniformDefinitions::U32x2, binding, U32[2], 'u',
- sizeof(u32[2]));
- }
- binding += static_cast<u32>(info.constant_buffer_descriptors.size());
- } else {
- DefineConstBuffers(*this, info, &UniformDefinitions::U32x4, binding, U32[4], 'u',
- sizeof(u32[4]));
- for (const ConstantBufferDescriptor& desc : info.constant_buffer_descriptors) {
- binding += desc.count;
- }
}
+ if (True(types & IR::Type::U32)) {
+ DefineConstBuffers(*this, info, &UniformDefinitions::U32, binding, U32[1], 'u',
+ sizeof(u32));
+ }
+ if (True(types & IR::Type::F32)) {
+ DefineConstBuffers(*this, info, &UniformDefinitions::F32, binding, F32[1], 'f',
+ sizeof(f32));
+ }
+ if (True(types & IR::Type::U32x2)) {
+ DefineConstBuffers(*this, info, &UniformDefinitions::U32x2, binding, U32[2], 'u',
+ sizeof(u32[2]));
+ }
+ binding += static_cast<u32>(info.constant_buffer_descriptors.size());
}
void EmitContext::DefineStorageBuffers(const Info& info, u32& binding) {