fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vk: Rename dyn_state_pool to dynamic_state_pool

Browse source 
Given that we already tolerate surface_state_pool and the even longer
instruction_state_pool, there's no reason to arbitrarily abbreviate
dynamic.
This commit is contained in:
Kristian Høgsberg 2015-05-13 15:34:34 -07:00
parent f5b0f1351f
commit 0a775e1eab
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vulkan/device.c
View file

@ -305,10 +305,10 @@ VkResult VKAPI vkCreateDevice(
if (device->context_id == -1)
goto fail_fd;
anv_block_pool_init(&device->dyn_state_block_pool, device, 2048);
anv_block_pool_init(&device->dynamic_state_block_pool, device, 2048);
anv_state_pool_init(&device->dyn_state_pool,
&device->dyn_state_block_pool);
anv_state_pool_init(&device->dynamic_state_pool,
&device->dynamic_state_block_pool);
anv_block_pool_init(&device->instruction_block_pool, device, 2048);
anv_block_pool_init(&device->surface_state_block_pool, device, 2048);
@ -344,7 +344,7 @@ VkResult VKAPI vkDestroyDevice(
anv_compiler_destroy(device->compiler);
anv_block_pool_finish(&device->dyn_state_block_pool);
anv_block_pool_finish(&device->dynamic_state_block_pool);
anv_block_pool_finish(&device->instruction_block_pool);
anv_block_pool_finish(&device->surface_state_block_pool);
@ -628,8 +628,8 @@ VkResult VKAPI vkDeviceWaitIdle(
int64_t timeout;
int ret;
state = anv_state_pool_alloc(&device->dyn_state_pool, 32, 32);
bo = &device->dyn_state_pool.block_pool->bo;
state = anv_state_pool_alloc(&device->dynamic_state_pool, 32, 32);
bo = &device->dynamic_state_pool.block_pool->bo;
batch.next = state.map;
anv_batch_emit(&batch, GEN8_MI_BATCH_BUFFER_END);
anv_batch_emit(&batch, GEN8_MI_NOOP);
@ -672,12 +672,12 @@ VkResult VKAPI vkDeviceWaitIdle(
}
}
anv_state_pool_free(&device->dyn_state_pool, state);
anv_state_pool_free(&device->dynamic_state_pool, state);
return VK_SUCCESS;
fail:
anv_state_pool_free(&device->dyn_state_pool, state);
anv_state_pool_free(&device->dynamic_state_pool, state);
return result;
}
@ -1651,11 +1651,11 @@ VkResult VKAPI vkCreateDynamicViewportState(
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
unsigned count = pCreateInfo->viewportAndScissorCount;
state->sf_clip_vp = anv_state_pool_alloc(&device->dyn_state_pool,
state->sf_clip_vp = anv_state_pool_alloc(&device->dynamic_state_pool,
count * 64, 64);
state->cc_vp = anv_state_pool_alloc(&device->dyn_state_pool,
state->cc_vp = anv_state_pool_alloc(&device->dynamic_state_pool,
count * 8, 32);
state->scissor = anv_state_pool_alloc(&device->dyn_state_pool,
state->scissor = anv_state_pool_alloc(&device->dynamic_state_pool,
count * 32, 32);
for (uint32_t i = 0; i < pCreateInfo->viewportAndScissorCount; i++) {
@ -1827,7 +1827,7 @@ VkResult VKAPI vkCreateCommandBuffer(
anv_state_stream_init(&cmd_buffer->surface_state_stream,
&device->surface_state_block_pool);
anv_state_stream_init(&cmd_buffer->dynamic_state_stream,
&device->dyn_state_block_pool);
&device->dynamic_state_block_pool);
cmd_buffer->dirty = 0;
cmd_buffer->vb_dirty = 0;
@ -1867,7 +1867,7 @@ VkResult VKAPI vkBeginCommandBuffer(
.SurfaceStateMemoryObjectControlState = 0, /* FIXME: MOCS */
.SurfaceStateBaseAddressModifyEnable = true,
.DynamicStateBaseAddress = { &device->dyn_state_block_pool.bo, 0 },
.DynamicStateBaseAddress = { &device->dynamic_state_block_pool.bo, 0 },
.DynamicStateBaseAddressModifyEnable = true,
.DynamicStateBufferSize = 0xfffff,
.DynamicStateBufferSizeModifyEnable = true,

4
src/vulkan/private.h
View file

@ -285,8 +285,8 @@ struct anv_device {
bool no_hw;
bool dump_aub;
struct anv_block_pool dyn_state_block_pool;
struct anv_state_pool dyn_state_pool;
struct anv_block_pool dynamic_state_block_pool;
struct anv_state_pool dynamic_state_pool;
struct anv_block_pool instruction_block_pool;
struct anv_block_pool surface_state_block_pool;