mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed Commit

Browse Source
This commit is contained in:
Victor Müller 2016-09-07 09:31:59 +02:00
parent f9f1415cb2
commit 4690aee2df
1 changed files with 17785 additions and 17766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vulkan/vulkan.hpp
View File

@ -39,7 +39,7 @@
# include <memory>
# include <vector>
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
#ifndef VULKAN_HPP_DISABLE_SCOPED_HANDLING
#include <functional>
#endif
@ -347,6 +347,7 @@ namespace vk
default: return "invalid";
}
}
#if defined(_MSC_VER) && (_MSC_VER == 1800)
# define noexcept _NOEXCEPT
#endif
@ -1077,6 +1078,7 @@ namespace vk
};
#endif
class DeviceMemory
{
public:
@ -1704,8 +1706,6 @@ namespace vk
};
static_assert( sizeof( DescriptorSet ) == sizeof( VkDescriptorSet ), "handle and wrapper have different size!" );
class DescriptorSetLayout
{
public:
@ -15889,9 +15889,8 @@ namespace vk
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
Queue getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex ) const
{
Queue queue = Queue();
Queue queue;
vkGetDeviceQueue( m_device, queueFamilyIndex, queueIndex, reinterpret_cast<VkQueue*>( &queue ) );
if (&queue == nullptr)std::cout << "fail" << std::endl;
return queue;
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@ -15910,6 +15909,7 @@ namespace vk
return createResultValue( result, "vk::Device::waitIdle" );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result allocateMemory(const MemoryAllocateInfo* pAllocateInfo, const AllocationCallbacks* pAllocator, DeviceMemory* pMemory) const
{
@ -15938,7 +15938,6 @@ namespace vk
return createResultValue(result, memory, "vk::Device::allocateMemory");
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void freeMemory( DeviceMemory memory, const AllocationCallbacks* pAllocator ) const
{
@ -16365,6 +16364,7 @@ namespace vk
return createResultValue( result, "vk::Device::getQueryPoolResults", { Result::eSuccess, Result::eNotReady } );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result createBuffer(const BufferCreateInfo* pCreateInfo, const AllocationCallbacks* pAllocator, Buffer* pBuffer) const
{
@ -16405,6 +16405,19 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroyBuffer( Buffer buffer, const AllocationCallbacks* pAllocator ) const
{
vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
}
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
void destroyBuffer( Buffer buffer, Optional<const AllocationCallbacks> allocator = nullptr ) const
{
vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks*>( static_cast<const AllocationCallbacks*>( allocator)) );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result createBufferView(const BufferViewCreateInfo* pCreateInfo, const AllocationCallbacks* pAllocator, BufferView* pView) const
{
@ -16434,6 +16447,7 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroyBufferView( BufferView bufferView, const AllocationCallbacks* pAllocator ) const
{
vkDestroyBufferView( m_device, static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@ -16532,6 +16546,7 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroyImageView( ImageView imageView, const AllocationCallbacks* pAllocator ) const
{
vkDestroyImageView( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@ -16573,6 +16588,7 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroyShaderModule( ShaderModule shaderModule, const AllocationCallbacks* pAllocator ) const
{
vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@ -16584,6 +16600,7 @@ namespace vk
vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks*>( static_cast<const AllocationCallbacks*>( allocator)) );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result createPipelineCache(const PipelineCacheCreateInfo* pCreateInfo, const AllocationCallbacks* pAllocator, PipelineCache* pPipelineCache) const
{
@ -16613,6 +16630,7 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroyPipelineCache( PipelineCache pipelineCache, const AllocationCallbacks* pAllocator ) const
{
vkDestroyPipelineCache( m_device, static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@ -16664,6 +16682,7 @@ namespace vk
return createResultValue( result, "vk::Device::mergePipelineCaches" );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result createGraphicsPipelines(PipelineCache pipelineCache, uint32_t createInfoCount, const GraphicsPipelineCreateInfo* pCreateInfos, const AllocationCallbacks* pAllocator, Pipeline* pPipelines) const
{
@ -16951,7 +16970,6 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
Result allocateDescriptorSets( const DescriptorSetAllocateInfo* pAllocateInfo, DescriptorSet* pDescriptorSets ) const
{
return static_cast<Result>( vkAllocateDescriptorSets( m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo*>( pAllocateInfo ), reinterpret_cast<VkDescriptorSet*>( pDescriptorSets ) ) );
@ -16966,6 +16984,7 @@ namespace vk
return createResultValue( result, descriptorSets, "vk::Device::allocateDescriptorSets" );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
Result freeDescriptorSets( DescriptorPool descriptorPool, uint32_t descriptorSetCount, const DescriptorSet* pDescriptorSets ) const
{
return static_cast<Result>( vkFreeDescriptorSets( m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSetCount, reinterpret_cast<const VkDescriptorSet*>( pDescriptorSets ) ) );
@ -17247,6 +17266,7 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
void destroySwapchainKHR( SwapchainKHR swapchain, const AllocationCallbacks* pAllocator ) const
{
vkDestroySwapchainKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@ -17349,7 +17369,6 @@ namespace vk
private:
VkDevice m_device;
};
static_assert( sizeof( Device ) == sizeof( VkDevice ), "handle and wrapper have different size!" );
class PhysicalDevice
@ -17473,6 +17492,7 @@ namespace vk
return createResultValue( result, imageFormatProperties, "vk::PhysicalDevice::getImageFormatProperties" );
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#ifdef VULKAN_HPP_DISABLE_SCOPED_HANDLING
Result createDevice(const DeviceCreateInfo* pCreateInfo, const AllocationCallbacks* pAllocator, Device* pDevice) const
{
@ -17502,6 +17522,7 @@ namespace vk
}
#endif
#endif /*VULKAN_HPP_DISABLE_SCOPED_HANDLING*/
Result enumerateDeviceLayerProperties( uint32_t* pPropertyCount, LayerProperties* pProperties ) const
{
return static_cast<Result>( vkEnumerateDeviceLayerProperties( m_physicalDevice, pPropertyCount, reinterpret_cast<VkLayerProperties*>( pProperties ) ) );
@ -18321,8 +18342,6 @@ namespace vk
}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
inline std::string to_string(FramebufferCreateFlagBits)
{
return "(void)";