TheSpydog
/
Refresh
forked from MoonsideGames/Refresh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SetSamplers no longer takes pipeline

submit_rewrite
cosmonaut 2020-12-27 23:13:49 -08:00
parent 6e59750ff2
commit ce0eea711b
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Refresh.h
View File

@ -995,15 +995,13 @@ REFRESHAPI void REFRESH_PushFragmentShaderParams(
* *
* NOTE: * NOTE:
* The length of the passed arrays must be equal to the number * The length of the passed arrays must be equal to the number
* of sampler bindings specified by the shader. * of sampler bindings specified by the pipeline.
* *
* pipeline: The graphics pipeline to push shader data to.
* textures: A pointer to an array of textures. * textures: A pointer to an array of textures.
* samplers: A pointer to an array of samplers. * samplers: A pointer to an array of samplers.
*/ */
REFRESHAPI void REFRESH_SetVertexSamplers( REFRESHAPI void REFRESH_SetVertexSamplers(
REFRESH_Device *device, REFRESH_Device *device,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
); );
@ -1012,15 +1010,13 @@ REFRESHAPI void REFRESH_SetVertexSamplers(
* *
* NOTE: * NOTE:
* The length of the passed arrays must be equal to the number * The length of the passed arrays must be equal to the number
* of sampler bindings specified by the shader. * of sampler bindings specified by the pipeline.
* *
* pipeline: The graphics pipeline to push shader data to.
* textures: A pointer to an array of textures. * textures: A pointer to an array of textures.
* samplers: A pointer to an array of samplers. * samplers: A pointer to an array of samplers.
*/ */
REFRESHAPI void REFRESH_SetFragmentSamplers( REFRESHAPI void REFRESH_SetFragmentSamplers(
REFRESH_Device *device, REFRESH_Device *device,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
); );

4
src/Refresh.c
View File

@ -554,14 +554,12 @@ void REFRESH_PushFragmentShaderParams(
void REFRESH_SetVertexSamplers( void REFRESH_SetVertexSamplers(
REFRESH_Device *device, REFRESH_Device *device,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
) { ) {
NULL_RETURN(device); NULL_RETURN(device);
device->SetVertexSamplers( device->SetVertexSamplers(
device->driverData, device->driverData,
pipeline,
pTextures, pTextures,
pSamplers pSamplers
); );
@ -569,14 +567,12 @@ void REFRESH_SetVertexSamplers(
void REFRESH_SetFragmentSamplers( void REFRESH_SetFragmentSamplers(
REFRESH_Device *device, REFRESH_Device *device,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
) { ) {
NULL_RETURN(device); NULL_RETURN(device);
device->SetFragmentSamplers( device->SetFragmentSamplers(
device->driverData, device->driverData,
pipeline,
pTextures, pTextures,
pSamplers pSamplers
); );

2
src/Refresh_Driver.h
View File

@ -368,14 +368,12 @@ struct REFRESH_Device
void(*SetVertexSamplers)( void(*SetVertexSamplers)(
REFRESH_Renderer *driverData, REFRESH_Renderer *driverData,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
); );
void(*SetFragmentSamplers)( void(*SetFragmentSamplers)(
REFRESH_Renderer *driverData, REFRESH_Renderer *driverData,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
); );

6
src/Refresh_Driver_Vulkan.c
View File

@ -5026,7 +5026,6 @@ static VkDescriptorSet VULKAN_INTERNAL_FetchSamplerDescriptorSet(
static void VULKAN_SetVertexSamplers( static void VULKAN_SetVertexSamplers(
REFRESH_Renderer *driverData, REFRESH_Renderer *driverData,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
) { ) {
@ -5034,7 +5033,7 @@ static void VULKAN_SetVertexSamplers(
uint32_t i, samplerCount; uint32_t i, samplerCount;
VulkanRenderer* renderer = (VulkanRenderer*) driverData; VulkanRenderer* renderer = (VulkanRenderer*) driverData;
VulkanGraphicsPipeline *graphicsPipeline = (VulkanGraphicsPipeline*) pipeline; VulkanGraphicsPipeline *graphicsPipeline = renderer->currentGraphicsPipeline;
SamplerDescriptorSetData vertexSamplerDescriptorSetData; SamplerDescriptorSetData vertexSamplerDescriptorSetData;
if (graphicsPipeline->pipelineLayout->vertexSamplerDescriptorSetCache == NULL) if (graphicsPipeline->pipelineLayout->vertexSamplerDescriptorSetCache == NULL)
@ -5061,7 +5060,6 @@ static void VULKAN_SetVertexSamplers(
static void VULKAN_SetFragmentSamplers( static void VULKAN_SetFragmentSamplers(
REFRESH_Renderer *driverData, REFRESH_Renderer *driverData,
REFRESH_GraphicsPipeline *pipeline,
REFRESH_Texture **pTextures, REFRESH_Texture **pTextures,
REFRESH_Sampler **pSamplers REFRESH_Sampler **pSamplers
) { ) {
@ -5069,7 +5067,7 @@ static void VULKAN_SetFragmentSamplers(
uint32_t i, samplerCount; uint32_t i, samplerCount;
VulkanRenderer* renderer = (VulkanRenderer*) driverData; VulkanRenderer* renderer = (VulkanRenderer*) driverData;
VulkanGraphicsPipeline *graphicsPipeline = (VulkanGraphicsPipeline*) pipeline; VulkanGraphicsPipeline *graphicsPipeline = renderer->currentGraphicsPipeline;
SamplerDescriptorSetData fragmentSamplerDescriptorSetData; SamplerDescriptorSetData fragmentSamplerDescriptorSetData;
if (graphicsPipeline->pipelineLayout->fragmentSamplerDescriptorSetCache == NULL) if (graphicsPipeline->pipelineLayout->fragmentSamplerDescriptorSetCache == NULL)