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

[Vulkan] Better macro for channel swizzling.

This commit is contained in:
gibbed 2018-05-23 20:31:33 -05:00
parent e9290cd2e0
commit 4613c6b8b8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/xenia/gpu/vulkan/texture_cache.cc
View File

@ -600,21 +600,25 @@ TextureCache::TextureView* TextureCache::DemandView(Texture* texture,
swiz_component_map[(swizzle >> 9) & 0x7], swiz_component_map[(swizzle >> 9) & 0x7],
}; };
#define GET_CHANNEL(x) \ #define SWIZZLE_CHANNEL(x) \
config.swizzle_##x >= 0 \ { \
? unswizzled_channels[config.swizzle_##x] \ assert_true((config.swizzle_##x >= 0 && \
: ((-(config.swizzle_##x) - 1) < xe::countof(swiz_component_map) \ config.swizzle_##x < xe::countof(unswizzled_channels)) || \
? swiz_component_map[-(config.swizzle_##x) - 1] \ (config.swizzle_##x < 0 && \
: VK_COMPONENT_SWIZZLE_IDENTITY) config.swizzle_##x >= \
-static_cast<int>(xe::countof(swiz_component_map)))); \
view_info.components.x = \
config.swizzle_##x >= 0 \
? unswizzled_channels[config.swizzle_##x] \
: swiz_component_map[-(config.swizzle_##x) - 1]; \
}
view_info.components = { SWIZZLE_CHANNEL(r);
GET_CHANNEL(r), SWIZZLE_CHANNEL(g);
GET_CHANNEL(g), SWIZZLE_CHANNEL(b);
GET_CHANNEL(b), SWIZZLE_CHANNEL(a);
GET_CHANNEL(a),
};
#undef GET_CHANNEL #undef SWIZZLE_CHANNEL
view_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, view_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0,
texture->texture_info.mip_levels, 0, 1}; texture->texture_info.mip_levels, 0, 1};