From 2731d474198612f5ff6fa6e77b77e1c8c32cfe12 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Fri, 4 Mar 2022 12:47:36 -0800 Subject: [PATCH] rename viewport and scissor set functions --- include/Refresh.h | 4 ++-- src/Refresh.c | 8 ++++---- src/Refresh_Driver.h | 8 ++++---- src/Refresh_Driver_Vulkan.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/Refresh.h b/include/Refresh.h index 4487d81..c40faa9 100644 --- a/include/Refresh.h +++ b/include/Refresh.h @@ -1017,14 +1017,14 @@ REFRESHAPI void Refresh_BindGraphicsPipeline( ); /* Sets the current viewport state. */ -REFRESHAPI void Refresh_SetViewportState( +REFRESHAPI void Refresh_SetViewport( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, Refresh_Viewport *viewport ); /* Sets the current scissor state. */ -REFRESHAPI void Refresh_SetScissorState( +REFRESHAPI void Refresh_SetScissor( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, Refresh_Rect *scissor diff --git a/src/Refresh.c b/src/Refresh.c index 3f0ca92..e01761c 100644 --- a/src/Refresh.c +++ b/src/Refresh.c @@ -601,26 +601,26 @@ void Refresh_EndRenderPass( ); } -void Refresh_SetViewportState( +void Refresh_SetViewport( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, Refresh_Viewport *viewport ) { NULL_RETURN(device) - device->SetViewportState( + device->SetViewport( device->driverData, commandBuffer, viewport ); } -void Refresh_SetScissorState( +void Refresh_SetScissor( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, Refresh_Rect *scissor ) { NULL_RETURN(device) - device->SetScissorState( + device->SetScissor( device->driverData, commandBuffer, scissor diff --git a/src/Refresh_Driver.h b/src/Refresh_Driver.h index 6a25f68..52894c8 100644 --- a/src/Refresh_Driver.h +++ b/src/Refresh_Driver.h @@ -390,13 +390,13 @@ struct Refresh_Device Refresh_CommandBuffer *commandBuffer ); - void(*SetViewportState)( + void(*SetViewport)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, Refresh_Viewport *viewport ); - void(*SetScissorState)( + void(*SetScissor)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, Refresh_Rect *scissor @@ -507,8 +507,8 @@ struct Refresh_Device ASSIGN_DRIVER_FUNC(QueueDestroyGraphicsPipeline, name) \ ASSIGN_DRIVER_FUNC(BeginRenderPass, name) \ ASSIGN_DRIVER_FUNC(EndRenderPass, name) \ - ASSIGN_DRIVER_FUNC(SetViewportState, name) \ - ASSIGN_DRIVER_FUNC(SetScissorState, name) \ + ASSIGN_DRIVER_FUNC(SetViewport, name) \ + ASSIGN_DRIVER_FUNC(SetScissor, name) \ ASSIGN_DRIVER_FUNC(BindGraphicsPipeline, name) \ ASSIGN_DRIVER_FUNC(BindVertexBuffers, name) \ ASSIGN_DRIVER_FUNC(BindIndexBuffer, name) \ diff --git a/src/Refresh_Driver_Vulkan.c b/src/Refresh_Driver_Vulkan.c index 3cac30e..8d264d3 100644 --- a/src/Refresh_Driver_Vulkan.c +++ b/src/Refresh_Driver_Vulkan.c @@ -7953,7 +7953,7 @@ static void VULKAN_INTERNAL_SetCurrentViewport( vulkanCommandBuffer->currentViewport.maxDepth = viewport->maxDepth; } -static void VULKAN_SetViewportState( +static void VULKAN_SetViewport( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, Refresh_Viewport *viewport @@ -7990,7 +7990,7 @@ static void VULKAN_INTERNAL_SetCurrentScissor( vulkanCommandBuffer->currentScissor.extent.height = scissor->h; } -static void VULKAN_SetScissorState( +static void VULKAN_SetScissor( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, Refresh_Rect *scissor