diff --git a/README.md b/README.md index fc0e545..e05f039 100644 --- a/README.md +++ b/README.md @@ -1,128 +1,42 @@ -Instructions - Vulkan Grass Rendering +README - Vulkan Grass Rendering ======================== -This is due **Sunday 11/4, evening at midnight**. +**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 6** -**Summary:** -In this project, you will use Vulkan to implement a grass simulator and renderer. You will -use compute shaders to perform physics calculations on Bezier curves that represent individual -grass blades in your application. Since rendering every grass blade on every frame will is fairly -inefficient, you will also use compute shaders to cull grass blades that don't contribute to a given frame. -The remaining blades will be passed to a graphics pipeline, in which you will write several shaders. -You will write a vertex shader to transform Bezier control points, tessellation shaders to dynamically create -the grass geometry from the Bezier curves, and a fragment shader to shade the grass blades. +* Zach Corse + * LinkedIn: https://www.linkedin.com/in/wzcorse/ + * Personal Website: https://wzcorse.com + * Twitter: @ZachCorse +* Tested on: Windows 10, i7-6700HQ @ 2.60GHz 32GB, NVIDIA GeForce GTX 970M (personal computer) -The base code provided includes all of the basic Vulkan setup, including a compute pipeline that will run your compute -shaders and two graphics pipelines, one for rendering the geometry that grass will be placed on and the other for -rendering the grass itself. Your job will be to write the shaders for the grass graphics pipeline and the compute pipeline, -as well as binding any resources (descriptors) you may need to accomplish the tasks described in this assignment. +Introduction +------------ +In this project, I use Vulkan to implement a grass simulator and renderer. I use compute shaders to perform physics calculations on Bezier curves that represent individual grass blades. Since rendering every grass blade on every frame is fairly inefficient, I also use compute shaders to cull grass blades that don't contribute to a given frame. -![](img/grass.gif) ![](img/grass2.gif) +![](img/grass_forces.gif) -You are not required to use this base code if you don't want -to. You may also change any part of the base code as you please. -**This is YOUR project.** The above .gifs are just examples that you -can use as a reference to compare to. Feel free to get creative with your implementations! - -**Important:** -- If you are not in CGGT/DMD, you may replace this project with a GPU compute -project. You MUST get this pre-approved by Ottavio before continuing! - -### Contents - -* `src/` C++/Vulkan source files. - * `shaders/` glsl shader source files - * `images/` images used as textures within graphics pipelines -* `external/` Includes and static libraries for 3rd party libraries. -* `img/` Screenshots and images to use in your READMEs - -### Installing Vulkan - -In order to run a Vulkan project, you first need to download and install the [Vulkan SDK](https://vulkan.lunarg.com/). -Make sure to run the downloaded installed as administrator so that the installer can set the appropriate environment -variables for you. - -Once you have done this, you need to make sure your GPU driver supports Vulkan. Download and install a -[Vulkan driver](https://developer.nvidia.com/vulkan-driver) from NVIDIA's website. - -Finally, to check that Vulkan is ready for use, go to your Vulkan SDK directory (`C:/VulkanSDK/` unless otherwise specified) -and run the `cube.exe` example within the `Bin` directory. IF you see a rotating gray cube with the LunarG logo, then you -are all set! - -### Running the code - -While developing your grass renderer, you will want to keep validation layers enabled so that error checking is turned on. -The project is set up such that when you are in `debug` mode, validation layers are enabled, and when you are in `release` mode, -validation layers are disabled. After building the code, you should be able to run the project without any errors. You will see a plane with a grass texture on it to begin with. - -![](img/cube_demo.png) - -## Requirements - -**Ask on the mailing list for any clarifications.** - -In this project, you are given the following code: - -* The basic setup for a Vulkan project, including the swapchain, physical device, logical device, and the pipelines described above. -* Structs for some of the uniform buffers you will be using. -* Some buffer creation utility functions. -* A simple interactive camera using the mouse. - -You need to implement the following features/pipeline stages: - -* Compute shader (`shaders/compute.comp`) -* Grass pipeline stages - * Vertex shader (`shaders/grass.vert') - * Tessellation control shader (`shaders/grass.tesc`) - * Tessellation evaluation shader (`shaders/grass.tese`) - * Fragment shader (`shaders/grass.frag`) -* Binding of any extra descriptors you may need - -See below for more guidance. - -## Base Code Tour - -Areas that you need to complete are -marked with a `TODO` comment. Functions that are useful -for reference are marked with the comment `CHECKITOUT`. - -* `src/main.cpp` is the entry point of our application. -* `src/Instance.cpp` sets up the application state, initializes the Vulkan library, and contains functions that will create our -physical and logical device handles. -* `src/Device.cpp` manages the logical device and sets up the queues that our command buffers will be submitted to. -* `src/Renderer.cpp` contains most of the rendering implementation, including Vulkan setup and resource creation. You will -likely have to make changes to this file in order to support changes to your pipelines. -* `src/Camera.cpp` manages the camera state. -* `src/Model.cpp` manages the state of the model that grass will be created on. Currently a plane is hardcoded, but feel free to -update this with arbitrary model loading! -* `src/Blades.cpp` creates the control points corresponding to the grass blades. There are many parameters that you can play with -here that will change the behavior of your rendered grass blades. -* `src/Scene.cpp` manages the scene state, including the model, blades, and simualtion time. -* `src/BufferUtils.cpp` provides helper functions for creating buffers to be used as descriptors. - -We left out descriptions for a couple files that you likely won't have to modify. Feel free to investigate them to understand their -importance within the scope of the project. +Features +------------ +1. Gravity, Wind, and Recovery Forces Calculated in Compute Shader +2. Updated Tesselation Shaders +3. Grass Blade Culling + * Distance + * Frustum + * Orientation ## Grass Rendering This project is an implementation of the paper, [Responsive Real-Time Grass Rendering for General 3D Scenes](https://www.cg.tuwien.ac.at/research/publications/2017/JAHRMANN-2017-RRTG/JAHRMANN-2017-RRTG-draft.pdf). -Please make sure to use this paper as a primary resource while implementing your grass renderers. It does a great job of explaining -the key algorithms and math you will be using. Below is a brief description of the different components in chronological order of how your renderer will -execute, but feel free to develop the components in whatever order you prefer. - -We recommend starting with trying to display the grass blades without any forces on them before trying to add any forces on the blades themselves. Here is an example of what that may look like: - -![](img/grass_basic.gif) ### Representing Grass as Bezier Curves -In this project, grass blades will be represented as Bezier curves while performing physics calculations and culling operations. +Grass blades are represented as Bezier curves while performing physics calculations and culling operations. Each Bezier curve has three control points. * `v0`: the position of the grass blade on the geomtry * `v1`: a Bezier curve guide that is always "above" `v0` with respect to the grass blade's up vector (explained soon) * `v2`: a physical guide for which we simulate forces on -We also need to store per-blade characteristics that will help us simulate and tessellate our grass blades correctly. +We also store per-blade characteristics that will help us simulate and tessellate our grass blades correctly. * `up`: the blade's up vector, which corresponds to the normal of the geometry that the grass blade resides on at `v0` * Orientation: the orientation of the grass blade's face * Height: the height of the grass blade @@ -134,119 +48,69 @@ We can pack all this data into four `vec4`s, such that `v0.w` holds orientation, ![](img/blade_model.jpg) -### Simulating Forces +### Tesselation Shader and Rendering Basic Grass -In this project, you will be simulating forces on grass blades while they are still Bezier curves. This will be done in a compute -shader using the compute pipeline that has been created for you. Remember that `v2` is our physical guide, so we will be -applying transformations to `v2` initially, then correcting for potential errors. We will finally update `v1` to maintain the appropriate -length of our grass blade. +Without physics calculations in the compute shader, grass is rendered as straight blades after tesselation and fragment shading. -#### Binding Resources +![](img/grass_straight.gif) -In order to update the state of your grass blades on every frame, you will need to create a storage buffer to maintain the grass data. -You will also need to pass information about how much time has passed in the simulation and the time since the last frame. To do this, -you can extend or create descriptor sets that will be bound to the compute pipeline. +### Simulating Forces in Compute Shader #### Gravity -Given a gravity direction, `D.xyz`, and the magnitude of acceleration, `D.w`, we can compute the environmental gravity in -our scene as `gE = normalize(D.xyz) * D.w`. +Gravity is added in the usual way: `gE = vec3(0, -9.8, 0)` -We then determine the contribution of the gravity with respect to the front facing direction of the blade, `f`, +We determine the contribution of gravity with respect to the front facing direction of the blade, `f`, as a term called the "front gravity". Front gravity is computed as `gF = (1/4) * ||gE|| * f`. -We can then determine the total gravity on the grass blade as `g = gE + gF`. +The total gravity on the grass blade is `g = gE + gF`. #### Recovery Recovery corresponds to the counter-force that brings our grass blade back into equilibrium. This is derived in the paper using Hooke's law. -In order to determine the recovery force, we need to compare the current position of `v2` to its original position before + +In order to determine the recovery force, we compare the current position of `v2` to its original position before the simulation started, `iv2`. At the beginning of our simulation, `v1` and `v2` are initialized to be a distance of the blade height along the `up` vector. Once we have `iv2`, we can compute the recovery forces as `r = (iv2 - v2) * stiffness`. #### Wind -In order to simulate wind, you are at liberty to create any wind function you want! In order to have something interesting, -you can make the function depend on the position of `v0` and a function that changes with time. Consider using some combination -of sine or cosine functions. - -Your wind function will determine a wind direction that is affecting the blade, but it is also worth noting that wind has a larger impact on -grass blades whose forward directions are parallel to the wind direction. The paper describes this as a "wind alignment" term. We won't go -over the exact math here, but use the paper as a reference when implementing this. It does a great job of explaining this! +Wind is calculated as `vec(v_x, 0, v_z) * sin(time)` (a sinusoidal force along a particular wind direction). -Once you have a wind direction and a wind alignment term, your total wind force (`w`) will be `windDirection * windAlignment`. +#### Total Force -#### Total force +Total force is calculated as `tF = (gravity + recovery + wind) * deltaTime`. -We can then determine a translation for `v2` based on the forces as `tv2 = (gravity + recovery + wind) * deltaTime`. However, we can't simply -apply this translation and expect the simulation to be robust. Our forces might push `v2` under the ground! Similarly, moving `v2` but leaving -`v1` in the same position will cause our grass blade to change length, which doesn't make sense. +#### Positional Corrections -Read section 5.2 of the paper in order to learn how to determine the corrected final positions for `v1` and `v2`. +I followed section 5.2 of the paper referenced to determine the corrected final positions for `v1` and `v2` (these corrections ensure that grass doesn't pass below ground plane and maintains a proper length). -### Culling tests +![](img/grass_forces.gif) -Although we need to simulate forces on every grass blade at every frame, there are many blades that we won't need to render -due to a variety of reasons. Here are some heuristics we can use to cull blades that won't contribute positively to a given frame. +### Culling Tests -#### Orientation culling +* Orientation: Blades whose normals are perpendicular to the look vector are culled. We can't see these! +* Frustum: Blades that are outside the viewing frustum are culled. +* Distance: Blades that are sufficiently far from the camera (less than a pixel in size) are culled. Additionally, more blades are culled as function of distance from the camera (blades are binned into discrete intervals). -Consider the scenario in which the front face direction of the grass blade is perpendicular to the view vector. Since our grass blades -won't have width, we will end up trying to render parts of the grass that are actually smaller than the size of a pixel. This could -lead to aliasing artifacts. +Performance +------------ -In order to remedy this, we can cull these blades! Simply do a dot product test to see if the view vector and front face direction of -the blade are perpendicular. The paper uses a threshold value of `0.9` to cull, but feel free to use what you think looks best. +#### FPS Performance as a function of number of grass blades -#### View-frustum culling +We see in the below graph that as the number of grass blades increases, our performance (in FPS) decreases (Note: x-axis is log scale). -We also want to cull blades that are outside of the view-frustum, considering they won't show up in the frame anyway. To determine if -a grass blade is in the view-frustum, we want to compare the visibility of three points: `v0, v2, and m`, where `m = (1/4)v0 * (1/2)v1 * (1/4)v2`. -Notice that we aren't using `v1` for the visibility test. This is because the `v1` is a Bezier guide that doesn't represent a position on the grass blade. -We instead use `m` to approximate the midpoint of our Bezier curve. +![pic1](img/FPS_vs_Grass.png) -If all three points are outside of the view-frustum, we will cull the grass blade. The paper uses a tolerance value for this test so that we are culling -blades a little more conservatively. This can help with cases in which the Bezier curve is technically not visible, but we might be able to see the blade -if we consider its width. +#### FPS Performance improvements using culling -#### Distance culling +As expected, each successive culling operation improves performance. We see the biggest performance boost with orientation culling. -Similarly to orientation culling, we can end up with grass blades that at large distances are smaller than the size of a pixel. This could lead to additional -artifacts in our renders. In this case, we can cull grass blades as a function of their distance from the camera. +![pic2](img/FPS_vs_Culling.png) -You are free to define two parameters here. -* A max distance afterwhich all grass blades will be culled. -* A number of buckets to place grass blades between the camera and max distance into. - -Define a function such that the grass blades in the bucket closest to the camera are kept while an increasing number of grass blades -are culled with each farther bucket. - -#### Occlusion culling (extra credit) - -This type of culling only makes sense if our scene has additional objects aside from the plane and the grass blades. We want to cull grass blades that -are occluded by other geometry. Think about how you can use a depth map to accomplish this! - -### Tessellating Bezier curves into grass blades - -In this project, you should pass in each Bezier curve as a single patch to be processed by your grass graphics pipeline. You will tessellate this patch into -a quad with a shape of your choosing (as long as it looks sufficiently like grass of course). The paper has some examples of grass shapes you can use as inspiration. - -In the tessellation control shader, specify the amount of tessellation you want to occur. Remember that you need to provide enough detail to create the curvature of a grass blade. - -The generated vertices will be passed to the tessellation evaluation shader, where you will place the vertices in world space, respecting the width, height, and orientation information -of each blade. Once you have determined the world space position of each vector, make sure to set the output `gl_Position` in clip space! - -** Extra Credit**: Tessellate to varying levels of detail as a function of how far the grass blade is from the camera. For example, if the blade is very far, only generate four vertices in the tessellation control shader. - -To build more intuition on how tessellation works, I highly recommend playing with the [helloTessellation sample](https://github.com/CIS565-Fall-2018/Vulkan-Samples/tree/master/samples/5_helloTessellation) -and reading this [tutorial on tessellation](http://in2gpu.com/2014/07/12/tessellation-tutorial-opengl-4-3/). - -## Resources - -### Links - -The following resources may be useful for this project. +Links +------------ * [Responsive Real-Time Grass Grass Rendering for General 3D Scenes](https://www.cg.tuwien.ac.at/research/publications/2017/JAHRMANN-2017-RRTG/JAHRMANN-2017-RRTG-draft.pdf) * [CIS565 Vulkan samples](https://github.com/CIS565-Fall-2018/Vulkan-Samples) @@ -254,47 +118,3 @@ The following resources may be useful for this project. * [Vulkan tutorial](https://vulkan-tutorial.com/) * [RenderDoc blog on Vulkan](https://renderdoc.org/vulkan-in-30-minutes.html) * [Tessellation tutorial](http://in2gpu.com/2014/07/12/tessellation-tutorial-opengl-4-3/) - - -## Third-Party Code Policy - -* Use of any third-party code must be approved by asking on our Google Group. -* If it is approved, all students are welcome to use it. Generally, we approve - use of third-party code that is not a core part of the project. For example, - for the path tracer, we would approve using a third-party library for loading - models, but would not approve copying and pasting a CUDA function for doing - refraction. -* Third-party code **MUST** be credited in README.md. -* Using third-party code without its approval, including using another - student's code, is an academic integrity violation, and will, at minimum, - result in you receiving an F for the semester. - - -## README - -* A brief description of the project and the specific features you implemented. -* GIFs of your project in its different stages with the different features being added incrementally. -* A performance analysis (described below). - -### Performance Analysis - -The performance analysis is where you will investigate how... -* Your renderer handles varying numbers of grass blades -* The improvement you get by culling using each of the three culling tests - -## Submit - -If you have modified any of the `CMakeLists.txt` files at all (aside from the -list of `SOURCE_FILES`), mentions it explicity. -Beware of any build issues discussed on the Google Group. - -Open a GitHub pull request so that we can see that you have finished. -The title should be "Project 6: YOUR NAME". -The template of the comment section of your pull request is attached below, you can do some copy and paste: - -* [Repo Link](https://link-to-your-repo) -* (Briefly) Mentions features that you've completed. Especially those bells and whistles you want to highlight - * Feature 0 - * Feature 1 - * ... -* Feedback on the project itself, if any. diff --git a/bin/Debug/vulkan_grass_rendering.exe b/bin/Debug/vulkan_grass_rendering.exe new file mode 100644 index 0000000..f9745b0 Binary files /dev/null and b/bin/Debug/vulkan_grass_rendering.exe differ diff --git a/bin/Debug/vulkan_grass_rendering.ilk b/bin/Debug/vulkan_grass_rendering.ilk new file mode 100644 index 0000000..ddc9371 Binary files /dev/null and b/bin/Debug/vulkan_grass_rendering.ilk differ diff --git a/bin/Debug/vulkan_grass_rendering.pdb b/bin/Debug/vulkan_grass_rendering.pdb new file mode 100644 index 0000000..453e0f8 Binary files /dev/null and b/bin/Debug/vulkan_grass_rendering.pdb differ diff --git a/bin/Release/vulkan_grass_rendering.exe b/bin/Release/vulkan_grass_rendering.exe new file mode 100644 index 0000000..c24da3e Binary files /dev/null and b/bin/Release/vulkan_grass_rendering.exe differ diff --git a/img/FPS_vs_Culling.png b/img/FPS_vs_Culling.png new file mode 100644 index 0000000..7cd7790 Binary files /dev/null and b/img/FPS_vs_Culling.png differ diff --git a/img/FPS_vs_Grass.png b/img/FPS_vs_Grass.png new file mode 100644 index 0000000..07c2030 Binary files /dev/null and b/img/FPS_vs_Grass.png differ diff --git a/img/grass_forces.gif b/img/grass_forces.gif new file mode 100644 index 0000000..97bff11 Binary files /dev/null and b/img/grass_forces.gif differ diff --git a/img/grass_straight.gif b/img/grass_straight.gif new file mode 100644 index 0000000..26f663e Binary files /dev/null and b/img/grass_straight.gif differ diff --git a/src/Blades.cpp b/src/Blades.cpp index 80e3d76..0142372 100644 --- a/src/Blades.cpp +++ b/src/Blades.cpp @@ -45,7 +45,7 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode indirectDraw.firstInstance = 0; BufferUtils::CreateBufferFromData(device, commandPool, blades.data(), NUM_BLADES * sizeof(Blade), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, bladesBuffer, bladesBufferMemory); - BufferUtils::CreateBuffer(device, NUM_BLADES * sizeof(Blade), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, culledBladesBuffer, culledBladesBufferMemory); + BufferUtils::CreateBuffer(device, NUM_BLADES * sizeof(Blade), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, culledBladesBuffer, culledBladesBufferMemory); BufferUtils::CreateBufferFromData(device, commandPool, &indirectDraw, sizeof(BladeDrawIndirect), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT, numBladesBuffer, numBladesBufferMemory); } diff --git a/src/Blades.h b/src/Blades.h index 9bd1eed..2fd2130 100644 --- a/src/Blades.h +++ b/src/Blades.h @@ -80,6 +80,9 @@ class Blades : public Model { VkDeviceMemory numBladesBufferMemory; public: + VkDescriptorSet bladesDescriptorSet; + VkDescriptorSet grassDescriptorSet; + Blades(Device* device, VkCommandPool commandPool, float planeDim); VkBuffer GetBladesBuffer() const; VkBuffer GetCulledBladesBuffer() const; diff --git a/src/Renderer.cpp b/src/Renderer.cpp index b445d04..07c00e2 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -5,6 +5,7 @@ #include "Blades.h" #include "Camera.h" #include "Image.h" +#include "BufferUtils.h" static constexpr unsigned int WORKGROUP_SIZE = 32; @@ -198,6 +199,38 @@ void Renderer::CreateComputeDescriptorSetLayout() { // TODO: Create the descriptor set layout for the compute pipeline // Remember this is like a class definition stating why types of information // will be stored at each binding + VkDescriptorSetLayoutBinding allBlades = {}; + allBlades.binding = 0; + allBlades.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + allBlades.descriptorCount = 1; + allBlades.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT; + allBlades.pImmutableSamplers = nullptr; + + VkDescriptorSetLayoutBinding cullBlades = {}; + cullBlades.binding = 1; + cullBlades.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + cullBlades.descriptorCount = 1; + cullBlades.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT; + cullBlades.pImmutableSamplers = nullptr; + + VkDescriptorSetLayoutBinding drawBlades = {}; + drawBlades.binding = 2; + drawBlades.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + drawBlades.descriptorCount = 1; + drawBlades.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT; + drawBlades.pImmutableSamplers = nullptr; + + std::vector bindings = { allBlades, cullBlades, drawBlades }; + + // Create the descriptor set layout + VkDescriptorSetLayoutCreateInfo layoutInfo = {}; + layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + layoutInfo.bindingCount = static_cast(bindings.size()); + layoutInfo.pBindings = bindings.data(); + + if (vkCreateDescriptorSetLayout(logicalDevice, &layoutInfo, nullptr, &bladesDescriptorSetLayout) != VK_SUCCESS) { + throw std::runtime_error("Failed to create descriptor set layout"); + } } void Renderer::CreateDescriptorPool() { @@ -216,6 +249,7 @@ void Renderer::CreateDescriptorPool() { { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , 1 }, // TODO: Add any additional types and counts of descriptors you will need to allocate + { VK_DESCRIPTOR_TYPE_STORAGE_BUFFER , 3 }, }; VkDescriptorPoolCreateInfo poolInfo = {}; @@ -320,6 +354,43 @@ void Renderer::CreateModelDescriptorSets() { void Renderer::CreateGrassDescriptorSets() { // TODO: Create Descriptor sets for the grass. // This should involve creating descriptor sets which point to the model matrix of each group of grass blades + // TODO: Create Descriptor sets for the compute pipeline + // The descriptors should point to Storage buffers which will hold the grass blades, the culled grass blades, and the output number of grass blades + VkDescriptorSetLayout layouts[] = { modelDescriptorSetLayout }; + VkDescriptorSetAllocateInfo allocInfo = {}; + allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + allocInfo.descriptorPool = descriptorPool; + allocInfo.descriptorSetCount = 1; + allocInfo.pSetLayouts = layouts; + + auto& bladeGroups = scene->GetBlades(); + + for (auto& bladeGroup : bladeGroups) { + // Allocate descriptor sets + if (vkAllocateDescriptorSets(logicalDevice, &allocInfo, &bladeGroup->grassDescriptorSet) != VK_SUCCESS) { + throw std::runtime_error("Failed to allocate descriptor set"); + } + + // Configure the descriptors to refer to buffers + VkDescriptorBufferInfo modelBufferInfo = {}; + modelBufferInfo.buffer = bladeGroup->GetModelBuffer(); + modelBufferInfo.offset = 0; + modelBufferInfo.range = sizeof(ModelBufferObject); + + std::array descriptorWrites = {}; + descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrites[0].dstSet = bladeGroup->grassDescriptorSet; + descriptorWrites[0].dstBinding = 0; + descriptorWrites[0].dstArrayElement = 0; + descriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + descriptorWrites[0].descriptorCount = 1; + descriptorWrites[0].pBufferInfo = &modelBufferInfo; + descriptorWrites[0].pImageInfo = nullptr; + descriptorWrites[0].pTexelBufferView = nullptr; + + // Update descriptor sets + vkUpdateDescriptorSets(logicalDevice, static_cast(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr); + } } void Renderer::CreateTimeDescriptorSet() { @@ -360,6 +431,71 @@ void Renderer::CreateTimeDescriptorSet() { void Renderer::CreateComputeDescriptorSets() { // TODO: Create Descriptor sets for the compute pipeline // The descriptors should point to Storage buffers which will hold the grass blades, the culled grass blades, and the output number of grass blades + VkDescriptorSetLayout layouts[] = { bladesDescriptorSetLayout }; + VkDescriptorSetAllocateInfo allocInfo = {}; + allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + allocInfo.descriptorPool = descriptorPool; + allocInfo.descriptorSetCount = 1; + allocInfo.pSetLayouts = layouts; + + auto& bladeGroups = scene->GetBlades(); + + for (auto& bladeGroup : bladeGroups) { + // Allocate descriptor sets + if (vkAllocateDescriptorSets(logicalDevice, &allocInfo, &bladeGroup->bladesDescriptorSet) != VK_SUCCESS) { + throw std::runtime_error("Failed to allocate descriptor set"); + } + + // Configure the descriptors to refer to buffers + VkDescriptorBufferInfo bladesBufferInfo = {}; + bladesBufferInfo.buffer = bladeGroup->GetBladesBuffer(); + bladesBufferInfo.offset = 0; + bladesBufferInfo.range = sizeof(Blade) * NUM_BLADES; + + VkDescriptorBufferInfo culledBladesBufferInfo = {}; + culledBladesBufferInfo.buffer = bladeGroup->GetCulledBladesBuffer(); + culledBladesBufferInfo.offset = 0; + culledBladesBufferInfo.range = sizeof(Blade) * NUM_BLADES; + + VkDescriptorBufferInfo drawBladesBufferInfo = {}; + drawBladesBufferInfo.buffer = bladeGroup->GetNumBladesBuffer(); + drawBladesBufferInfo.offset = 0; + drawBladesBufferInfo.range = sizeof(BladeDrawIndirect); + + std::array descriptorWrites = {}; + descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrites[0].dstSet = bladeGroup->bladesDescriptorSet; + descriptorWrites[0].dstBinding = 0; + descriptorWrites[0].dstArrayElement = 0; + descriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + descriptorWrites[0].descriptorCount = 1; + descriptorWrites[0].pBufferInfo = &bladesBufferInfo; + descriptorWrites[0].pImageInfo = nullptr; + descriptorWrites[0].pTexelBufferView = nullptr; + + descriptorWrites[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrites[1].dstSet = bladeGroup->bladesDescriptorSet; + descriptorWrites[1].dstBinding = 1; + descriptorWrites[1].dstArrayElement = 0; + descriptorWrites[1].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + descriptorWrites[1].descriptorCount = 1; + descriptorWrites[1].pBufferInfo = &culledBladesBufferInfo; + descriptorWrites[1].pImageInfo = nullptr; + descriptorWrites[1].pTexelBufferView = nullptr; + + descriptorWrites[2].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrites[2].dstSet = bladeGroup->bladesDescriptorSet; + descriptorWrites[2].dstBinding = 2; + descriptorWrites[2].dstArrayElement = 0; + descriptorWrites[2].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + descriptorWrites[2].descriptorCount = 1; + descriptorWrites[2].pBufferInfo = &drawBladesBufferInfo; + descriptorWrites[2].pImageInfo = nullptr; + descriptorWrites[2].pTexelBufferView = nullptr; + + // Update descriptor sets + vkUpdateDescriptorSets(logicalDevice, static_cast(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr); + } } void Renderer::CreateGraphicsPipeline() { @@ -716,8 +852,8 @@ void Renderer::CreateComputePipeline() { computeShaderStageInfo.module = computeShaderModule; computeShaderStageInfo.pName = "main"; - // TODO: Add the compute dsecriptor set layout you create to this list - std::vector descriptorSetLayouts = { cameraDescriptorSetLayout, timeDescriptorSetLayout }; + // TODO: Add the compute descriptor set layout you create to this list + std::vector descriptorSetLayouts = { cameraDescriptorSetLayout, timeDescriptorSetLayout, bladesDescriptorSetLayout }; // Create pipeline layout VkPipelineLayoutCreateInfo pipelineLayoutInfo = {}; @@ -885,6 +1021,13 @@ void Renderer::RecordComputeCommandBuffer() { // TODO: For each group of blades bind its descriptor set and dispatch + auto& bladeGroups = scene->GetBlades(); + + for (auto& bladeGroup : bladeGroups) { + vkCmdBindDescriptorSets(computeCommandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, computePipelineLayout, 2, 1, &bladeGroup->bladesDescriptorSet, 0, nullptr); + vkCmdDispatch(computeCommandBuffer, (NUM_BLADES + WORKGROUP_SIZE - 1) / WORKGROUP_SIZE, 1, 1); + } + // ~ End recording ~ if (vkEndCommandBuffer(computeCommandBuffer) != VK_SUCCESS) { throw std::runtime_error("Failed to record compute command buffer"); @@ -976,13 +1119,16 @@ void Renderer::RecordCommandBuffers() { VkBuffer vertexBuffers[] = { scene->GetBlades()[j]->GetCulledBladesBuffer() }; VkDeviceSize offsets[] = { 0 }; // TODO: Uncomment this when the buffers are populated - // vkCmdBindVertexBuffers(commandBuffers[i], 0, 1, vertexBuffers, offsets); + vkCmdBindVertexBuffers(commandBuffers[i], 0, 1, vertexBuffers, offsets); + + vkCmdBindDescriptorSets(commandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, grassPipelineLayout, 1, 1, &scene->GetBlades()[j]->grassDescriptorSet, 0, nullptr); // TODO: Bind the descriptor set for each grass blades model + //vkCmdBindDescriptorSets(commandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, grassPipelineLayout, 1, 1, &cameraDescriptorSet, 0, nullptr); // Draw // TODO: Uncomment this when the buffers are populated - // vkCmdDrawIndirect(commandBuffers[i], scene->GetBlades()[j]->GetNumBladesBuffer(), 0, 1, sizeof(BladeDrawIndirect)); + vkCmdDrawIndirect(commandBuffers[i], scene->GetBlades()[j]->GetNumBladesBuffer(), 0, 1, sizeof(BladeDrawIndirect)); } // End render pass diff --git a/src/Renderer.h b/src/Renderer.h index 95e025f..0f5e000 100644 --- a/src/Renderer.h +++ b/src/Renderer.h @@ -56,6 +56,7 @@ class Renderer { VkDescriptorSetLayout cameraDescriptorSetLayout; VkDescriptorSetLayout modelDescriptorSetLayout; VkDescriptorSetLayout timeDescriptorSetLayout; + VkDescriptorSetLayout bladesDescriptorSetLayout; VkDescriptorPool descriptorPool; diff --git a/src/main.cpp b/src/main.cpp index 8bf822b..410f214 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,6 +5,7 @@ #include "Camera.h" #include "Scene.h" #include "Image.h" +#include Device* device; SwapChain* swapChain; @@ -143,12 +144,22 @@ int main() { glfwSetMouseButtonCallback(GetGLFWWindow(), mouseDownCallback); glfwSetCursorPosCallback(GetGLFWWindow(), mouseMoveCallback); + float time_start = glfwGetTime(); + int numFrames = 0; + while (!ShouldQuit()) { glfwPollEvents(); scene->UpdateTime(); renderer->Frame(); + numFrames++; } + float time_end = glfwGetTime(); + float avg_FPS = numFrames / float(time_end - time_start); + std::cout << avg_FPS; + std::cout << "Press any key to continue..." << std::endl; + std::cin.get(); + vkDeviceWaitIdle(device->GetVkDevice()); vkDestroyImage(device->GetVkDevice(), grassImage, nullptr); diff --git a/src/shaders/compute.comp b/src/shaders/compute.comp index 0fd0224..20e1c59 100644 --- a/src/shaders/compute.comp +++ b/src/shaders/compute.comp @@ -21,6 +21,21 @@ struct Blade { vec4 up; }; +layout(set = 2, binding = 0) buffer AllBlades { + Blade blades[]; +} allBlades; + +layout(set = 2, binding = 1) buffer CulledBlades { + Blade blades[]; +} culledBlades; + +layout(set = 2, binding = 2) buffer NumBlades { + uint vertexCount; // Write the number of blades remaining here + uint instanceCount; // = 1 + uint firstVertex; // = 0 + uint firstInstance; // = 0 +} numBlades; + // TODO: Add bindings to: // 1. Store the input blades // 2. Write out the culled blades @@ -36,21 +51,97 @@ struct Blade { // uint firstInstance; // = 0 // } numBlades; -bool inBounds(float value, float bounds) { - return (value >= -bounds) && (value <= bounds); -} - void main() { // Reset the number of blades to 0 if (gl_GlobalInvocationID.x == 0) { - // numBlades.vertexCount = 0; + numBlades.vertexCount = 0; } barrier(); // Wait till all threads reach this point + uint threadIdx = gl_GlobalInvocationID.x; + Blade blade = allBlades.blades[threadIdx]; + + float height = blade.v1.w; + float width = blade.v2.w; + float k = blade.up.w; + + vec3 v0 = blade.v0.xyz; + vec3 v1 = blade.v1.xyz; + vec3 v2 = blade.v2.xyz; + vec3 vup = blade.up.xyz; // TODO: Apply forces on every blade and update the vertices in the buffer + // gravitational force (simplified) + vec3 gE = vec3(0.0, -9.8, 0.0); // y is down + vec3 f = normalize(cross(vup, vec3(sin(blade.v0.w), 0.0, cos(blade.v0.w)))); // perp to blade + vec3 gF = 0.5 * 9.8 * f; + vec3 gravityF = gE + gF; + + // recovery force + vec3 Iv2 = v0 + (vup * height); + vec3 recoveryF = (Iv2 - v2) * k; + + // wind (drag) force + vec3 wind_f = vec3(4.0, 4.0, 0.0) * sin(totalTime); + float f_ori = 1 - abs(dot(normalize(wind_f), normalize(v2 - v0))); + float f_exp = dot((v2 - v0), vup) / height; // exposure + vec3 windF = wind_f * f_ori * f_exp; + + // update blade + v2 += (recoveryF + gravityF + windF) * deltaTime; + + // validate updates + // make sure v2 is above the ground plane + v2 = v2 - vup * min(dot(vup, v2 - v0), 0.0); + + // evaluating the position of v1 + // first get the component of v2 - v0 projected onto the ground plane + //float l_proj = length(v2 - v0 - vup * dot(v2 - v0, vup)); + //v1 = v0 + height * vup * max(1.0 - (l_proj / height), 0.05 * max(l_proj / height, 1.0)); + + // now ensure that the length of the bezier curve is not longer than the length of the blade + float n = 2.0; + float L0 = distance(v0, v2); + float L1 = distance(v0, v1) + distance(v1, v2); + float L = ((2.0 * L0) + (n - 1.0) * L1) / (n + 1.0); + + float r = height / L; + vec3 v1_corr = v0 + r * (v1 - v0); + vec3 v2_corr = v1_corr + r * (v2 - v1); + + allBlades.blades[threadIdx].v1.xyz = v1_corr; + allBlades.blades[threadIdx].v2.xyz = v2_corr; + // TODO: Cull blades that are too far away or not in the camera frustum and write them // to the culled blades buffer // Note: to do this, you will need to use an atomic operation to read and update numBlades.vertexCount // You want to write the visible blades to the buffer without write conflicts between threads + + // camera position + vec4 eye = inverse(camera.view) * vec4(0.0, 0.0, 0.0, 1.0); + + // orientation culling + vec3 look = normalize(eye.xyz - v0); + vec3 perp_dir = f; + if(dot(look, perp_dir) > 0.9){ + return; + } + + // view-frustum culling + vec4 v0_prime = camera.proj * camera.view * vec4(v0, 1.0); + float tol = 2.5; + float q = v0_prime.w + 2.5; + if( v0_prime.x < -q || v0_prime.x > q || + v0_prime.y < -q || v0_prime.y > q || + v0_prime.z < -q || v0_prime.z > q) { + return; + } + + // distance culling + float d_proj = length(v0 - eye.xyz - vup * dot(v0 - eye.xyz, vup)); + if(mod(threadIdx, 15) > floor(15.0 * (1 - (d_proj / 75.0)))){ + return; + } + + culledBlades.blades[atomicAdd(numBlades.vertexCount, 1)] = allBlades.blades[threadIdx]; } diff --git a/src/shaders/grass.frag b/src/shaders/grass.frag index c7df157..7f72942 100644 --- a/src/shaders/grass.frag +++ b/src/shaders/grass.frag @@ -1,3 +1,4 @@ + #version 450 #extension GL_ARB_separate_shader_objects : enable @@ -7,11 +8,13 @@ layout(set = 0, binding = 0) uniform CameraBufferObject { } camera; // TODO: Declare fragment shader inputs +layout(location = 0) in vec4 pos; +layout(location = 1) in vec4 nor; +layout(location = 2) in vec2 uv; layout(location = 0) out vec4 outColor; void main() { // TODO: Compute fragment color - - outColor = vec4(1.0); -} + outColor = mix(vec4(0.0, 0.1, 0.0, 1.0), vec4(0.0, 0.4, 0.0, 1.0), uv.y); +} \ No newline at end of file diff --git a/src/shaders/grass.tesc b/src/shaders/grass.tesc index f9ffd07..9242c38 100644 --- a/src/shaders/grass.tesc +++ b/src/shaders/grass.tesc @@ -9,18 +9,32 @@ layout(set = 0, binding = 0) uniform CameraBufferObject { } camera; // TODO: Declare tessellation control shader inputs and outputs +// Blade info in and out +layout(location = 0) in vec4 v0[]; +layout(location = 1) in vec4 v1[]; +layout(location = 2) in vec4 v2[]; +layout(location = 3) in vec4 up[]; + +layout(location = 0) out vec4 v0_out[]; +layout(location = 1) out vec4 v1_out[]; +layout(location = 2) out vec4 v2_out[]; +layout(location = 3) out vec4 up_out[]; void main() { - // Don't move the origin location of the patch gl_out[gl_InvocationID].gl_Position = gl_in[gl_InvocationID].gl_Position; // TODO: Write any shader outputs + v0_out[gl_InvocationID] = v0[gl_InvocationID]; + v1_out[gl_InvocationID] = v1[gl_InvocationID]; + v2_out[gl_InvocationID] = v2[gl_InvocationID]; + up_out[gl_InvocationID] = up[gl_InvocationID]; // TODO: Set level of tesselation - // gl_TessLevelInner[0] = ??? - // gl_TessLevelInner[1] = ??? - // gl_TessLevelOuter[0] = ??? - // gl_TessLevelOuter[1] = ??? - // gl_TessLevelOuter[2] = ??? - // gl_TessLevelOuter[3] = ??? -} + // Tesselation parameters for creating natural-looking grass + gl_TessLevelInner[0] = 2.0; + gl_TessLevelInner[1] = 5.0; + gl_TessLevelOuter[0] = 5.0; + gl_TessLevelOuter[1] = 2.0; + gl_TessLevelOuter[2] = 5.0; + gl_TessLevelOuter[3] = 2.0; +} \ No newline at end of file diff --git a/src/shaders/grass.tese b/src/shaders/grass.tese index 751fff6..19b4ea9 100644 --- a/src/shaders/grass.tese +++ b/src/shaders/grass.tese @@ -9,10 +9,39 @@ layout(set = 0, binding = 0) uniform CameraBufferObject { } camera; // TODO: Declare tessellation evaluation shader inputs and outputs +layout(location = 0) in vec4 v0[]; +layout(location = 1) in vec4 v1[]; +layout(location = 2) in vec4 v2[]; +layout(location = 3) in vec4 up[]; + +layout(location = 0) out vec4 pos; +layout(location = 1) out vec4 nor; +layout(location = 2) out vec2 uv; void main() { float u = gl_TessCoord.x; float v = gl_TessCoord.y; + uv = vec2(u, v); // TODO: Use u and v to parameterize along the grass blade and output positions for each vertex of the grass blade -} + vec3 base_to_up = v0[0].xyz + v * (v1[0].xyz - v0[0].xyz); + vec3 up_to_over = v1[0].xyz + v * (v2[0].xyz - v1[0].xyz); + // base to tip interp function + vec3 base_to_tip = base_to_up + v * (up_to_over - base_to_up); + + // which way the grass is oriented in x, z + vec3 orientation = vec3(sin(v0[0].w), 0.0, cos(v0[0].w)); + float width = v2[0].w; + + // thickening the blade along orientation + vec3 blade_left = base_to_tip - width * orientation; + vec3 blade_right = base_to_tip + width * orientation; + + // getting the direction normal to the flat portion of the blade + vec3 width_nor = normalize(up_to_over - base_to_up); + nor.xyz = normalize(cross(width_nor, orientation)); + + float t = u + 0.5 * v - u * v; + pos.xyz = (1.0 - t) * blade_left + t * blade_right; + gl_Position = camera.proj * camera.view * vec4(pos.xyz, 1.0); +} \ No newline at end of file diff --git a/src/shaders/grass.vert b/src/shaders/grass.vert index db9dfe9..c853a94 100644 --- a/src/shaders/grass.vert +++ b/src/shaders/grass.vert @@ -1,4 +1,3 @@ - #version 450 #extension GL_ARB_separate_shader_objects : enable @@ -7,6 +6,15 @@ layout(set = 1, binding = 0) uniform ModelBufferObject { }; // TODO: Declare vertex shader inputs and outputs +layout(location = 0) in vec4 v0; +layout(location = 1) in vec4 v1; +layout(location = 2) in vec4 v2; +layout(location = 3) in vec4 up; + +layout(location = 0) out vec4 v0_out; +layout(location = 1) out vec4 v1_out; +layout(location = 2) out vec4 v2_out; +layout(location = 3) out vec4 up_out; out gl_PerVertex { vec4 gl_Position; @@ -14,4 +22,9 @@ out gl_PerVertex { void main() { // TODO: Write gl_Position and any other shader outputs -} + v0_out = v0; + v1_out = v1; + v2_out = v2; + up_out = up; + gl_Position = vec4(v0.xyz, 1.0); +} \ No newline at end of file