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

Code cleanup (compiler warnings, refs #103)

Browse source
This commit is contained in:
saschawillems 2017-04-23 12:07:18 +02:00
parent ba0cc82e50
commit 09daa0049c
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pbribl/pbribl.cpp
View file

@ -41,7 +41,7 @@ struct Material {
float r, g, b; float r, g, b;
std::string name; std::string name;
Material() {}; Material() {};
Material(std::string n, glm::vec3 c) : name(n), r(c.r), g(c.g), b(c.b) { }; Material(std::string n, glm::vec3 c) : r(c.r), g(c.g), b(c.b), name(n) { };
}; };
class VulkanExample : public VulkanExampleBase class VulkanExample : public VulkanExampleBase
@ -184,7 +184,7 @@ public:
renderPassBeginInfo.clearValueCount = 2; renderPassBeginInfo.clearValueCount = 2;
renderPassBeginInfo.pClearValues = clearValues; renderPassBeginInfo.pClearValues = clearValues;
for (int32_t i = 0; i < drawCmdBuffers.size(); ++i) for (size_t i = 0; i < drawCmdBuffers.size(); ++i)
{ {
// Set target frame buffer // Set target frame buffer
renderPassBeginInfo.framebuffer = frameBuffers[i]; renderPassBeginInfo.framebuffer = frameBuffers[i];
@ -585,7 +585,6 @@ public:
VkRect2D scissor = vks::initializers::rect2D(dim, dim, 0, 0); VkRect2D scissor = vks::initializers::rect2D(dim, dim, 0, 0);
vkCmdSetViewport(cmdBuf, 0, 1, &viewport); vkCmdSetViewport(cmdBuf, 0, 1, &viewport);
vkCmdSetScissor(cmdBuf, 0, 1, &scissor); vkCmdSetScissor(cmdBuf, 0, 1, &scissor);
VkDeviceSize offsets[1] = { 0 };
vkCmdBindPipeline(cmdBuf, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); vkCmdBindPipeline(cmdBuf, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
vkCmdDraw(cmdBuf, 3, 1, 0, 0); vkCmdDraw(cmdBuf, 3, 1, 0, 0);
vkCmdEndRenderPass(cmdBuf); vkCmdEndRenderPass(cmdBuf);
@ -883,7 +882,6 @@ public:
glm::rotate(glm::mat4(), glm::radians(180.0f), glm::vec3(0.0f, 0.0f, 1.0f)), glm::rotate(glm::mat4(), glm::radians(180.0f), glm::vec3(0.0f, 0.0f, 1.0f)),
}; };
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
VkCommandBuffer cmdBuf = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); VkCommandBuffer cmdBuf = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
VkViewport viewport = vks::initializers::viewport((float)dim, (float)dim, 0.0f, 1.0f); VkViewport viewport = vks::initializers::viewport((float)dim, (float)dim, 0.0f, 1.0f);
@ -1278,7 +1276,6 @@ public:
glm::rotate(glm::mat4(), glm::radians(180.0f), glm::vec3(0.0f, 0.0f, 1.0f)), glm::rotate(glm::mat4(), glm::radians(180.0f), glm::vec3(0.0f, 0.0f, 1.0f)),
}; };
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
VkCommandBuffer cmdBuf = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); VkCommandBuffer cmdBuf = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
VkViewport viewport = vks::initializers::viewport((float)dim, (float)dim, 0.0f, 1.0f); VkViewport viewport = vks::initializers::viewport((float)dim, (float)dim, 0.0f, 1.0f);