forked from MoonsideGames/Refresh
rename Set_Samplers to Bind_Samplers
parent
c316b50b80
commit
d3d9c9ad55
|
@ -1046,38 +1046,6 @@ REFRESHAPI uint32_t Refresh_PushComputeShaderParams(
|
||||||
uint32_t paramBlockCount
|
uint32_t paramBlockCount
|
||||||
);
|
);
|
||||||
|
|
||||||
/* Sets textures/samplers for use with the currently bound vertex shader.
|
|
||||||
*
|
|
||||||
* NOTE:
|
|
||||||
* The length of the passed arrays must be equal to the number
|
|
||||||
* of sampler bindings specified by the pipeline.
|
|
||||||
*
|
|
||||||
* textures: A pointer to an array of textures.
|
|
||||||
* samplers: A pointer to an array of samplers.
|
|
||||||
*/
|
|
||||||
REFRESHAPI void Refresh_SetVertexSamplers(
|
|
||||||
Refresh_Device *device,
|
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
|
||||||
Refresh_Texture **pTextures,
|
|
||||||
Refresh_Sampler **pSamplers
|
|
||||||
);
|
|
||||||
|
|
||||||
/* Sets textures/samplers for use with the currently bound fragment shader.
|
|
||||||
*
|
|
||||||
* NOTE:
|
|
||||||
* The length of the passed arrays must be equal to the number
|
|
||||||
* of sampler bindings specified by the pipeline.
|
|
||||||
*
|
|
||||||
* textures: A pointer to an array of textures.
|
|
||||||
* samplers: A pointer to an array of samplers.
|
|
||||||
*/
|
|
||||||
REFRESHAPI void Refresh_SetFragmentSamplers(
|
|
||||||
Refresh_Device *device,
|
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
|
||||||
Refresh_Texture **pTextures,
|
|
||||||
Refresh_Sampler **pSamplers
|
|
||||||
);
|
|
||||||
|
|
||||||
/* Getters */
|
/* Getters */
|
||||||
|
|
||||||
/* Synchronously copies data from a buffer to a pointer.
|
/* Synchronously copies data from a buffer to a pointer.
|
||||||
|
@ -1276,6 +1244,38 @@ REFRESHAPI void Refresh_BindIndexBuffer(
|
||||||
Refresh_IndexElementSize indexElementSize
|
Refresh_IndexElementSize indexElementSize
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/* Sets textures/samplers for use with the currently bound vertex shader.
|
||||||
|
*
|
||||||
|
* NOTE:
|
||||||
|
* The length of the passed arrays must be equal to the number
|
||||||
|
* of sampler bindings specified by the pipeline.
|
||||||
|
*
|
||||||
|
* textures: A pointer to an array of textures.
|
||||||
|
* samplers: A pointer to an array of samplers.
|
||||||
|
*/
|
||||||
|
REFRESHAPI void Refresh_BindVertexSamplers(
|
||||||
|
Refresh_Device *device,
|
||||||
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
|
Refresh_Texture **pTextures,
|
||||||
|
Refresh_Sampler **pSamplers
|
||||||
|
);
|
||||||
|
|
||||||
|
/* Sets textures/samplers for use with the currently bound fragment shader.
|
||||||
|
*
|
||||||
|
* NOTE:
|
||||||
|
* The length of the passed arrays must be equal to the number
|
||||||
|
* of sampler bindings specified by the pipeline.
|
||||||
|
*
|
||||||
|
* textures: A pointer to an array of textures.
|
||||||
|
* samplers: A pointer to an array of samplers.
|
||||||
|
*/
|
||||||
|
REFRESHAPI void Refresh_BindFragmentSamplers(
|
||||||
|
Refresh_Device *device,
|
||||||
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
|
Refresh_Texture **pTextures,
|
||||||
|
Refresh_Sampler **pSamplers
|
||||||
|
);
|
||||||
|
|
||||||
/* Binds a compute pipeline to the compute bind point. */
|
/* Binds a compute pipeline to the compute bind point. */
|
||||||
REFRESHAPI void Refresh_BindComputePipeline(
|
REFRESHAPI void Refresh_BindComputePipeline(
|
||||||
Refresh_Device *device,
|
Refresh_Device *device,
|
||||||
|
|
|
@ -568,14 +568,14 @@ uint32_t Refresh_PushComputeShaderParams(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Refresh_SetVertexSamplers(
|
void Refresh_BindVertexSamplers(
|
||||||
Refresh_Device *device,
|
Refresh_Device *device,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
Refresh_Sampler **pSamplers
|
Refresh_Sampler **pSamplers
|
||||||
) {
|
) {
|
||||||
NULL_RETURN(device);
|
NULL_RETURN(device);
|
||||||
device->SetVertexSamplers(
|
device->BindVertexSamplers(
|
||||||
device->driverData,
|
device->driverData,
|
||||||
commandBuffer,
|
commandBuffer,
|
||||||
pTextures,
|
pTextures,
|
||||||
|
@ -583,14 +583,14 @@ void Refresh_SetVertexSamplers(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Refresh_SetFragmentSamplers(
|
void Refresh_BindFragmentSamplers(
|
||||||
Refresh_Device *device,
|
Refresh_Device *device,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
Refresh_Sampler **pSamplers
|
Refresh_Sampler **pSamplers
|
||||||
) {
|
) {
|
||||||
NULL_RETURN(device);
|
NULL_RETURN(device);
|
||||||
device->SetFragmentSamplers(
|
device->BindFragmentSamplers(
|
||||||
device->driverData,
|
device->driverData,
|
||||||
commandBuffer,
|
commandBuffer,
|
||||||
pTextures,
|
pTextures,
|
||||||
|
|
|
@ -369,14 +369,14 @@ struct Refresh_Device
|
||||||
uint32_t elementCount
|
uint32_t elementCount
|
||||||
);
|
);
|
||||||
|
|
||||||
void(*SetVertexSamplers)(
|
void(*BindVertexSamplers)(
|
||||||
Refresh_Renderer *driverData,
|
Refresh_Renderer *driverData,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
Refresh_Sampler **pSamplers
|
Refresh_Sampler **pSamplers
|
||||||
);
|
);
|
||||||
|
|
||||||
void(*SetFragmentSamplers)(
|
void(*BindFragmentSamplers)(
|
||||||
Refresh_Renderer *driverData,
|
Refresh_Renderer *driverData,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
|
@ -559,8 +559,8 @@ struct Refresh_Device
|
||||||
ASSIGN_DRIVER_FUNC(PushVertexShaderParams, name) \
|
ASSIGN_DRIVER_FUNC(PushVertexShaderParams, name) \
|
||||||
ASSIGN_DRIVER_FUNC(PushFragmentShaderParams, name) \
|
ASSIGN_DRIVER_FUNC(PushFragmentShaderParams, name) \
|
||||||
ASSIGN_DRIVER_FUNC(PushComputeShaderParams, name) \
|
ASSIGN_DRIVER_FUNC(PushComputeShaderParams, name) \
|
||||||
ASSIGN_DRIVER_FUNC(SetVertexSamplers, name) \
|
ASSIGN_DRIVER_FUNC(BindVertexSamplers, name) \
|
||||||
ASSIGN_DRIVER_FUNC(SetFragmentSamplers, name) \
|
ASSIGN_DRIVER_FUNC(BindFragmentSamplers, name) \
|
||||||
ASSIGN_DRIVER_FUNC(GetBufferData, name) \
|
ASSIGN_DRIVER_FUNC(GetBufferData, name) \
|
||||||
ASSIGN_DRIVER_FUNC(AddDisposeTexture, name) \
|
ASSIGN_DRIVER_FUNC(AddDisposeTexture, name) \
|
||||||
ASSIGN_DRIVER_FUNC(AddDisposeSampler, name) \
|
ASSIGN_DRIVER_FUNC(AddDisposeSampler, name) \
|
||||||
|
|
|
@ -713,8 +713,8 @@ typedef struct VulkanGraphicsPipeline
|
||||||
VkPipeline pipeline;
|
VkPipeline pipeline;
|
||||||
VulkanGraphicsPipelineLayout *pipelineLayout;
|
VulkanGraphicsPipelineLayout *pipelineLayout;
|
||||||
Refresh_PrimitiveType primitiveType;
|
Refresh_PrimitiveType primitiveType;
|
||||||
VkDescriptorSet vertexSamplerDescriptorSet; /* updated by SetVertexSamplers */
|
VkDescriptorSet vertexSamplerDescriptorSet; /* updated by BindVertexSamplers */
|
||||||
VkDescriptorSet fragmentSamplerDescriptorSet; /* updated by SetFragmentSamplers */
|
VkDescriptorSet fragmentSamplerDescriptorSet; /* updated by BindFragmentSamplers */
|
||||||
|
|
||||||
VkDescriptorSet vertexUBODescriptorSet; /* permanently set in Create function */
|
VkDescriptorSet vertexUBODescriptorSet; /* permanently set in Create function */
|
||||||
VkDescriptorSet fragmentUBODescriptorSet; /* permanently set in Create function */
|
VkDescriptorSet fragmentUBODescriptorSet; /* permanently set in Create function */
|
||||||
|
@ -6944,7 +6944,7 @@ static VkDescriptorSet VULKAN_INTERNAL_FetchImageDescriptorSet(
|
||||||
return newDescriptorSet;
|
return newDescriptorSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void VULKAN_SetVertexSamplers(
|
static void VULKAN_BindVertexSamplers(
|
||||||
Refresh_Renderer *driverData,
|
Refresh_Renderer *driverData,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
|
@ -6980,7 +6980,7 @@ static void VULKAN_SetVertexSamplers(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void VULKAN_SetFragmentSamplers(
|
static void VULKAN_BindFragmentSamplers(
|
||||||
Refresh_Renderer *driverData,
|
Refresh_Renderer *driverData,
|
||||||
Refresh_CommandBuffer *commandBuffer,
|
Refresh_CommandBuffer *commandBuffer,
|
||||||
Refresh_Texture **pTextures,
|
Refresh_Texture **pTextures,
|
||||||
|
|
Loading…
Reference in New Issue