From 4f32869e3dcd70f25e828d1e337e027c5980032b Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <basni@chromium.org>
Date: Thu, 10 Jan 2019 22:07:04 +0100
Subject: [PATCH] turnip: Shorten primary_cmd_stream name.

It really is too long.
---
 src/freedreno/vulkan/tu_cmd_buffer.c | 20 ++++++++++----------
 src/freedreno/vulkan/tu_device.c     |  4 ++--
 src/freedreno/vulkan/tu_private.h    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 1cfbf1cb96c..df72d4a7b31 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -395,7 +395,7 @@ tu_create_cmd_buffer(struct tu_device *device,
    }
 
    tu_bo_list_init(&cmd_buffer->bo_list);
-   tu_cmd_stream_init(&cmd_buffer->primary_cmd_stream);
+   tu_cmd_stream_init(&cmd_buffer->cs);
 
    *pCommandBuffer = tu_cmd_buffer_to_handle(cmd_buffer);
 
@@ -412,7 +412,7 @@ tu_cmd_buffer_destroy(struct tu_cmd_buffer *cmd_buffer)
    for (unsigned i = 0; i < VK_PIPELINE_BIND_POINT_RANGE_SIZE; i++)
       free(cmd_buffer->descriptors[i].push_set.set.mapped_ptr);
 
-   tu_cmd_stream_finish(cmd_buffer->device, &cmd_buffer->primary_cmd_stream);
+   tu_cmd_stream_finish(cmd_buffer->device, &cmd_buffer->cs);
    tu_bo_list_destroy(&cmd_buffer->bo_list);
    vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
 }
@@ -423,7 +423,7 @@ tu_reset_cmd_buffer(struct tu_cmd_buffer *cmd_buffer)
    cmd_buffer->record_result = VK_SUCCESS;
 
    tu_bo_list_reset(&cmd_buffer->bo_list);
-   tu_cmd_stream_reset(cmd_buffer->device, &cmd_buffer->primary_cmd_stream);
+   tu_cmd_stream_reset(cmd_buffer->device, &cmd_buffer->cs);
 
    for (unsigned i = 0; i < VK_PIPELINE_BIND_POINT_RANGE_SIZE; i++) {
       cmd_buffer->descriptors[i].dirty = 0;
@@ -550,14 +550,14 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer,
    cmd_buffer->status = TU_CMD_BUFFER_STATUS_RECORDING;
 
    result = tu_cmd_stream_begin(cmd_buffer->device,
-                                &cmd_buffer->primary_cmd_stream, 4096);
+                                &cmd_buffer->cs, 4096);
 
    /* Put some stuff in so we do not have empty command buffers. */
-   OUT_PKT7(&cmd_buffer->primary_cmd_stream, CP_NOP, 4);
-   *cmd_buffer->primary_cmd_stream.cur++ = 0;
-   *cmd_buffer->primary_cmd_stream.cur++ = 0;
-   *cmd_buffer->primary_cmd_stream.cur++ = 0;
-   *cmd_buffer->primary_cmd_stream.cur++ = 0;
+   OUT_PKT7(&cmd_buffer->cs, CP_NOP, 4);
+   *cmd_buffer->cs.cur++ = 0;
+   *cmd_buffer->cs.cur++ = 0;
+   *cmd_buffer->cs.cur++ = 0;
+   *cmd_buffer->cs.cur++ = 0;
    return result;
 }
 
@@ -605,7 +605,7 @@ tu_EndCommandBuffer(VkCommandBuffer commandBuffer)
 {
    TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer);
 
-   tu_cmd_stream_end(&cmd_buffer->primary_cmd_stream);
+   tu_cmd_stream_end(&cmd_buffer->cs);
    cmd_buffer->status = TU_CMD_BUFFER_STATUS_EXECUTABLE;
 
    return cmd_buffer->record_result;
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index 976fdad1c49..6a46786fda3 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -1195,14 +1195,14 @@ tu_QueueSubmit(VkQueue _queue,
       uint32_t entry_count = 0;
       for(uint32_t j = 0; j < submit->commandBufferCount; ++j) {
          TU_FROM_HANDLE(tu_cmd_buffer, cmdbuf, submit->pCommandBuffers[j]);
-         entry_count += cmdbuf->primary_cmd_stream.entry_count;
+         entry_count += cmdbuf->cs.entry_count;
       }
 
       struct drm_msm_gem_submit_cmd cmds[entry_count];
       uint32_t entry_idx = 0;
       for(uint32_t j = 0; j < submit->commandBufferCount; ++j) {
          TU_FROM_HANDLE(tu_cmd_buffer, cmdbuf, submit->pCommandBuffers[j]);
-         struct tu_cmd_stream *stream = &cmdbuf->primary_cmd_stream;
+         struct tu_cmd_stream *stream = &cmdbuf->cs;
          for (unsigned i = 0; i < stream->entry_count; ++i, ++entry_idx) {
             cmds[entry_idx].type = MSM_SUBMIT_CMD_BUF;
             cmds[entry_idx].submit_idx = tu_bo_list_add(&bo_list, stream->entries[i].bo);
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index 01a06423f15..5a9e55aa8ef 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -769,7 +769,7 @@ struct tu_cmd_buffer
    struct tu_cmd_buffer_upload upload;
 
    struct tu_bo_list bo_list;
-   struct tu_cmd_stream primary_cmd_stream;
+   struct tu_cmd_stream cs;
 
    VkResult record_result;
 };
-- 
2.30.2