claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Buffer sizes

Browse source 
refs #386
This commit is contained in:
saschawillems 2017-10-21 16:05:27 +02:00
parent f289863a1b
commit ef067b0cf7
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
terraintessellation/terraintessellation.cpp
View file

@ -361,7 +361,7 @@ public:
vkCmdBindIndexBuffer(drawCmdBuffers[i], models.skysphere.indices.buffer, 0, VK_INDEX_TYPE_UINT32); vkCmdBindIndexBuffer(drawCmdBuffers[i], models.skysphere.indices.buffer, 0, VK_INDEX_TYPE_UINT32);
vkCmdDrawIndexed(drawCmdBuffers[i], models.skysphere.indexCount, 1, 0, 0, 0); vkCmdDrawIndexed(drawCmdBuffers[i], models.skysphere.indexCount, 1, 0, 0, 0);
// Terrrain // Terrain
if (deviceFeatures.pipelineStatisticsQuery) { if (deviceFeatures.pipelineStatisticsQuery) {
// Begin pipeline statistics query // Begin pipeline statistics query
vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT); vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT);
@ -443,7 +443,8 @@ public:
#define PATCH_SIZE 64 #define PATCH_SIZE 64
#define UV_SCALE 1.0f #define UV_SCALE 1.0f
Vertex *vertices = new Vertex[PATCH_SIZE * PATCH_SIZE * 4]; const uint32_t vertexCount = PATCH_SIZE * PATCH_SIZE;
Vertex *vertices = new Vertex[vertexCount];
const float wx = 2.0f; const float wx = 2.0f;
const float wy = 2.0f; const float wy = 2.0f;
@ -480,7 +481,7 @@ public:
} }
} }
// Calcualte the normal // Calculate the normal
glm::vec3 normal; glm::vec3 normal;
// Gx sobel filter // Gx sobel filter
normal.x = heights[0][0] - heights[2][0] + 2.0f * heights[0][1] - 2.0f * heights[2][1] + heights[0][2] - heights[2][2]; normal.x = heights[0][0] - heights[2][0] + 2.0f * heights[0][1] - 2.0f * heights[2][1] + heights[0][2] - heights[2][2];
@ -496,7 +497,8 @@ public:
// Indices // Indices
const uint32_t w = (PATCH_SIZE - 1); const uint32_t w = (PATCH_SIZE - 1);
uint32_t *indices = new uint32_t[w * w * 4]; const uint32_t indexCount = w * w * 4;
uint32_t *indices = new uint32_t[indexCount];
for (auto x = 0; x < w; x++) for (auto x = 0; x < w; x++)
{ {
for (auto y = 0; y < w; y++) for (auto y = 0; y < w; y++)
@ -508,10 +510,10 @@ public:
indices[index + 3] = indices[index] + 1; indices[index + 3] = indices[index] + 1;
} }
} }
models.terrain.indexCount = (PATCH_SIZE - 1) * (PATCH_SIZE - 1) * 4; models.terrain.indexCount = indexCount;
uint32_t vertexBufferSize = (PATCH_SIZE * PATCH_SIZE * 4) * sizeof(Vertex); uint32_t vertexBufferSize = vertexCount * sizeof(Vertex);
uint32_t indexBufferSize = (w * w * 4) * sizeof(uint32_t); uint32_t indexBufferSize = indexCount * sizeof(uint32_t);
struct { struct {
VkBuffer buffer; VkBuffer buffer;
@ -751,6 +753,7 @@ public:
VK_DYNAMIC_STATE_SCISSOR, VK_DYNAMIC_STATE_SCISSOR,
VK_DYNAMIC_STATE_LINE_WIDTH VK_DYNAMIC_STATE_LINE_WIDTH
}; };
VkPipelineDynamicStateCreateInfo dynamicState = VkPipelineDynamicStateCreateInfo dynamicState =
vks::initializers::pipelineDynamicStateCreateInfo( vks::initializers::pipelineDynamicStateCreateInfo(
dynamicStateEnables.data(), dynamicStateEnables.data(),