v3dv: drop v3dv_resource definition

In the end it became a v3dv_bo+offset combination, and for that we
already have v3dv_cl_reloc, so it became redundant.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8613>
This commit is contained in:
Alejandro Piñeiro 2021-01-21 14:18:14 +01:00 committed by Marge Bot
parent f55649d20b
commit dac20e100b
2 changed files with 2 additions and 12 deletions

View file

@ -1133,16 +1133,6 @@ struct v3dv_combined_image_sampler_descriptor {
uint8_t sampler_state[cl_aligned_packet_length(SAMPLER_STATE, 32)];
};
/* Aux struct as it is really common to have a pair bo/address. Called
* resource because it is really likely that we would need something like that
* if we work on reuse the same bo at different points (like the shader
* assembly).
*/
struct v3dv_resource {
struct v3dv_bo *bo;
uint32_t offset;
};
struct v3dv_query {
bool maybe_available;
union {
@ -1198,7 +1188,7 @@ struct v3dv_cmd_buffer {
struct v3dv_cmd_buffer_state state;
uint32_t push_constants_data[MAX_PUSH_CONSTANTS_SIZE / 4];
struct v3dv_resource push_constants_resource;
struct v3dv_cl_reloc push_constants_resource;
/* Collection of Vulkan objects created internally by the driver (typically
* during recording of meta operations) that are part of the command buffer

View file

@ -185,7 +185,7 @@ write_ubo_ssbo_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
*/
check_push_constants_ubo(cmd_buffer);
struct v3dv_resource *resource =
struct v3dv_cl_reloc *resource =
&cmd_buffer->push_constants_resource;
assert(resource->bo);