mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3221 from Themaister/master

Browse Source 
Vulkan: Update SPIRV-Cross.
This commit is contained in:
Twinaphex 2016-07-15 22:17:53 +02:00 committed by GitHub
commit dc9fc004ae
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/SPIRV-Cross vendored

@ -1 +1 @@
Subproject commit 05a97883d2efa8cad6e105eaa39fc1521017238e Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418

8
gfx/drivers_shader/slang_reflection.cpp
View File

@ -247,8 +247,8 @@ static bool add_active_buffer_ranges(const Compiler &compiler, const Resource &r
auto ranges = compiler.get_active_buffer_ranges(resource.id); auto ranges = compiler.get_active_buffer_ranges(resource.id);
for (auto &range : ranges) for (auto &range : ranges)
{ {
auto &name = compiler.get_member_name(resource.type_id, range.index); auto &name = compiler.get_member_name(resource.base_type_id, range.index);
auto &type = compiler.get_type(compiler.get_type(resource.type_id).member_types[range.index]); auto &type = compiler.get_type(compiler.get_type(resource.base_type_id).member_types[range.index]);
unsigned tex_sem_index = 0; unsigned tex_sem_index = 0;
auto sem = slang_uniform_name_to_semantic(*reflection->semantic_map, name); auto sem = slang_uniform_name_to_semantic(*reflection->semantic_map, name);
@ -405,14 +405,14 @@ static bool slang_reflect(const Compiler &vertex_compiler, const Compiler &fragm
{ {
reflection->ubo_stage_mask |= SLANG_STAGE_VERTEX_MASK; reflection->ubo_stage_mask |= SLANG_STAGE_VERTEX_MASK;
reflection->ubo_size = max(reflection->ubo_size, reflection->ubo_size = max(reflection->ubo_size,
vertex_compiler.get_declared_struct_size(vertex_compiler.get_type(vertex.uniform_buffers[0].type_id))); vertex_compiler.get_declared_struct_size(vertex_compiler.get_type(vertex.uniform_buffers[0].base_type_id)));
} }
if (fragment_ubo) if (fragment_ubo)
{ {
reflection->ubo_stage_mask |= SLANG_STAGE_FRAGMENT_MASK; reflection->ubo_stage_mask |= SLANG_STAGE_FRAGMENT_MASK;
reflection->ubo_size = max(reflection->ubo_size, reflection->ubo_size = max(reflection->ubo_size,
fragment_compiler.get_declared_struct_size(fragment_compiler.get_type(fragment.uniform_buffers[0].type_id))); fragment_compiler.get_declared_struct_size(fragment_compiler.get_type(fragment.uniform_buffers[0].base_type_id)));
} }
// Find all relevant uniforms. // Find all relevant uniforms.