Fix for shared data size calculation
This commit is contained in:
parent
69de141249
commit
2f79c852c0
1 changed files with 8 additions and 1 deletions
|
|
@ -93,6 +93,9 @@ public:
|
||||||
|
|
||||||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||||
{
|
{
|
||||||
|
width = 1920;
|
||||||
|
height = 1080;
|
||||||
|
|
||||||
enableTextOverlay = true;
|
enableTextOverlay = true;
|
||||||
title = "Vulkan Example - Compute shader N-body system";
|
title = "Vulkan Example - Compute shader N-body system";
|
||||||
|
|
||||||
|
|
@ -101,6 +104,9 @@ public:
|
||||||
camera.setRotation(glm::vec3(-26.0f, 75.0f, 0.0f));
|
camera.setRotation(glm::vec3(-26.0f, 75.0f, 0.0f));
|
||||||
camera.setTranslation(glm::vec3(0.0f, 0.0f, -14.0f));
|
camera.setTranslation(glm::vec3(0.0f, 0.0f, -14.0f));
|
||||||
camera.movementSpeed = 2.5f;
|
camera.movementSpeed = 2.5f;
|
||||||
|
zoomSpeed = 5.0f;
|
||||||
|
|
||||||
|
paused = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
~VulkanExample()
|
~VulkanExample()
|
||||||
|
|
@ -627,7 +633,8 @@ public:
|
||||||
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(2, offsetof(SpecializationData, power), sizeof(float)));
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(2, offsetof(SpecializationData, power), sizeof(float)));
|
||||||
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(3, offsetof(SpecializationData, soften), sizeof(float)));
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(3, offsetof(SpecializationData, soften), sizeof(float)));
|
||||||
|
|
||||||
specializationData.sharedDataSize = std::min((uint32_t)1024, vulkanDevice->properties.limits.maxComputeSharedMemorySize);
|
specializationData.sharedDataSize = std::min((uint32_t)1024, (uint32_t)(vulkanDevice->properties.limits.maxComputeSharedMemorySize / sizeof(glm::vec4)));
|
||||||
|
|
||||||
specializationData.gravity = 0.002f;
|
specializationData.gravity = 0.002f;
|
||||||
specializationData.power = 0.75f;
|
specializationData.power = 0.75f;
|
||||||
specializationData.soften = 0.05f;
|
specializationData.soften = 0.05f;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue