mirror of
https://github.com/opus-tango/IntroductionToVulkan.git
synced 2026-03-20 03:55:26 +00:00
Updated License to Apache 2.0
This commit is contained in:
codergirl42
File diff suppressed because it is too large
Load Diff
@@ -1,167 +1,163 @@
|
||||
// Copyright 2016 Intel Corporation All Rights Reserved
|
||||
//
|
||||
// Intel makes no representations about the suitability of this software for any purpose.
|
||||
// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
|
||||
// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
|
||||
// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
|
||||
// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// Intel does not assume any responsibility for any errors which may appear in this software
|
||||
// nor any responsibility to update it.
|
||||
|
||||
#if !defined(TUTORIAL_06_HEADER)
|
||||
#define TUTORIAL_06_HEADER
|
||||
|
||||
#include "VulkanCommon.h"
|
||||
#include "Tools.h"
|
||||
|
||||
namespace ApiWithoutSecrets {
|
||||
|
||||
// ************************************************************ //
|
||||
// BufferParameters //
|
||||
// //
|
||||
// Vulkan Buffer's parameters container class //
|
||||
// ************************************************************ //
|
||||
struct BufferParameters {
|
||||
VkBuffer Handle;
|
||||
VkDeviceMemory Memory;
|
||||
uint32_t Size;
|
||||
|
||||
BufferParameters() :
|
||||
Handle( VK_NULL_HANDLE ),
|
||||
Memory( VK_NULL_HANDLE ),
|
||||
Size( 0 ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// DescriptorParameters //
|
||||
// //
|
||||
// Container class for descriptor related resources //
|
||||
// ************************************************************ //
|
||||
struct DescriptorSetParameters {
|
||||
VkDescriptorPool Pool;
|
||||
VkDescriptorSetLayout Layout;
|
||||
VkDescriptorSet Handle;
|
||||
|
||||
DescriptorSetParameters() :
|
||||
Pool( VK_NULL_HANDLE ),
|
||||
Layout( VK_NULL_HANDLE ),
|
||||
Handle( VK_NULL_HANDLE ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// VertexData //
|
||||
// //
|
||||
// Struct describing data type and format of vertex attributes //
|
||||
// ************************************************************ //
|
||||
struct VertexData {
|
||||
float x, y, z, w;
|
||||
float u, v;
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// RenderingResourcesData //
|
||||
// //
|
||||
// Struct containing data used during rendering process //
|
||||
// ************************************************************ //
|
||||
struct RenderingResourcesData {
|
||||
VkFramebuffer Framebuffer;
|
||||
VkCommandBuffer CommandBuffer;
|
||||
VkSemaphore ImageAvailableSemaphore;
|
||||
VkSemaphore FinishedRenderingSemaphore;
|
||||
VkFence Fence;
|
||||
|
||||
RenderingResourcesData() :
|
||||
Framebuffer( VK_NULL_HANDLE ),
|
||||
CommandBuffer( VK_NULL_HANDLE ),
|
||||
ImageAvailableSemaphore( VK_NULL_HANDLE ),
|
||||
FinishedRenderingSemaphore( VK_NULL_HANDLE ),
|
||||
Fence( VK_NULL_HANDLE ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// VulkanTutorial04Parameters //
|
||||
// //
|
||||
// Vulkan specific parameters //
|
||||
// ************************************************************ //
|
||||
struct VulkanTutorial06Parameters {
|
||||
VkRenderPass RenderPass;
|
||||
ImageParameters Image;
|
||||
DescriptorSetParameters DescriptorSet;
|
||||
VkPipelineLayout PipelineLayout;
|
||||
VkPipeline GraphicsPipeline;
|
||||
BufferParameters VertexBuffer;
|
||||
BufferParameters StagingBuffer;
|
||||
VkCommandPool CommandPool;
|
||||
std::vector<RenderingResourcesData> RenderingResources;
|
||||
|
||||
static const size_t ResourcesCount = 3;
|
||||
|
||||
VulkanTutorial06Parameters() :
|
||||
RenderPass( VK_NULL_HANDLE ),
|
||||
Image(),
|
||||
DescriptorSet(),
|
||||
PipelineLayout(),
|
||||
GraphicsPipeline( VK_NULL_HANDLE ),
|
||||
VertexBuffer(),
|
||||
StagingBuffer(),
|
||||
CommandPool( VK_NULL_HANDLE ),
|
||||
RenderingResources( ResourcesCount ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// Tutorial04 //
|
||||
// //
|
||||
// Class for presenting Vulkan usage topics //
|
||||
// ************************************************************ //
|
||||
class Tutorial06 : public VulkanCommon {
|
||||
public:
|
||||
Tutorial06();
|
||||
~Tutorial06();
|
||||
|
||||
bool CreateRenderingResources();
|
||||
bool CreateStagingBuffer();
|
||||
bool CreateTexture();
|
||||
bool CreateDescriptorSetLayout();
|
||||
bool CreateDescriptorPool();
|
||||
bool AllocateDescriptorSet();
|
||||
bool UpdateDescriptorSet();
|
||||
bool CreateRenderPass();
|
||||
bool CreatePipelineLayout();
|
||||
bool CreatePipeline();
|
||||
bool CreateVertexBuffer();
|
||||
|
||||
bool Draw() override;
|
||||
|
||||
private:
|
||||
VulkanTutorial06Parameters Vulkan;
|
||||
|
||||
bool CreateCommandBuffers();
|
||||
bool CreateCommandPool(uint32_t queue_family_index, VkCommandPool *pool);
|
||||
bool AllocateCommandBuffers(VkCommandPool pool, uint32_t count, VkCommandBuffer *command_buffers);
|
||||
bool CreateSemaphores();
|
||||
bool CreateFences();
|
||||
bool CreateBuffer(VkBufferUsageFlags usage, VkMemoryPropertyFlagBits memoryProperty, BufferParameters &buffer);
|
||||
bool AllocateBufferMemory(VkBuffer buffer, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory);
|
||||
bool CreateImage( uint32_t width, uint32_t height, VkImage *image );
|
||||
bool AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory );
|
||||
bool CreateImageView( ImageParameters &image_parameters );
|
||||
bool CreateSampler( VkSampler *sampler );
|
||||
bool CopyTextureData( char *texture_data, uint32_t data_size, uint32_t width, uint32_t height );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> CreateShaderModule( const char* filename );
|
||||
const std::vector<float>& GetVertexData() const;
|
||||
bool CopyVertexData();
|
||||
bool PrepareFrame( VkCommandBuffer command_buffer, const ImageParameters &image_parameters, VkFramebuffer &framebuffer );
|
||||
bool CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view );
|
||||
void DestroyBuffer( BufferParameters& buffer );
|
||||
|
||||
bool ChildOnWindowSizeChanged() override;
|
||||
void ChildClear() override;
|
||||
};
|
||||
|
||||
} // namespace ApiWithoutSecrets
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright 2017 Intel Corporation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#if !defined(TUTORIAL_06_HEADER)
|
||||
#define TUTORIAL_06_HEADER
|
||||
|
||||
#include "VulkanCommon.h"
|
||||
#include "Tools.h"
|
||||
|
||||
namespace ApiWithoutSecrets {
|
||||
|
||||
// ************************************************************ //
|
||||
// BufferParameters //
|
||||
// //
|
||||
// Vulkan Buffer's parameters container class //
|
||||
// ************************************************************ //
|
||||
struct BufferParameters {
|
||||
VkBuffer Handle;
|
||||
VkDeviceMemory Memory;
|
||||
uint32_t Size;
|
||||
|
||||
BufferParameters() :
|
||||
Handle( VK_NULL_HANDLE ),
|
||||
Memory( VK_NULL_HANDLE ),
|
||||
Size( 0 ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// DescriptorParameters //
|
||||
// //
|
||||
// Container class for descriptor related resources //
|
||||
// ************************************************************ //
|
||||
struct DescriptorSetParameters {
|
||||
VkDescriptorPool Pool;
|
||||
VkDescriptorSetLayout Layout;
|
||||
VkDescriptorSet Handle;
|
||||
|
||||
DescriptorSetParameters() :
|
||||
Pool( VK_NULL_HANDLE ),
|
||||
Layout( VK_NULL_HANDLE ),
|
||||
Handle( VK_NULL_HANDLE ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// VertexData //
|
||||
// //
|
||||
// Struct describing data type and format of vertex attributes //
|
||||
// ************************************************************ //
|
||||
struct VertexData {
|
||||
float x, y, z, w;
|
||||
float u, v;
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// RenderingResourcesData //
|
||||
// //
|
||||
// Struct containing data used during rendering process //
|
||||
// ************************************************************ //
|
||||
struct RenderingResourcesData {
|
||||
VkFramebuffer Framebuffer;
|
||||
VkCommandBuffer CommandBuffer;
|
||||
VkSemaphore ImageAvailableSemaphore;
|
||||
VkSemaphore FinishedRenderingSemaphore;
|
||||
VkFence Fence;
|
||||
|
||||
RenderingResourcesData() :
|
||||
Framebuffer( VK_NULL_HANDLE ),
|
||||
CommandBuffer( VK_NULL_HANDLE ),
|
||||
ImageAvailableSemaphore( VK_NULL_HANDLE ),
|
||||
FinishedRenderingSemaphore( VK_NULL_HANDLE ),
|
||||
Fence( VK_NULL_HANDLE ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// VulkanTutorial04Parameters //
|
||||
// //
|
||||
// Vulkan specific parameters //
|
||||
// ************************************************************ //
|
||||
struct VulkanTutorial06Parameters {
|
||||
VkRenderPass RenderPass;
|
||||
ImageParameters Image;
|
||||
DescriptorSetParameters DescriptorSet;
|
||||
VkPipelineLayout PipelineLayout;
|
||||
VkPipeline GraphicsPipeline;
|
||||
BufferParameters VertexBuffer;
|
||||
BufferParameters StagingBuffer;
|
||||
VkCommandPool CommandPool;
|
||||
std::vector<RenderingResourcesData> RenderingResources;
|
||||
|
||||
static const size_t ResourcesCount = 3;
|
||||
|
||||
VulkanTutorial06Parameters() :
|
||||
RenderPass( VK_NULL_HANDLE ),
|
||||
Image(),
|
||||
DescriptorSet(),
|
||||
PipelineLayout(),
|
||||
GraphicsPipeline( VK_NULL_HANDLE ),
|
||||
VertexBuffer(),
|
||||
StagingBuffer(),
|
||||
CommandPool( VK_NULL_HANDLE ),
|
||||
RenderingResources( ResourcesCount ) {
|
||||
}
|
||||
};
|
||||
|
||||
// ************************************************************ //
|
||||
// Tutorial04 //
|
||||
// //
|
||||
// Class for presenting Vulkan usage topics //
|
||||
// ************************************************************ //
|
||||
class Tutorial06 : public VulkanCommon {
|
||||
public:
|
||||
Tutorial06();
|
||||
~Tutorial06();
|
||||
|
||||
bool CreateRenderingResources();
|
||||
bool CreateStagingBuffer();
|
||||
bool CreateTexture();
|
||||
bool CreateDescriptorSetLayout();
|
||||
bool CreateDescriptorPool();
|
||||
bool AllocateDescriptorSet();
|
||||
bool UpdateDescriptorSet();
|
||||
bool CreateRenderPass();
|
||||
bool CreatePipelineLayout();
|
||||
bool CreatePipeline();
|
||||
bool CreateVertexBuffer();
|
||||
|
||||
bool Draw() override;
|
||||
|
||||
private:
|
||||
VulkanTutorial06Parameters Vulkan;
|
||||
|
||||
bool CreateCommandBuffers();
|
||||
bool CreateCommandPool(uint32_t queue_family_index, VkCommandPool *pool);
|
||||
bool AllocateCommandBuffers(VkCommandPool pool, uint32_t count, VkCommandBuffer *command_buffers);
|
||||
bool CreateSemaphores();
|
||||
bool CreateFences();
|
||||
bool CreateBuffer(VkBufferUsageFlags usage, VkMemoryPropertyFlagBits memoryProperty, BufferParameters &buffer);
|
||||
bool AllocateBufferMemory(VkBuffer buffer, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory);
|
||||
bool CreateImage( uint32_t width, uint32_t height, VkImage *image );
|
||||
bool AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory );
|
||||
bool CreateImageView( ImageParameters &image_parameters );
|
||||
bool CreateSampler( VkSampler *sampler );
|
||||
bool CopyTextureData( char *texture_data, uint32_t data_size, uint32_t width, uint32_t height );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> CreateShaderModule( const char* filename );
|
||||
const std::vector<float>& GetVertexData() const;
|
||||
bool CopyVertexData();
|
||||
bool PrepareFrame( VkCommandBuffer command_buffer, const ImageParameters &image_parameters, VkFramebuffer &framebuffer );
|
||||
@@ -1,68 +1,64 @@
|
||||
// Copyright 2016 Intel Corporation All Rights Reserved
|
||||
//
|
||||
// Intel makes no representations about the suitability of this software for any purpose.
|
||||
// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
|
||||
// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
|
||||
// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
|
||||
// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// Intel does not assume any responsibility for any errors which may appear in this software
|
||||
// nor any responsibility to update it.
|
||||
|
||||
#include "Tutorial06.h"
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
ApiWithoutSecrets::OS::Window window;
|
||||
ApiWithoutSecrets::Tutorial06 tutorial06;
|
||||
|
||||
// Window creation
|
||||
if( !window.Create( "06 - Descriptor Sets" ) ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Vulkan preparations and initialization
|
||||
if( !tutorial06.PrepareVulkan( window.GetParameters() ) ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Tutorial 06
|
||||
if( !tutorial06.CreateRenderingResources() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateStagingBuffer() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateTexture() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateDescriptorSetLayout() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateDescriptorPool() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.AllocateDescriptorSet() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.UpdateDescriptorSet() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateRenderPass() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreatePipelineLayout() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreatePipeline() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateVertexBuffer() ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Rendering loop
|
||||
if( !window.RenderingLoop( tutorial06 ) ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright 2017 Intel Corporation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "Tutorial06.h"
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
ApiWithoutSecrets::OS::Window window;
|
||||
ApiWithoutSecrets::Tutorial06 tutorial06;
|
||||
|
||||
// Window creation
|
||||
if( !window.Create( "06 - Descriptor Sets" ) ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Vulkan preparations and initialization
|
||||
if( !tutorial06.PrepareVulkan( window.GetParameters() ) ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Tutorial 06
|
||||
if( !tutorial06.CreateRenderingResources() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateStagingBuffer() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateTexture() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateDescriptorSetLayout() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateDescriptorPool() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.AllocateDescriptorSet() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.UpdateDescriptorSet() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateRenderPass() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreatePipelineLayout() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreatePipeline() ) {
|
||||
return -1;
|
||||
}
|
||||
if( !tutorial06.CreateVertexBuffer() ) {
|
||||
|
||||
Reference in New Issue
Block a user