anv/blorp: Break the guts of alloc_binding_table into a shared helper

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2016-10-21 17:01:17 -07:00
parent 3c1ee052bd
commit e371850d94
3 changed files with 33 additions and 16 deletions

View File

@@ -883,6 +883,32 @@ void anv_CmdClearDepthStencilImage(
blorp_batch_finish(&batch);
}
struct anv_state
anv_cmd_buffer_alloc_blorp_binding_table(struct anv_cmd_buffer *cmd_buffer,
uint32_t num_entries,
uint32_t *state_offset)
{
struct anv_state bt_state =
anv_cmd_buffer_alloc_binding_table(cmd_buffer, num_entries,
state_offset);
if (bt_state.map == NULL) {
/* We ran out of space. Grab a new binding table block. */
VkResult result = anv_cmd_buffer_new_binding_table_block(cmd_buffer);
assert(result == VK_SUCCESS);
/* Re-emit state base addresses so we get the new surface state base
* address before we start emitting binding tables etc.
*/
anv_cmd_buffer_emit_state_base_address(cmd_buffer);
bt_state = anv_cmd_buffer_alloc_binding_table(cmd_buffer, num_entries,
state_offset);
assert(bt_state.map != NULL);
}
return bt_state;
}
static void
clear_color_attachment(struct anv_cmd_buffer *cmd_buffer,
struct blorp_batch *batch,

View File

@@ -1283,6 +1283,11 @@ void anv_cmd_buffer_resolve_subpass(struct anv_cmd_buffer *cmd_buffer);
const struct anv_image_view *
anv_cmd_buffer_get_depth_stencil_view(const struct anv_cmd_buffer *cmd_buffer);
struct anv_state
anv_cmd_buffer_alloc_blorp_binding_table(struct anv_cmd_buffer *cmd_buffer,
uint32_t num_entries,
uint32_t *state_offset);
void anv_cmd_buffer_dump(struct anv_cmd_buffer *cmd_buffer);
enum anv_fence_state {

View File

@@ -87,22 +87,8 @@ blorp_alloc_binding_table(struct blorp_batch *batch, unsigned num_entries,
uint32_t state_offset;
struct anv_state bt_state =
anv_cmd_buffer_alloc_binding_table(cmd_buffer, num_entries,
anv_cmd_buffer_alloc_blorp_binding_table(cmd_buffer, num_entries,
&state_offset);
if (bt_state.map == NULL) {
/* We ran out of space. Grab a new binding table block. */
VkResult result = anv_cmd_buffer_new_binding_table_block(cmd_buffer);
assert(result == VK_SUCCESS);
/* Re-emit state base addresses so we get the new surface state base
* address before we start emitting binding tables etc.
*/
genX(cmd_buffer_emit_state_base_address)(cmd_buffer);
bt_state = anv_cmd_buffer_alloc_binding_table(cmd_buffer, num_entries,
&state_offset);
assert(bt_state.map != NULL);
}
uint32_t *bt_map = bt_state.map;
*bt_offset = bt_state.offset;