Merge branch 'master' into develop

This commit is contained in:
saschawillems 2017-05-11 19:21:07 +02:00
commit ead59682c1
2 changed files with 13 additions and 2 deletions

View file

@ -1,7 +1,7 @@
language: cpp
sudo: required
os: linux
dist: xenial
dist: trusty
compiler:
- clang
- gcc
@ -14,6 +14,6 @@ script:
notifications:
email:
recipients:
- webmaster@saschawillems.dev
- webmaster@saschawillems.de
on_success: change
on_failure: always

View file

@ -267,6 +267,17 @@ public:
uniformBufferVS.destroy();
}
virtual void getEnabledFeatures()
{
if (deviceFeatures.sparseBinding && deviceFeatures.sparseResidencyImage2D) {
enabledFeatures.sparseBinding = VK_TRUE;
enabledFeatures.sparseResidencyImage2D = VK_TRUE;
}
else {
std::cout << "Sparse binding not supported" << std::endl;
}
}
glm::uvec3 alignedDivision(const VkExtent3D& extent, const VkExtent3D& granularity)
{
glm::uvec3 res;