From ffae2d8bfb1c71bd6e17c16889f01a1bfdf5791e Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Sat, 19 Dec 2020 23:41:03 -0800 Subject: [PATCH] remove AddDisposeShaderParamBuffer --- include/Refresh.h | 12 ----------- src/Refresh.c | 43 +++++++++++++++++++++++++++---------- src/Refresh_Driver.h | 6 ------ src/Refresh_Driver_Vulkan.c | 7 ------ 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/include/Refresh.h b/include/Refresh.h index c56f220..5879b8e 100644 --- a/include/Refresh.h +++ b/include/Refresh.h @@ -1123,18 +1123,6 @@ REFRESHAPI void REFRESH_AddDisposeIndexBuffer( REFRESH_Buffer *buffer ); -/* Sends an shader param buffer to be destroyed by the renderer. Note that we call it - * "AddDispose" because it may not be immediately destroyed by the renderer if - * this is not called from the main thread (for example, if a garbage collector - * deletes the resource instead of the programmer). - * - * buffer: The REFRESH_Buffer to be destroyed. - */ -REFRESHAPI void REFRESH_AddDisposeShaderParamBuffer( - REFRESH_Device *device, - REFRESH_Buffer *buffer -); - /* Sends a color target to be destroyed by the renderer. Note that we call it * "AddDispose" because it may not be immediately destroyed by the renderer if * this is not called from the main thread (for example, if a garbage collector diff --git a/src/Refresh.c b/src/Refresh.c index 1f0a026..6992741 100644 --- a/src/Refresh.c +++ b/src/Refresh.c @@ -675,17 +675,6 @@ void REFRESH_AddDisposeIndexBuffer( ); } -void REFRESH_AddDisposeShaderParamBuffer( - REFRESH_Device *device, - REFRESH_Buffer *buffer -) { - NULL_RETURN(device); - device->AddDisposeShaderParamBuffer( - device->driverData, - buffer - ); -} - void REFRESH_AddDisposeColorTarget( REFRESH_Device *device, REFRESH_ColorTarget *colorTarget @@ -789,6 +778,38 @@ void REFRESH_BindGraphicsPipeline( ); } +void REFRESH_BindVertexBuffers( + REFRESH_Device *device, + uint32_t firstBinding, + uint32_t bindingCount, + REFRESH_Buffer **pBuffers, + uint64_t *pOffsets +) { + NULL_RETURN(device); + device->BindVertexBuffers( + device->driverData, + firstBinding, + bindingCount, + pBuffers, + pOffsets + ); +} + +void REFRESH_BindIndexBuffer( + REFRESH_Device *device, + REFRESH_Buffer *buffer, + uint64_t offset, + REFRESH_IndexElementSize indexElementSize +) { + NULL_RETURN(device); + device->BindIndexBuffer( + device->driverData, + buffer, + offset, + indexElementSize + ); +} + void REFRESH_Present( REFRESH_Device *device, REFRESH_Rect *sourceRectangle, diff --git a/src/Refresh_Driver.h b/src/Refresh_Driver.h index fe50f3c..c2f62a6 100644 --- a/src/Refresh_Driver.h +++ b/src/Refresh_Driver.h @@ -426,11 +426,6 @@ struct REFRESH_Device REFRESH_Buffer *buffer ); - void(*AddDisposeShaderParamBuffer)( - REFRESH_Renderer *driverData, - REFRESH_Buffer *buffer - ); - void(*AddDisposeColorTarget)( REFRESH_Renderer *driverData, REFRESH_ColorTarget *colorTarget @@ -541,7 +536,6 @@ struct REFRESH_Device ASSIGN_DRIVER_FUNC(AddDisposeSampler, name) \ ASSIGN_DRIVER_FUNC(AddDisposeVertexBuffer, name) \ ASSIGN_DRIVER_FUNC(AddDisposeIndexBuffer, name) \ - ASSIGN_DRIVER_FUNC(AddDisposeShaderParamBuffer, name) \ ASSIGN_DRIVER_FUNC(AddDisposeColorTarget, name) \ ASSIGN_DRIVER_FUNC(AddDisposeDepthStencilTarget, name) \ ASSIGN_DRIVER_FUNC(AddDisposeFramebuffer, name) \ diff --git a/src/Refresh_Driver_Vulkan.c b/src/Refresh_Driver_Vulkan.c index b49cd82..5ea99ab 100644 --- a/src/Refresh_Driver_Vulkan.c +++ b/src/Refresh_Driver_Vulkan.c @@ -3812,13 +3812,6 @@ static void VULKAN_AddDisposeIndexBuffer( SDL_assert(0); } -static void VULKAN_AddDisposeShaderParamBuffer( - REFRESH_Renderer *driverData, - REFRESH_Buffer *buffer -) { - SDL_assert(0); -} - static void VULKAN_AddDisposeColorTarget( REFRESH_Renderer *driverData, REFRESH_ColorTarget *colorTarget