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

Cleanup, code comments

Browse source
This commit is contained in:
Sascha Willems 2019-03-29 08:07:20 +01:00
parent 358ab9d550
commit 8afe8d825d
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/shaders/negativeviewportheight/quad.frag
View file

@ -8,5 +8,4 @@ layout (location = 0) out vec4 outColor;
void main()
{
outColor = texture(samplerColor, inUV);
outColor.rgb *= vec3(inUV, 0.0f);
}

BIN
data/shaders/negativeviewportheight/quad.frag.spv
View file

Binary file not shown.

2
data/shaders/negativeviewportheight/quad.vert
View file

@ -7,8 +7,6 @@ layout (location = 0) out vec2 outUV;
void main()
{
// outUV = vec2((gl_VertexIndex << 1) & 2, gl_VertexIndex & 2);
// gl_Position = vec4(outUV * 2.0f - 1.0f, 0.0f, 1.0f);
outUV = inUV;
gl_Position = vec4(inPos, 1.0f);
}

34
examples/negativeviewportheight/negativeviewportheight.cpp
View file

@ -1,5 +1,7 @@
/*
* Vulkan Example - Using VK_KHR_MAINTENANCE1 for negative viewport heights
* Vulkan Example - Using negative viewport heights for changing Vulkan's coordinate system
*
* Note: Requires a device that supports VK_KHR_MAINTENANCE1
*
* Copyright (C) by Sascha Willems - www.saschawillems.de
*
@ -37,7 +39,7 @@ public:
vks::Texture2D texture;
VkPipelineLayout pipelineLayout;
VkPipeline pipeline;
VkPipeline pipeline = VK_NULL_HANDLE;
VkDescriptorSetLayout descriptorSetLayout;
VkDescriptorSet descriptorSet;
@ -51,7 +53,7 @@ public:
{
title = "Negative Viewport height";
settings.overlay = true;
// VK_KHR_MAINTENANCE1 is required for using negative viewport heights
// [POI] VK_KHR_MAINTENANCE1 is required for using negative viewport heights
enabledDeviceExtensions.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
}
@ -89,12 +91,14 @@ public:
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
// [POI] Viewport setup
VkViewport viewport{};
if (negativeViewport) {
// When using a negative viewport height, the origin needs to be adjusted too
viewport.x = offsetx;
// [POI] When using a negative viewport height, the origin needs to be adjusted too
viewport.y = (float)height - offsety;
viewport.width = (float)width;
// [POI] Flip the sign of the viewport's height
viewport.height = -(float)height;
}
else {
@ -129,7 +133,7 @@ public:
{
texture.loadFromFile(getAssetPath() + "textures/texture_orientation_test_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue);
// Create two quads with different Y orientations
// [POI] Create two quads with different Y orientations
struct Vertex {
float pos[3];
@ -157,8 +161,8 @@ public:
const VkMemoryPropertyFlags memoryPropertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, memoryPropertyFlags, &quad.verticesYUp, verticesYPos.size() * sizeof(Vertex), verticesYPos.data()));
VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, memoryPropertyFlags, &quad.verticesYDown, verticesYNeg.size() * sizeof(Vertex), verticesYNeg.data()));
VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, memoryPropertyFlags, &quad.verticesYUp, sizeof(Vertex) * 4, verticesYPos.data()));
VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, memoryPropertyFlags, &quad.verticesYDown, sizeof(Vertex) * 4, verticesYNeg.data()));
VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_INDEX_BUFFER_BIT, memoryPropertyFlags, &quad.indices, indices.size() * sizeof(uint32_t), indices.data()));
}
@ -184,14 +188,12 @@ public:
vkUpdateDescriptorSets(device, 1, &writeDescriptorSet, 0, nullptr);
}
void recreatePipeline()
{
vkDestroyPipeline(device, pipeline, nullptr);
preparePipelines();
}
void preparePipelines()
{
if (pipeline != VK_NULL_HANDLE) {
vkDestroyPipeline(device, pipeline, nullptr);
}
const std::vector<VkDynamicState> dynamicStateEnables = { VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR };
VkPipelineInputAssemblyStateCreateInfo inputAssemblyStateCI = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE);
@ -202,8 +204,6 @@ public:
VkPipelineMultisampleStateCreateInfo multisampleStateCI = vks::initializers::pipelineMultisampleStateCreateInfo(VK_SAMPLE_COUNT_1_BIT, 0);
VkPipelineDynamicStateCreateInfo dynamicStateCI = vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables.data(), static_cast<uint32_t>(dynamicStateEnables.size()), 0);
//VkPipelineVertexInputStateCreateInfo emptyInputState = vks::initializers::pipelineVertexInputStateCreateInfo();
VkPipelineRasterizationStateCreateInfo rasterizationStateCI{};
rasterizationStateCI.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
rasterizationStateCI.polygonMode = VK_POLYGON_MODE_FILL;
@ -296,11 +296,11 @@ public:
if (overlay->header("Pipeline")) {
overlay->text("Winding order");
if (overlay->comboBox("##windingorder", &windingOrder, { "clock wise", "counter clock wise" })) {
recreatePipeline();
preparePipelines();
}
overlay->text("Cull mode");
if (overlay->comboBox("##cullmode", &cullMode, { "none", "front face", "back face" })) {
recreatePipeline();
preparePipelines();
}
}
}