OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk: Move vertex buffers into struct anv_bindings

Browse Source
This commit is contained in:
Kristian Høgsberg
2015-05-15 16:34:31 -07:00
parent 0cfc493775
commit 9540130c41
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vulkan/device.c
View File

@@ -2239,8 +2239,8 @@ void VKAPI vkCmdBindVertexBuffers(
* stride from the pipeline. */ * stride from the pipeline. */
for (uint32_t i = 0; i < bindingCount; i++) { for (uint32_t i = 0; i < bindingCount; i++) {
cmd_buffer->vb[startBinding + i].buffer = (struct anv_buffer *) pBuffers[i]; cmd_buffer->bindings.vb[startBinding + i].buffer = (struct anv_buffer *) pBuffers[i];
cmd_buffer->vb[startBinding + i].offset = pOffsets[i]; cmd_buffer->bindings.vb[startBinding + i].offset = pOffsets[i];
cmd_buffer->vb_dirty |= 1 << (startBinding + i); cmd_buffer->vb_dirty |= 1 << (startBinding + i);
} }
} }
@@ -2335,8 +2335,8 @@ anv_cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer)
GEN8_3DSTATE_VERTEX_BUFFERS); GEN8_3DSTATE_VERTEX_BUFFERS);
uint32_t vb, i = 0; uint32_t vb, i = 0;
for_each_bit(vb, cmd_buffer->vb_dirty) { for_each_bit(vb, cmd_buffer->vb_dirty) {
struct anv_buffer *buffer = cmd_buffer->vb[vb].buffer; struct anv_buffer *buffer = cmd_buffer->bindings.vb[vb].buffer;
uint32_t offset = cmd_buffer->vb[vb].offset; uint32_t offset = cmd_buffer->bindings.vb[vb].offset;
struct GEN8_VERTEX_BUFFER_STATE state = { struct GEN8_VERTEX_BUFFER_STATE state = {
.VertexBufferIndex = vb, .VertexBufferIndex = vb,

9
src/vulkan/meta.c
View File

@@ -146,11 +146,8 @@ anv_device_init_meta_clear_state(struct anv_device *device)
&device->clear_state.rs_state); &device->clear_state.rs_state);
} }
#define NUM_VB_USED 2
struct anv_saved_state { struct anv_saved_state {
struct {
struct anv_buffer *buffer;
VkDeviceSize offset;
} vb[2];
struct anv_bindings bindings; struct anv_bindings bindings;
struct anv_pipeline *pipeline; struct anv_pipeline *pipeline;
}; };
@@ -159,7 +156,6 @@ static void
anv_cmd_buffer_save(struct anv_cmd_buffer *cmd_buffer, anv_cmd_buffer_save(struct anv_cmd_buffer *cmd_buffer,
struct anv_saved_state *state) struct anv_saved_state *state)
{ {
memcpy(state->vb, cmd_buffer->vb, sizeof(state->vb));
memcpy(&state->bindings, &cmd_buffer->bindings, sizeof(state->bindings)); memcpy(&state->bindings, &cmd_buffer->bindings, sizeof(state->bindings));
state->pipeline = cmd_buffer->pipeline; state->pipeline = cmd_buffer->pipeline;
} }
@@ -168,11 +164,10 @@ static void
anv_cmd_buffer_restore(struct anv_cmd_buffer *cmd_buffer, anv_cmd_buffer_restore(struct anv_cmd_buffer *cmd_buffer,
const struct anv_saved_state *state) const struct anv_saved_state *state)
{ {
memcpy(cmd_buffer->vb, state->vb, sizeof(state->vb));
memcpy(&cmd_buffer->bindings, &state->bindings, sizeof(state->bindings)); memcpy(&cmd_buffer->bindings, &state->bindings, sizeof(state->bindings));
cmd_buffer->pipeline = state->pipeline; cmd_buffer->pipeline = state->pipeline;
cmd_buffer->vb_dirty |= (1 << ARRAY_SIZE(state->vb)) - 1; cmd_buffer->vb_dirty |= (1 << NUM_VB_USED) - 1;
cmd_buffer->dirty |= ANV_CMD_BUFFER_PIPELINE_DIRTY | cmd_buffer->dirty |= ANV_CMD_BUFFER_PIPELINE_DIRTY |
ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY;
} }

9
src/vulkan/private.h
View File

@@ -507,6 +507,11 @@ struct anv_buffer {
#define ANV_CMD_BUFFER_RS_DIRTY (1 << 2) #define ANV_CMD_BUFFER_RS_DIRTY (1 << 2)
struct anv_bindings { struct anv_bindings {
struct {
struct anv_buffer *buffer;
VkDeviceSize offset;
} vb[MAX_VBS];
struct { struct {
uint32_t surfaces[256]; uint32_t surfaces[256];
struct { struct {
@@ -532,10 +537,6 @@ struct anv_cmd_buffer {
struct anv_state_stream dynamic_state_stream; struct anv_state_stream dynamic_state_stream;
/* State required while building cmd buffer */ /* State required while building cmd buffer */
struct {
struct anv_buffer *buffer;
VkDeviceSize offset;
} vb[MAX_VBS];
uint32_t vb_dirty; uint32_t vb_dirty;
uint32_t dirty; uint32_t dirty;
struct anv_pipeline * pipeline; struct anv_pipeline * pipeline;