forked from MoonsideGames/Refresh
Compare commits
11 Commits
632bd58613
...
main
Author | SHA1 | Date |
---|---|---|
Caleb Cornett | f5b3e466a8 | |
cosmonaut | 2fb9a6931b | |
Hazel Stagner | c01ff21359 | |
cosmonaut | e5da75d33a | |
cosmonaut | 99e9dc5b8c | |
cosmonaut | 0e7720ccf6 | |
cosmonaut | 488cb8c535 | |
cosmonaut | 3007b4c989 | |
cosmonaut | 163adfb5cd | |
cosmonaut | f0b970496e | |
cosmonaut | 38d14fd99d |
|
@ -1,6 +1,3 @@
|
|||
[submodule "Vulkan-Headers"]
|
||||
path = Vulkan-Headers
|
||||
url = https://github.com/KhronosGroup/Vulkan-Headers.git
|
||||
[submodule "SPIRV-Cross"]
|
||||
path = SPIRV-Cross
|
||||
url = https://github.com/KhronosGroup/SPIRV-Cross
|
||||
|
|
|
@ -8,7 +8,7 @@ option(BUILD_SHARED_LIBS "Build shared library" ON)
|
|||
|
||||
# Version
|
||||
SET(LIB_MAJOR_VERSION "1")
|
||||
SET(LIB_MINOR_VERSION "3")
|
||||
SET(LIB_MINOR_VERSION "5")
|
||||
SET(LIB_REVISION "0")
|
||||
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}")
|
||||
|
||||
|
@ -40,11 +40,6 @@ endif()
|
|||
add_definitions(
|
||||
-DREFRESH_DRIVER_VULKAN
|
||||
)
|
||||
if (WIN32)
|
||||
add_definitions(
|
||||
-DREFRESH_DRIVER_D3D11
|
||||
)
|
||||
endif()
|
||||
|
||||
# Source lists
|
||||
add_library(Refresh
|
||||
|
@ -54,10 +49,8 @@ add_library(Refresh
|
|||
# Internal Headers
|
||||
src/Refresh_Driver.h
|
||||
src/Refresh_Driver_Vulkan_vkfuncs.h
|
||||
src/Refresh_Driver_D3D11_cdefines.h
|
||||
# Source Files
|
||||
src/Refresh.c
|
||||
src/Refresh_Driver_D3D11.c
|
||||
src/Refresh_Driver_Vulkan.c
|
||||
src/Refresh_Image.c
|
||||
)
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit d5c3bd8b5e7db9e2d7fe809944b47b8f88e1c732
|
|
@ -55,7 +55,7 @@ extern "C" {
|
|||
/* Version API */
|
||||
|
||||
#define REFRESH_MAJOR_VERSION 1
|
||||
#define REFRESH_MINOR_VERSION 3
|
||||
#define REFRESH_MINOR_VERSION 5
|
||||
#define REFRESH_PATCH_VERSION 0
|
||||
|
||||
#define REFRESH_COMPILED_VERSION ( \
|
||||
|
@ -124,6 +124,7 @@ typedef enum Refresh_TextureFormat
|
|||
REFRESH_TEXTUREFORMAT_BC1,
|
||||
REFRESH_TEXTUREFORMAT_BC2,
|
||||
REFRESH_TEXTUREFORMAT_BC3,
|
||||
REFRESH_TEXTUREFORMAT_BC7,
|
||||
REFRESH_TEXTUREFORMAT_R8G8_SNORM,
|
||||
REFRESH_TEXTUREFORMAT_R8G8B8A8_SNORM,
|
||||
REFRESH_TEXTUREFORMAT_A2R10G10B10,
|
||||
|
@ -184,7 +185,8 @@ typedef uint32_t Refresh_BufferUsageFlags;
|
|||
|
||||
typedef enum Refresh_VertexElementFormat
|
||||
{
|
||||
REFRESH_VERTEXELEMENTFORMAT_SINGLE,
|
||||
REFRESH_VERTEXELEMENTFORMAT_UINT,
|
||||
REFRESH_VERTEXELEMENTFORMAT_FLOAT,
|
||||
REFRESH_VERTEXELEMENTFORMAT_VECTOR2,
|
||||
REFRESH_VERTEXELEMENTFORMAT_VECTOR3,
|
||||
REFRESH_VERTEXELEMENTFORMAT_VECTOR4,
|
||||
|
|
|
@ -34,11 +34,11 @@
|
|||
/* Drivers */
|
||||
|
||||
static const Refresh_Driver *drivers[] = {
|
||||
#if REFRESH_DRIVER_VULKAN
|
||||
#ifdef REFRESH_DRIVER_VULKAN
|
||||
&VulkanDriver,
|
||||
#endif
|
||||
#if REFRESH_DRIVER_D3D11
|
||||
&D3D11Driver,
|
||||
#ifdef REFRESH_DRIVER_PS5
|
||||
&PS5Driver,
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
@ -129,43 +129,22 @@ uint32_t Refresh_LinkedVersion(void)
|
|||
|
||||
/* Driver Functions */
|
||||
|
||||
static int32_t selectedDriver = -1;
|
||||
static int32_t selectedDriver = 0;
|
||||
|
||||
Refresh_Device* Refresh_CreateDevice(
|
||||
Refresh_PresentationParameters *presentationParameters,
|
||||
uint8_t debugMode
|
||||
) {
|
||||
uint32_t result = 0;
|
||||
uint32_t i;
|
||||
const char *hint = SDL_GetHint("REFRESH_FORCE_DRIVER");
|
||||
for (i = 0; drivers[i] != NULL; i += 1)
|
||||
if (selectedDriver < 0)
|
||||
{
|
||||
if (hint != NULL)
|
||||
{
|
||||
if (SDL_strcmp(hint, drivers[i]->Name) != 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
/* FIXME: add fallback driver handling */
|
||||
break;
|
||||
}
|
||||
|
||||
if (drivers[i] == NULL)
|
||||
{
|
||||
Refresh_LogError("No supported Refresh driver found!");
|
||||
return NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
selectedDriver = i;
|
||||
|
||||
return drivers[selectedDriver]->CreateDevice(
|
||||
presentationParameters,
|
||||
debugMode
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void Refresh_DestroyDevice(Refresh_Device *device)
|
||||
{
|
||||
|
|
|
@ -36,9 +36,15 @@
|
|||
|
||||
/* Logging */
|
||||
|
||||
extern void Refresh_LogInfo(const char *fmt, ...);
|
||||
extern void Refresh_LogWarn(const char *fmt, ...);
|
||||
extern void Refresh_LogError(const char *fmt, ...);
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
void Refresh_LogInfo(const char *fmt, ...);
|
||||
void Refresh_LogWarn(const char *fmt, ...);
|
||||
void Refresh_LogError(const char *fmt, ...);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Internal Helper Utilities */
|
||||
|
||||
|
@ -51,6 +57,7 @@ static inline uint32_t Texture_GetFormatSize(
|
|||
return 8;
|
||||
case REFRESH_TEXTUREFORMAT_BC2:
|
||||
case REFRESH_TEXTUREFORMAT_BC3:
|
||||
case REFRESH_TEXTUREFORMAT_BC7:
|
||||
return 16;
|
||||
case REFRESH_TEXTUREFORMAT_R8:
|
||||
return 1;
|
||||
|
@ -117,7 +124,8 @@ static inline uint32_t BytesPerRow(
|
|||
|
||||
if ( format == REFRESH_TEXTUREFORMAT_BC1 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC2 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC3 )
|
||||
format == REFRESH_TEXTUREFORMAT_BC3 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC7 )
|
||||
{
|
||||
blocksPerRow = (width + 3) / 4;
|
||||
}
|
||||
|
@ -135,7 +143,8 @@ static inline int32_t BytesPerImage(
|
|||
|
||||
if ( format == REFRESH_TEXTUREFORMAT_BC1 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC2 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC3 )
|
||||
format == REFRESH_TEXTUREFORMAT_BC3 ||
|
||||
format == REFRESH_TEXTUREFORMAT_BC7 )
|
||||
{
|
||||
blocksPerRow = (width + 3) / 4;
|
||||
blocksPerColumn = (height + 3) / 4;
|
||||
|
@ -522,7 +531,7 @@ typedef struct Refresh_Driver
|
|||
} Refresh_Driver;
|
||||
|
||||
extern Refresh_Driver VulkanDriver;
|
||||
extern Refresh_Driver D3D11Driver;
|
||||
extern Refresh_Driver PS5Driver;
|
||||
|
||||
#endif /* REFRESH_DRIVER_H */
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,215 +0,0 @@
|
|||
/* Refresh - XNA-inspired 3D Graphics Library with modern capabilities
|
||||
*
|
||||
* Copyright (c) 2020 Evan Hemsley
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied warranty.
|
||||
* In no event will the authors be held liable for any damages arising from
|
||||
* the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software in a
|
||||
* product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source distribution.
|
||||
*
|
||||
* Evan "cosmonaut" Hemsley <evan@moonside.games>
|
||||
*
|
||||
*/
|
||||
|
||||
/* Function Pointer Signatures */
|
||||
typedef HRESULT(WINAPI* PFN_CREATE_DXGI_FACTORY)(const GUID* riid, void** ppFactory);
|
||||
|
||||
/* IIDs (from https://magnumdb.com) */
|
||||
|
||||
static const IID D3D_IID_IDXGIFactory1 = { 0x770aae78,0xf26f,0x4dba,{0xa8,0x29,0x25,0x3c,0x83,0xd1,0xb3,0x87} };
|
||||
static const IID D3D_IID_IDXGIFactory6 = { 0xc1b6694f,0xff09,0x44a9,{0xb0,0x3c,0x77,0x90,0x0a,0x0a,0x1d,0x17} };
|
||||
static const IID D3D_IID_IDXGIAdapter1 = { 0x29038f61,0x3839,0x4626,{0x91,0xfd,0x08,0x68,0x79,0x01,0x1a,0x05} };
|
||||
static const IID D3D_IID_ID3D11Texture2D = { 0x6f15aaf2,0xd208,0x4e89,{0x9a,0xb4,0x48,0x95,0x35,0xd3,0x4f,0x9c} };
|
||||
|
||||
/* IDXGIFactory6 (taken from dxgi1_6.h, cleaned up a bit) */
|
||||
typedef enum
|
||||
{
|
||||
DXGI_FEATURE_PRESENT_ALLOW_TEARING = 0
|
||||
} DXGI_FEATURE;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
DXGI_GPU_PREFERENCE_UNSPECIFIED = 0,
|
||||
DXGI_GPU_PREFERENCE_MINIMUM_POWER = (DXGI_GPU_PREFERENCE_UNSPECIFIED + 1),
|
||||
DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = (DXGI_GPU_PREFERENCE_MINIMUM_POWER + 1)
|
||||
} DXGI_GPU_PREFERENCE;
|
||||
|
||||
typedef struct IDXGIFactory6 IDXGIFactory6;
|
||||
typedef struct IDXGIFactory6Vtbl
|
||||
{
|
||||
HRESULT(STDMETHODCALLTYPE* QueryInterface)(
|
||||
IDXGIFactory6* This,
|
||||
REFIID riid,
|
||||
void** ppvObject);
|
||||
|
||||
ULONG(STDMETHODCALLTYPE* AddRef)(
|
||||
IDXGIFactory6* This);
|
||||
|
||||
ULONG(STDMETHODCALLTYPE* Release)(
|
||||
IDXGIFactory6* This);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* SetPrivateData)(
|
||||
IDXGIFactory6* This,
|
||||
REFGUID Name,
|
||||
UINT DataSize,
|
||||
const void* pData);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* SetPrivateDataInterface)(
|
||||
IDXGIFactory6* This,
|
||||
REFGUID Name,
|
||||
const IUnknown* pUnknown);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* GetPrivateData)(
|
||||
IDXGIFactory6* This,
|
||||
REFGUID Name,
|
||||
UINT* pDataSize,
|
||||
void* pData);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* GetParent)(
|
||||
IDXGIFactory6* This,
|
||||
REFIID riid,
|
||||
void** ppParent);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* EnumAdapters)(
|
||||
IDXGIFactory6* This,
|
||||
UINT Adapter,
|
||||
IDXGIAdapter** ppAdapter);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* MakeWindowAssociation)(
|
||||
IDXGIFactory6* This,
|
||||
HWND WindowHandle,
|
||||
UINT Flags);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* GetWindowAssociation)(
|
||||
IDXGIFactory6* This,
|
||||
HWND* pWindowHandle);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CreateSwapChain)(
|
||||
IDXGIFactory6* This,
|
||||
IUnknown* pDevice,
|
||||
DXGI_SWAP_CHAIN_DESC* pDesc,
|
||||
IDXGISwapChain** ppSwapChain);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CreateSoftwareAdapter)(
|
||||
IDXGIFactory6* This,
|
||||
HMODULE Module,
|
||||
IDXGIAdapter** ppAdapter);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* EnumAdapters1)(
|
||||
IDXGIFactory6* This,
|
||||
UINT Adapter,
|
||||
IDXGIAdapter1** ppAdapter);
|
||||
|
||||
BOOL(STDMETHODCALLTYPE* IsCurrent)(
|
||||
IDXGIFactory6* This);
|
||||
|
||||
BOOL(STDMETHODCALLTYPE* IsWindowedStereoEnabled)(
|
||||
IDXGIFactory6* This);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CreateSwapChainForHwnd)(
|
||||
IDXGIFactory6* This,
|
||||
IUnknown* pDevice,
|
||||
HWND hWnd,
|
||||
void* pDesc,
|
||||
void* pFullscreenDesc,
|
||||
void* pRestrictToOutput,
|
||||
void** ppSwapChain);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CreateSwapChainForCoreWindow)(
|
||||
IDXGIFactory6* This,
|
||||
IUnknown* pDevice,
|
||||
IUnknown* pWindow,
|
||||
void* pDesc,
|
||||
void* pRestrictToOutput,
|
||||
void** ppSwapChain);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* GetSharedResourceAdapterLuid)(
|
||||
IDXGIFactory6* This,
|
||||
HANDLE hResource,
|
||||
LUID* pLuid);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* RegisterStereoStatusWindow)(
|
||||
IDXGIFactory6* This,
|
||||
HWND WindowHandle,
|
||||
UINT wMsg,
|
||||
DWORD* pdwCookie);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* RegisterStereoStatusEvent)(
|
||||
IDXGIFactory6* This,
|
||||
HANDLE hEvent,
|
||||
DWORD* pdwCookie);
|
||||
|
||||
void (STDMETHODCALLTYPE* UnregisterStereoStatus)(
|
||||
IDXGIFactory6* This,
|
||||
DWORD dwCookie);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* RegisterOcclusionStatusWindow)(
|
||||
IDXGIFactory6* This,
|
||||
HWND WindowHandle,
|
||||
UINT wMsg,
|
||||
DWORD* pdwCookie);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* RegisterOcclusionStatusEvent)(
|
||||
IDXGIFactory6* This,
|
||||
HANDLE hEvent,
|
||||
DWORD* pdwCookie);
|
||||
|
||||
void (STDMETHODCALLTYPE* UnregisterOcclusionStatus)(
|
||||
IDXGIFactory6* This,
|
||||
DWORD dwCookie);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CreateSwapChainForComposition)(
|
||||
IDXGIFactory6* This,
|
||||
IUnknown* pDevice,
|
||||
void* pDesc,
|
||||
void* pRestrictToOutput,
|
||||
void** ppSwapChain);
|
||||
|
||||
UINT(STDMETHODCALLTYPE* GetCreationFlags)(
|
||||
IDXGIFactory6* This);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* EnumAdapterByLuid)(
|
||||
IDXGIFactory6* This,
|
||||
LUID AdapterLuid,
|
||||
REFIID riid,
|
||||
void** ppvAdapter);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* EnumWarpAdapter)(
|
||||
IDXGIFactory6* This,
|
||||
REFIID riid,
|
||||
void** ppvAdapter);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* CheckFeatureSupport)(
|
||||
IDXGIFactory6* This,
|
||||
DXGI_FEATURE Feature,
|
||||
void* pFeatureSupportData,
|
||||
UINT FeatureSupportDataSize);
|
||||
|
||||
HRESULT(STDMETHODCALLTYPE* EnumAdapterByGpuPreference)(
|
||||
IDXGIFactory6* This,
|
||||
UINT Adapter,
|
||||
DXGI_GPU_PREFERENCE GpuPreference,
|
||||
REFIID riid,
|
||||
void** ppvAdapter);
|
||||
} IDXGIFactory6Vtbl;
|
||||
|
||||
struct IDXGIFactory6
|
||||
{
|
||||
struct IDXGIFactory6Vtbl* lpVtbl;
|
||||
};
|
||||
|
||||
#define IDXGIFactory6_EnumAdapterByGpuPreference(This,Adapter,GpuPreference,riid,ppvAdapter) \
|
||||
( (This)->lpVtbl -> EnumAdapterByGpuPreference(This,Adapter,GpuPreference,riid,ppvAdapter) )
|
|
@ -190,6 +190,7 @@ static VkFormat RefreshToVK_SurfaceFormat[] =
|
|||
VK_FORMAT_BC1_RGBA_UNORM_BLOCK, /* BC1 */
|
||||
VK_FORMAT_BC2_UNORM_BLOCK, /* BC3 */
|
||||
VK_FORMAT_BC3_UNORM_BLOCK, /* BC5 */
|
||||
VK_FORMAT_BC7_UNORM_BLOCK, /* BC7 */
|
||||
VK_FORMAT_R8G8_SNORM, /* R8G8_SNORM */
|
||||
VK_FORMAT_R8G8B8A8_SNORM, /* R8G8B8A8_SNORM */
|
||||
VK_FORMAT_A2R10G10B10_UNORM_PACK32, /* A2R10G10B10 */
|
||||
|
@ -210,7 +211,8 @@ static VkFormat RefreshToVK_SurfaceFormat[] =
|
|||
|
||||
static VkFormat RefreshToVK_VertexFormat[] =
|
||||
{
|
||||
VK_FORMAT_R32_SFLOAT, /* SINGLE */
|
||||
VK_FORMAT_R32_UINT, /* UINT */
|
||||
VK_FORMAT_R32_SFLOAT, /* FLOAT */
|
||||
VK_FORMAT_R32G32_SFLOAT, /* VECTOR2 */
|
||||
VK_FORMAT_R32G32B32_SFLOAT, /* VECTOR3 */
|
||||
VK_FORMAT_R32G32B32A32_SFLOAT, /* VECTOR4 */
|
||||
|
@ -911,6 +913,7 @@ static inline void DescriptorSetLayoutHashTable_Insert(
|
|||
|
||||
typedef struct RenderPassColorTargetDescription
|
||||
{
|
||||
VkFormat format;
|
||||
Refresh_Vec4 clearColor;
|
||||
Refresh_LoadOp loadOp;
|
||||
Refresh_StoreOp storeOp;
|
||||
|
@ -918,6 +921,7 @@ typedef struct RenderPassColorTargetDescription
|
|||
|
||||
typedef struct RenderPassDepthStencilTargetDescription
|
||||
{
|
||||
VkFormat format;
|
||||
Refresh_LoadOp loadOp;
|
||||
Refresh_StoreOp storeOp;
|
||||
Refresh_LoadOp stencilLoadOp;
|
||||
|
@ -957,6 +961,11 @@ static inline uint8_t RenderPassHash_Compare(
|
|||
|
||||
for (i = 0; i < a->colorAttachmentCount; i += 1)
|
||||
{
|
||||
if (a->colorTargetDescriptions[i].format != b->colorTargetDescriptions[i].format)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ( a->colorTargetDescriptions[i].clearColor.x != b->colorTargetDescriptions[i].clearColor.x ||
|
||||
a->colorTargetDescriptions[i].clearColor.y != b->colorTargetDescriptions[i].clearColor.y ||
|
||||
a->colorTargetDescriptions[i].clearColor.z != b->colorTargetDescriptions[i].clearColor.z ||
|
||||
|
@ -976,6 +985,11 @@ static inline uint8_t RenderPassHash_Compare(
|
|||
}
|
||||
}
|
||||
|
||||
if (a->depthStencilTargetDescription.format != b->depthStencilTargetDescription.format)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (a->depthStencilTargetDescription.loadOp != b->depthStencilTargetDescription.loadOp)
|
||||
{
|
||||
return 0;
|
||||
|
@ -1673,6 +1687,10 @@ typedef struct VulkanRenderer
|
|||
|
||||
VkDeviceSize minUBOAlignment;
|
||||
|
||||
/* Some drivers don't support D16 for some reason. Fun! */
|
||||
VkFormat D16Format;
|
||||
VkFormat D16S8Format;
|
||||
|
||||
VulkanTexture **texturesToDestroy;
|
||||
uint32_t texturesToDestroyCount;
|
||||
uint32_t texturesToDestroyCapacity;
|
||||
|
@ -1781,6 +1799,40 @@ static inline void LogVulkanResultAsWarn(
|
|||
|
||||
/* Utility */
|
||||
|
||||
static inline VkFormat RefreshToVK_DepthFormat(
|
||||
VulkanRenderer* renderer,
|
||||
Refresh_TextureFormat format
|
||||
) {
|
||||
switch (format)
|
||||
{
|
||||
case REFRESH_TEXTUREFORMAT_D16_UNORM:
|
||||
return renderer->D16Format;
|
||||
case REFRESH_TEXTUREFORMAT_D16_UNORM_S8_UINT:
|
||||
return renderer->D16S8Format;
|
||||
case REFRESH_TEXTUREFORMAT_D32_SFLOAT:
|
||||
return VK_FORMAT_D32_SFLOAT;
|
||||
case REFRESH_TEXTUREFORMAT_D32_SFLOAT_S8_UINT:
|
||||
return VK_FORMAT_D32_SFLOAT_S8_UINT;
|
||||
default:
|
||||
return VK_FORMAT_UNDEFINED;
|
||||
}
|
||||
}
|
||||
|
||||
static inline uint8_t IsRefreshDepthFormat(Refresh_TextureFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
case REFRESH_TEXTUREFORMAT_D16_UNORM:
|
||||
case REFRESH_TEXTUREFORMAT_D32_SFLOAT:
|
||||
case REFRESH_TEXTUREFORMAT_D16_UNORM_S8_UINT:
|
||||
case REFRESH_TEXTUREFORMAT_D32_SFLOAT_S8_UINT:
|
||||
return 1;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static inline uint8_t IsDepthFormat(VkFormat format)
|
||||
{
|
||||
switch(format)
|
||||
|
@ -1816,6 +1868,7 @@ static inline uint32_t VULKAN_INTERNAL_BytesPerPixel(VkFormat format)
|
|||
case VK_FORMAT_R32G32B32A32_SFLOAT:
|
||||
case VK_FORMAT_BC2_UNORM_BLOCK:
|
||||
case VK_FORMAT_BC3_UNORM_BLOCK:
|
||||
case VK_FORMAT_BC7_UNORM_BLOCK:
|
||||
return 16;
|
||||
|
||||
case VK_FORMAT_R8G8B8A8_UNORM:
|
||||
|
@ -1856,6 +1909,40 @@ static inline uint32_t VULKAN_INTERNAL_BytesPerPixel(VkFormat format)
|
|||
}
|
||||
}
|
||||
|
||||
static inline uint32_t VULKAN_INTERNAL_GetTextureBlockSize(
|
||||
VkFormat format
|
||||
) {
|
||||
switch (format)
|
||||
{
|
||||
case VK_FORMAT_BC1_RGBA_UNORM_BLOCK:
|
||||
case VK_FORMAT_BC2_UNORM_BLOCK:
|
||||
case VK_FORMAT_BC3_UNORM_BLOCK:
|
||||
case VK_FORMAT_BC7_UNORM_BLOCK:
|
||||
return 4;
|
||||
case VK_FORMAT_R8G8B8A8_UNORM:
|
||||
case VK_FORMAT_B8G8R8A8_UNORM:
|
||||
case VK_FORMAT_R5G6B5_UNORM_PACK16:
|
||||
case VK_FORMAT_A1R5G5B5_UNORM_PACK16:
|
||||
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
|
||||
case VK_FORMAT_R8G8_SNORM:
|
||||
case VK_FORMAT_R8G8B8A8_SNORM:
|
||||
case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
|
||||
case VK_FORMAT_R16G16_UNORM:
|
||||
case VK_FORMAT_R16G16B16A16_UNORM:
|
||||
case VK_FORMAT_R8_UNORM:
|
||||
case VK_FORMAT_R32_SFLOAT:
|
||||
case VK_FORMAT_R32G32_SFLOAT:
|
||||
case VK_FORMAT_R32G32B32A32_SFLOAT:
|
||||
case VK_FORMAT_R16_SFLOAT:
|
||||
case VK_FORMAT_R16G16_SFLOAT:
|
||||
case VK_FORMAT_R16G16B16A16_SFLOAT:
|
||||
return 1;
|
||||
default:
|
||||
Refresh_LogError("Unrecognized texture format!");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static inline VkDeviceSize VULKAN_INTERNAL_BytesPerImage(
|
||||
uint32_t width,
|
||||
uint32_t height,
|
||||
|
@ -1863,12 +1950,12 @@ static inline VkDeviceSize VULKAN_INTERNAL_BytesPerImage(
|
|||
) {
|
||||
uint32_t blocksPerRow = width;
|
||||
uint32_t blocksPerColumn = height;
|
||||
uint32_t blockSize = VULKAN_INTERNAL_GetTextureBlockSize(format);
|
||||
|
||||
if (format == VK_FORMAT_BC1_RGBA_UNORM_BLOCK ||
|
||||
format == VK_FORMAT_BC3_UNORM_BLOCK ||
|
||||
format == VK_FORMAT_BC5_UNORM_BLOCK)
|
||||
if (blockSize > 1)
|
||||
{
|
||||
blocksPerRow = (width + 3) / 4;
|
||||
blocksPerRow = (width + blockSize - 1) / blockSize;
|
||||
blocksPerColumn = (height + blockSize - 1) / blockSize;
|
||||
}
|
||||
|
||||
return blocksPerRow * blocksPerColumn * VULKAN_INTERNAL_BytesPerPixel(format);
|
||||
|
@ -5613,9 +5700,10 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
|
|||
if (attachmentInfo.hasDepthStencilAttachment)
|
||||
{
|
||||
attachmentDescriptions[attachmentDescriptionCount].flags = 0;
|
||||
attachmentDescriptions[attachmentDescriptionCount].format = RefreshToVK_SurfaceFormat[
|
||||
attachmentDescriptions[attachmentDescriptionCount].format = RefreshToVK_DepthFormat(
|
||||
renderer,
|
||||
attachmentInfo.depthStencilFormat
|
||||
];
|
||||
);
|
||||
attachmentDescriptions[attachmentDescriptionCount].samples =
|
||||
VK_SAMPLE_COUNT_1_BIT; /* FIXME: do these take multisamples? */
|
||||
attachmentDescriptions[attachmentDescriptionCount].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
|
||||
|
@ -6312,7 +6400,16 @@ static Refresh_Texture* VULKAN_CreateTexture(
|
|||
VK_IMAGE_USAGE_TRANSFER_SRC_BIT
|
||||
);
|
||||
VkImageAspectFlags imageAspectFlags;
|
||||
VkFormat format = RefreshToVK_SurfaceFormat[textureCreateInfo->format];
|
||||
VkFormat format;
|
||||
|
||||
if (IsRefreshDepthFormat(textureCreateInfo->format))
|
||||
{
|
||||
format = RefreshToVK_DepthFormat(renderer, textureCreateInfo->format);
|
||||
}
|
||||
else
|
||||
{
|
||||
format = RefreshToVK_SurfaceFormat[textureCreateInfo->format];
|
||||
}
|
||||
|
||||
if (textureCreateInfo->usageFlags & REFRESH_TEXTUREUSAGE_SAMPLER_BIT)
|
||||
{
|
||||
|
@ -6506,6 +6603,9 @@ static void VULKAN_SetTextureData(
|
|||
VulkanTransferBuffer *transferBuffer;
|
||||
VkBufferImageCopy imageCopy;
|
||||
uint8_t *stagingBufferPointer;
|
||||
uint32_t blockSize = VULKAN_INTERNAL_GetTextureBlockSize(vulkanTexture->format);
|
||||
uint32_t bufferRowLength;
|
||||
uint32_t bufferImageHeight;
|
||||
|
||||
if (vulkanCommandBuffer->renderPassInProgress)
|
||||
{
|
||||
|
@ -6554,6 +6654,9 @@ static void VULKAN_SetTextureData(
|
|||
&vulkanTexture->resourceAccessType
|
||||
);
|
||||
|
||||
bufferRowLength = SDL_max(blockSize, textureSlice->rectangle.w);
|
||||
bufferImageHeight = SDL_max(blockSize, textureSlice->rectangle.h);
|
||||
|
||||
imageCopy.imageExtent.width = textureSlice->rectangle.w;
|
||||
imageCopy.imageExtent.height = textureSlice->rectangle.h;
|
||||
imageCopy.imageExtent.depth = 1;
|
||||
|
@ -6565,8 +6668,8 @@ static void VULKAN_SetTextureData(
|
|||
imageCopy.imageSubresource.layerCount = 1;
|
||||
imageCopy.imageSubresource.mipLevel = textureSlice->level;
|
||||
imageCopy.bufferOffset = transferBuffer->offset;
|
||||
imageCopy.bufferRowLength = 0;
|
||||
imageCopy.bufferImageHeight = 0;
|
||||
imageCopy.bufferRowLength = bufferRowLength;
|
||||
imageCopy.bufferImageHeight = bufferImageHeight;
|
||||
|
||||
renderer->vkCmdCopyBufferToImage(
|
||||
vulkanCommandBuffer->commandBuffer,
|
||||
|
@ -6691,6 +6794,24 @@ static void VULKAN_SetTextureDataYUV(
|
|||
&imageCopy
|
||||
);
|
||||
|
||||
if (tex->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
/* TODO: is it worth it to only transition the specific subresource? */
|
||||
VULKAN_INTERNAL_ImageMemoryBarrier(
|
||||
renderer,
|
||||
vulkanCommandBuffer->commandBuffer,
|
||||
RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
0,
|
||||
tex->layerCount,
|
||||
0,
|
||||
tex->levelCount,
|
||||
0,
|
||||
tex->image,
|
||||
&tex->resourceAccessType
|
||||
);
|
||||
}
|
||||
|
||||
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, tex);
|
||||
|
||||
/* These apply to both U and V */
|
||||
|
@ -6735,6 +6856,24 @@ static void VULKAN_SetTextureDataYUV(
|
|||
&imageCopy
|
||||
);
|
||||
|
||||
if (tex->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
/* TODO: is it worth it to only transition the specific subresource? */
|
||||
VULKAN_INTERNAL_ImageMemoryBarrier(
|
||||
renderer,
|
||||
vulkanCommandBuffer->commandBuffer,
|
||||
RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
0,
|
||||
tex->layerCount,
|
||||
0,
|
||||
tex->levelCount,
|
||||
0,
|
||||
tex->image,
|
||||
&tex->resourceAccessType
|
||||
);
|
||||
}
|
||||
|
||||
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, tex);
|
||||
|
||||
/* V */
|
||||
|
@ -6774,11 +6913,9 @@ static void VULKAN_SetTextureDataYUV(
|
|||
|
||||
transferBuffer->offset += yDataLength + uvDataLength;
|
||||
|
||||
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, tex);
|
||||
|
||||
/* FIXME: don't we have to do this for every image? */
|
||||
if (tex->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
/* TODO: is it worth it to only transition the specific subresource? */
|
||||
VULKAN_INTERNAL_ImageMemoryBarrier(
|
||||
renderer,
|
||||
vulkanCommandBuffer->commandBuffer,
|
||||
|
@ -6793,6 +6930,8 @@ static void VULKAN_SetTextureDataYUV(
|
|||
&tex->resourceAccessType
|
||||
);
|
||||
}
|
||||
|
||||
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, tex);
|
||||
}
|
||||
|
||||
static void VULKAN_INTERNAL_BlitImage(
|
||||
|
@ -6857,8 +6996,8 @@ static void VULKAN_INTERNAL_BlitImage(
|
|||
blit.dstOffsets[1].y = destinationTextureSlice->rectangle.y + destinationTextureSlice->rectangle.h;
|
||||
blit.dstOffsets[1].z = 1;
|
||||
|
||||
blit.dstSubresource.mipLevel = sourceTextureSlice->level;
|
||||
blit.dstSubresource.baseArrayLayer = sourceTextureSlice->layer;
|
||||
blit.dstSubresource.mipLevel = destinationTextureSlice->level;
|
||||
blit.dstSubresource.baseArrayLayer = destinationTextureSlice->layer;
|
||||
blit.dstSubresource.layerCount = 1;
|
||||
blit.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||
|
||||
|
@ -7655,6 +7794,7 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(
|
|||
|
||||
for (i = 0; i < colorAttachmentCount; i += 1)
|
||||
{
|
||||
hash.colorTargetDescriptions[i].format = ((VulkanTexture*) colorAttachmentInfos[i].texture)->format;
|
||||
hash.colorTargetDescriptions[i].clearColor = colorAttachmentInfos[i].clearColor;
|
||||
hash.colorTargetDescriptions[i].loadOp = colorAttachmentInfos[i].loadOp;
|
||||
hash.colorTargetDescriptions[i].storeOp = colorAttachmentInfos[i].storeOp;
|
||||
|
@ -7664,6 +7804,7 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(
|
|||
|
||||
if (depthStencilAttachmentInfo == NULL)
|
||||
{
|
||||
hash.depthStencilTargetDescription.format = 0;
|
||||
hash.depthStencilTargetDescription.loadOp = REFRESH_LOADOP_DONT_CARE;
|
||||
hash.depthStencilTargetDescription.storeOp = REFRESH_STOREOP_DONT_CARE;
|
||||
hash.depthStencilTargetDescription.stencilLoadOp = REFRESH_LOADOP_DONT_CARE;
|
||||
|
@ -7671,6 +7812,7 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(
|
|||
}
|
||||
else
|
||||
{
|
||||
hash.depthStencilTargetDescription.format = ((VulkanTexture*) depthStencilAttachmentInfo->texture)->format;
|
||||
hash.depthStencilTargetDescription.loadOp = depthStencilAttachmentInfo->loadOp;
|
||||
hash.depthStencilTargetDescription.storeOp = depthStencilAttachmentInfo->storeOp;
|
||||
hash.depthStencilTargetDescription.stencilLoadOp = depthStencilAttachmentInfo->stencilLoadOp;
|
||||
|
@ -7999,6 +8141,8 @@ static void VULKAN_BeginRenderPass(
|
|||
|
||||
if (depthStencilAttachmentInfo != NULL)
|
||||
{
|
||||
texture = (VulkanTexture*) depthStencilAttachmentInfo->texture;
|
||||
|
||||
if (texture->dimensions.width < framebufferWidth)
|
||||
{
|
||||
framebufferWidth = texture->dimensions.width;
|
||||
|
@ -9362,9 +9506,9 @@ static void VULKAN_Submit(
|
|||
|
||||
/* Mark command buffers as submitted */
|
||||
|
||||
if (renderer->submittedCommandBufferCount + commandBufferCount >= renderer->submittedCommandBufferCapacity)
|
||||
if (renderer->submittedCommandBufferCount + 1 >= renderer->submittedCommandBufferCapacity)
|
||||
{
|
||||
renderer->submittedCommandBufferCapacity = renderer->submittedCommandBufferCount + commandBufferCount;
|
||||
renderer->submittedCommandBufferCapacity = renderer->submittedCommandBufferCount + 1;
|
||||
|
||||
renderer->submittedCommandBuffers = SDL_realloc(
|
||||
renderer->submittedCommandBuffers,
|
||||
|
@ -9372,12 +9516,9 @@ static void VULKAN_Submit(
|
|||
);
|
||||
}
|
||||
|
||||
for (i = 0; i < commandBufferCount; i += 1)
|
||||
{
|
||||
((VulkanCommandBuffer*)pCommandBuffers[i])->submitted = 1;
|
||||
renderer->submittedCommandBuffers[renderer->submittedCommandBufferCount] = (VulkanCommandBuffer*) pCommandBuffers[i];
|
||||
renderer->submittedCommandBufferCount += 1;
|
||||
}
|
||||
|
||||
/* Present, if applicable */
|
||||
|
||||
|
@ -10131,6 +10272,9 @@ static Refresh_Device* VULKAN_CreateDevice(
|
|||
VkDescriptorPoolSize poolSizes[4];
|
||||
VkDescriptorSetAllocateInfo descriptorAllocateInfo;
|
||||
|
||||
/* Variables: Image Format Detection */
|
||||
VkImageFormatProperties imageFormatProperties;
|
||||
|
||||
VULKAN_INTERNAL_LoadEntryPoints(renderer);
|
||||
|
||||
renderer->presentMode = presentationParameters->presentMode;
|
||||
|
@ -10570,12 +10714,53 @@ static Refresh_Device* VULKAN_CreateDevice(
|
|||
renderer->renderTargetHashArray.capacity = 0;
|
||||
|
||||
/* Initialize transfer buffer pool */
|
||||
|
||||
renderer->transferBufferPool.lock = SDL_CreateMutex();
|
||||
|
||||
renderer->transferBufferPool.availableBufferCapacity = 4;
|
||||
renderer->transferBufferPool.availableBufferCount = 0;
|
||||
renderer->transferBufferPool.availableBuffers = SDL_malloc(renderer->transferBufferPool.availableBufferCapacity * sizeof(VulkanTransferBuffer*));
|
||||
|
||||
/* Some drivers don't support D16, so we have to fall back to D32. */
|
||||
|
||||
vulkanResult = renderer->vkGetPhysicalDeviceImageFormatProperties(
|
||||
renderer->physicalDevice,
|
||||
VK_FORMAT_D16_UNORM,
|
||||
VK_IMAGE_TYPE_2D,
|
||||
VK_IMAGE_TILING_OPTIMAL,
|
||||
VK_IMAGE_ASPECT_DEPTH_BIT,
|
||||
0,
|
||||
&imageFormatProperties
|
||||
);
|
||||
|
||||
if (vulkanResult == VK_ERROR_FORMAT_NOT_SUPPORTED)
|
||||
{
|
||||
renderer->D16Format = VK_FORMAT_D32_SFLOAT;
|
||||
}
|
||||
else
|
||||
{
|
||||
renderer->D16Format = VK_FORMAT_D16_UNORM;
|
||||
}
|
||||
|
||||
vulkanResult = renderer->vkGetPhysicalDeviceImageFormatProperties(
|
||||
renderer->physicalDevice,
|
||||
VK_FORMAT_D16_UNORM_S8_UINT,
|
||||
VK_IMAGE_TYPE_2D,
|
||||
VK_IMAGE_TILING_OPTIMAL,
|
||||
VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT,
|
||||
0,
|
||||
&imageFormatProperties
|
||||
);
|
||||
|
||||
if (vulkanResult == VK_ERROR_FORMAT_NOT_SUPPORTED)
|
||||
{
|
||||
renderer->D16S8Format = VK_FORMAT_D32_SFLOAT_S8_UINT;
|
||||
}
|
||||
else
|
||||
{
|
||||
renderer->D16S8Format = VK_FORMAT_D16_UNORM_S8_UINT;
|
||||
}
|
||||
|
||||
/* Deferred destroy storage */
|
||||
|
||||
renderer->texturesToDestroyCapacity = 16;
|
||||
|
|
|
@ -8,29 +8,19 @@ EndProject
|
|||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
MinSizeRel|x64 = MinSizeRel|x64
|
||||
MinSizeRel|x86 = MinSizeRel|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
||||
RelWithDebInfo|x86 = RelWithDebInfo|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Debug|x64.Build.0 = Debug|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Debug|x86.Build.0 = Debug|Win32
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Release|x64.ActiveCfg = Release|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Release|x64.Build.0 = Release|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Release|x86.ActiveCfg = Release|Win32
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.Release|x86.Build.0 = Release|Win32
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
|
||||
{6DB15344-E000-45CB-A48A-1D72F7D6E945}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -61,8 +61,7 @@
|
|||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>REFRESH_DRIVER_D3D11;REFRESH_DRIVER_VULKAN;SPIRV_CROSS_C_API_GLSL;SPIRV_CROSS_C_API_HLSL;SPIRV_CROSS_C_API_REFLECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>REFRESH_DRIVER_VULKAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
|
||||
|
@ -73,10 +72,9 @@
|
|||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions>REFRESH_DRIVER_D3D11;REFRESH_DRIVER_VULKAN;SPIRV_CROSS_C_API_GLSL;SPIRV_CROSS_C_API_HLSL;SPIRV_CROSS_C_API_REFLECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>REFRESH_DRIVER_VULKAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
@ -85,16 +83,7 @@
|
|||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cfg.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross_c.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_glsl.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_hlsl.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_parser.cpp" />
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_reflect.cpp" />
|
||||
<ClCompile Include="..\src\Refresh.c" />
|
||||
<ClCompile Include="..\src\Refresh_Driver_D3D11.c" />
|
||||
<ClCompile Include="..\src\Refresh_Driver_Vulkan.c" />
|
||||
<ClCompile Include="..\src\Refresh_Image.c" />
|
||||
</ItemGroup>
|
||||
|
@ -102,7 +91,6 @@
|
|||
<ClInclude Include="..\include\Refresh.h" />
|
||||
<ClInclude Include="..\include\Refresh_Image.h" />
|
||||
<ClInclude Include="..\src\Refresh_Driver.h" />
|
||||
<ClInclude Include="..\src\Refresh_Driver_D3D11_cdefines.h" />
|
||||
<ClInclude Include="..\src\Refresh_Driver_Vulkan_vkfuncs.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
@ -10,33 +10,6 @@
|
|||
<ClCompile Include="..\src\Refresh_Image.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\Refresh_Driver_D3D11.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cfg.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross_c.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_cross_parsed_ir.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_glsl.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_hlsl.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_parser.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SPIRV-Cross\spirv_reflect.cpp">
|
||||
<Filter>Source Files\spirv-cross</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\include\Refresh.h">
|
||||
|
@ -51,9 +24,6 @@
|
|||
<ClInclude Include="..\include\Refresh_Image.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\Refresh_Driver_D3D11_cdefines.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="Header Files">
|
||||
|
@ -62,8 +32,5 @@
|
|||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{B2BA146C-CAA1-30BE-B7A9-F8D02673EA0C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\spirv-cross">
|
||||
<UniqueIdentifier>{4764626f-fd8b-4a1c-8c20-fd92a1f3cb4b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
</Project>
|
Loading…
Reference in New Issue