vk/device: Remove the binding table pools/streams
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 9 Jun 2015 00:45:57 +0000 (17:45 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Tue, 9 Jun 2015 00:45:57 +0000 (17:45 -0700)
src/vulkan/device.c
src/vulkan/private.h

index 32de1b4a2303baacab0b9a9dff702fb0c4a41521..46c6b10c401db5fe07dd796eec57ae65c9cd88db 100644 (file)
@@ -374,15 +374,6 @@ VkResult anv_CreateDevice(
    anv_block_pool_init(&device->instruction_block_pool, device, 2048);
    anv_block_pool_init(&device->surface_state_block_pool, device, 2048);
 
-
-   /* Binding table pointers are only 16 bits so we have to make sure that
-    * they get allocated at the beginning of the surface state BO.  To
-    * handle this, we create a separate block pool that works out of the
-    * first 64 KB of the surface state BO.
-    */
-   anv_block_pool_init_slave(&device->binding_table_block_pool,
-                             &device->surface_state_block_pool, 32);
-
    anv_state_pool_init(&device->surface_state_pool,
                        &device->surface_state_block_pool);
 
@@ -2234,7 +2225,6 @@ anv_cmd_buffer_destroy(struct anv_device *device,
 
    anv_state_stream_finish(&cmd_buffer->surface_state_stream);
    anv_state_stream_finish(&cmd_buffer->dynamic_state_stream);
-   anv_state_stream_finish(&cmd_buffer->binding_table_state_stream);
    anv_device_free(device, cmd_buffer->exec2_objects);
    anv_device_free(device, cmd_buffer->exec2_bos);
    anv_device_free(device, cmd_buffer);
@@ -2334,8 +2324,6 @@ VkResult anv_CreateCommandBuffer(
    cmd_buffer->exec2_bos = NULL;
    cmd_buffer->exec2_array_length = 0;
 
-   anv_state_stream_init(&cmd_buffer->binding_table_state_stream,
-                         &device->binding_table_block_pool);
    anv_state_stream_init(&cmd_buffer->surface_state_stream,
                          &device->surface_state_block_pool);
    anv_state_stream_init(&cmd_buffer->dynamic_state_stream,
index 65b81b3e918dd9a523d7f9c53bf9849f790bf73f..dffec5d248a646871d3ccdbf4b9d439fac7b9342 100644 (file)
@@ -331,7 +331,6 @@ struct anv_device {
 
     struct anv_block_pool                       instruction_block_pool;
     struct anv_block_pool                       surface_state_block_pool;
-    struct anv_block_pool                       binding_table_block_pool;
     struct anv_state_pool                       surface_state_pool;
 
     struct anv_meta_state                       meta_state;
@@ -619,7 +618,6 @@ struct anv_cmd_buffer {
    struct anv_batch_bo *                        surface_batch_bo;
    uint32_t                                     surface_next;
    struct anv_reloc_list                        surface_relocs;
-   struct anv_state_stream                      binding_table_state_stream;
    struct anv_state_stream                      surface_state_stream;
    struct anv_state_stream                      dynamic_state_stream;