From 61386a27ba0df14dd844ac433328d844fb5f84c2 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Fri, 16 Feb 2024 17:54:58 -0800 Subject: [PATCH] update Refresh_Driver.h and Refresh.c --- src/Refresh.c | 56 +++++++++++++++----------------------------- src/Refresh_Driver.h | 25 +++++++------------- 2 files changed, 27 insertions(+), 54 deletions(-) diff --git a/src/Refresh.c b/src/Refresh.c index 3384950..7487cec 100644 --- a/src/Refresh.c +++ b/src/Refresh.c @@ -522,14 +522,14 @@ void Refresh_BindFragmentSamplers( ); } -uint32_t Refresh_PushVertexShaderUniforms( +void Refresh_PushVertexShaderUniforms( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, void *data, uint32_t dataLengthInBytes ) { - if (device == NULL) { return 0; } - return device->PushVertexShaderUniforms( + NULL_RETURN(device); + device->PushVertexShaderUniforms( device->driverData, commandBuffer, data, @@ -537,14 +537,14 @@ uint32_t Refresh_PushVertexShaderUniforms( ); } -uint32_t Refresh_PushFragmentShaderUniforms( +void Refresh_PushFragmentShaderUniforms( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, void *data, uint32_t dataLengthInBytes ) { - if (device == NULL) { return 0; } - return device->PushFragmentShaderUniforms( + NULL_RETURN(device); + device->PushFragmentShaderUniforms( device->driverData, commandBuffer, data, @@ -558,9 +558,7 @@ void Refresh_DrawInstancedPrimitives( uint32_t baseVertex, uint32_t startIndex, uint32_t primitiveCount, - uint32_t instanceCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t instanceCount ) { NULL_RETURN(device); device->DrawInstancedPrimitives( @@ -569,9 +567,7 @@ void Refresh_DrawInstancedPrimitives( baseVertex, startIndex, primitiveCount, - instanceCount, - vertexParamOffset, - fragmentParamOffset + instanceCount ); } @@ -580,9 +576,7 @@ void Refresh_DrawIndexedPrimitives( Refresh_CommandBuffer *commandBuffer, uint32_t baseVertex, uint32_t startIndex, - uint32_t primitiveCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t primitiveCount ) { NULL_RETURN(device); device->DrawIndexedPrimitives( @@ -590,9 +584,7 @@ void Refresh_DrawIndexedPrimitives( commandBuffer, baseVertex, startIndex, - primitiveCount, - vertexParamOffset, - fragmentParamOffset + primitiveCount ); } @@ -600,18 +592,14 @@ void Refresh_DrawPrimitives( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, uint32_t vertexStart, - uint32_t primitiveCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t primitiveCount ) { NULL_RETURN(device); device->DrawPrimitives( device->driverData, commandBuffer, vertexStart, - primitiveCount, - vertexParamOffset, - fragmentParamOffset + primitiveCount ); } @@ -621,9 +609,7 @@ void Refresh_DrawPrimitivesIndirect( Refresh_GpuBuffer *buffer, uint32_t offsetInBytes, uint32_t drawCount, - uint32_t stride, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t stride ) { NULL_RETURN(device); device->DrawPrimitivesIndirect( @@ -632,9 +618,7 @@ void Refresh_DrawPrimitivesIndirect( buffer, offsetInBytes, drawCount, - stride, - vertexParamOffset, - fragmentParamOffset + stride ); } @@ -703,14 +687,14 @@ void Refresh_BindComputeTextures( ); } -uint32_t Refresh_PushComputeShaderUniforms( +void Refresh_PushComputeShaderUniforms( Refresh_Device *device, Refresh_CommandBuffer *commandBuffer, void *data, uint32_t dataLengthInBytes ) { - if (device == NULL) { return 0; } - return device->PushComputeShaderUniforms( + NULL_RETURN(device); + device->PushComputeShaderUniforms( device->driverData, commandBuffer, data, @@ -723,8 +707,7 @@ void Refresh_DispatchCompute( Refresh_CommandBuffer *commandBuffer, uint32_t groupCountX, uint32_t groupCountY, - uint32_t groupCountZ, - uint32_t computeParamOffset + uint32_t groupCountZ ) { NULL_RETURN(device); device->DispatchCompute( @@ -732,8 +715,7 @@ void Refresh_DispatchCompute( commandBuffer, groupCountX, groupCountY, - groupCountZ, - computeParamOffset + groupCountZ ); } diff --git a/src/Refresh_Driver.h b/src/Refresh_Driver.h index b2e3ab8..3b8f098 100644 --- a/src/Refresh_Driver.h +++ b/src/Refresh_Driver.h @@ -315,14 +315,14 @@ struct Refresh_Device Refresh_Sampler **pSamplers ); - uint32_t (*PushVertexShaderUniforms)( + void (*PushVertexShaderUniforms)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, void *data, uint32_t dataLengthInBytes ); - uint32_t (*PushFragmentShaderUniforms)( + void (*PushFragmentShaderUniforms)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, void *data, @@ -335,9 +335,7 @@ struct Refresh_Device uint32_t baseVertex, uint32_t startIndex, uint32_t primitiveCount, - uint32_t instanceCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t instanceCount ); void (*DrawIndexedPrimitives)( @@ -345,18 +343,14 @@ struct Refresh_Device Refresh_CommandBuffer *commandBuffer, uint32_t baseVertex, uint32_t startIndex, - uint32_t primitiveCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t primitiveCount ); void (*DrawPrimitives)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, uint32_t vertexStart, - uint32_t primitiveCount, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t primitiveCount ); void (*DrawPrimitivesIndirect)( @@ -365,9 +359,7 @@ struct Refresh_Device Refresh_GpuBuffer *buffer, uint32_t offsetInBytes, uint32_t drawCount, - uint32_t stride, - uint32_t vertexParamOffset, - uint32_t fragmentParamOffset + uint32_t stride ); void (*EndRenderPass)( @@ -401,7 +393,7 @@ struct Refresh_Device uint32_t **pLevels ); - uint32_t (*PushComputeShaderUniforms)( + void (*PushComputeShaderUniforms)( Refresh_Renderer *driverData, Refresh_CommandBuffer *commandBuffer, void *data, @@ -413,8 +405,7 @@ struct Refresh_Device Refresh_CommandBuffer *commandBuffer, uint32_t groupCountX, uint32_t groupCountY, - uint32_t groupCountZ, - uint32_t computeParamOffset + uint32_t groupCountZ ); void (*EndComputePass)(