Re: [Mesa-dev] [PATCH 3/3] radv: Rename winsys enums.

2017-06-21 Thread Dave Airlie 
Oops missed these,

Reviewed-by: Dave Airlie 

On 11 June 2017 at 08:02, Bas Nieuwenhuizen  wrote:
> Don't rename the enums and constants used for metadata.
>
> Signed-off-by: Bas Nieuwenhuizen 
> ---
>  src/amd/vulkan/radv_cmd_buffer.c  |  4 +--
>  src/amd/vulkan/radv_descriptor_set.c  |  2 +-
>  src/amd/vulkan/radv_device.c  | 48 
> +--
>  src/amd/vulkan/radv_image.c   |  2 +-
>  src/amd/vulkan/radv_pipeline.c|  2 +-
>  src/amd/vulkan/radv_pipeline_cache.c  |  2 +-
>  src/amd/vulkan/radv_query.c   |  2 +-
>  src/amd/vulkan/radv_winsys.h  | 28 ++--
>  src/amd/vulkan/si_cmd_buffer.c|  4 +--
>  src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 22 ++--
>  src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.h |  2 +-
>  src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 14 
>  12 files changed, 63 insertions(+), 69 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_cmd_buffer.c 
> b/src/amd/vulkan/radv_cmd_buffer.c
> index b57ce9fd1de..0a82bf08ec6 100644
> --- a/src/amd/vulkan/radv_cmd_buffer.c
> +++ b/src/amd/vulkan/radv_cmd_buffer.c
> @@ -258,8 +258,8 @@ radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer 
> *cmd_buffer,
>
> bo = device->ws->buffer_create(device->ws,
>new_size, 4096,
> -  RADEON_DOMAIN_GTT,
> -  RADEON_FLAG_CPU_ACCESS);
> +  RADV_DOMAIN_GTT,
> +  RADV_FLAG_CPU_ACCESS);
>
> if (!bo) {
> cmd_buffer->record_fail = true;
> diff --git a/src/amd/vulkan/radv_descriptor_set.c 
> b/src/amd/vulkan/radv_descriptor_set.c
> index 3ea4936bfae..8d2623acd1b 100644
> --- a/src/amd/vulkan/radv_descriptor_set.c
> +++ b/src/amd/vulkan/radv_descriptor_set.c
> @@ -427,7 +427,7 @@ VkResult radv_CreateDescriptorPool(
>
> if (bo_size) {
> pool->bo = device->ws->buffer_create(device->ws, bo_size,
> -   32, 
> RADEON_DOMAIN_VRAM, 0);
> +   32, RADV_DOMAIN_VRAM, 
> 0);
> pool->mapped_ptr = (uint8_t*)device->ws->buffer_map(pool->bo);
> }
> pool->size = bo_size;
> diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
> index 52de47f4bdc..63634e0db3d 100644
> --- a/src/amd/vulkan/radv_device.c
> +++ b/src/amd/vulkan/radv_device.c
> @@ -1126,7 +1126,7 @@ VkResult radv_CreateDevice(
>
> if (getenv("RADV_TRACE_FILE")) {
> device->trace_bo = device->ws->buffer_create(device->ws, 
> 4096, 8,
> -
> RADEON_DOMAIN_VRAM, RADEON_FLAG_CPU_ACCESS);
> +
> RADV_DOMAIN_VRAM, RADV_FLAG_CPU_ACCESS);
> if (!device->trace_bo)
> goto fail;
>
> @@ -1550,8 +1550,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
> scratch_bo = 
> queue->device->ws->buffer_create(queue->device->ws,
>   scratch_size,
>   4096,
> - 
> RADEON_DOMAIN_VRAM,
> - 
> RADEON_FLAG_NO_CPU_ACCESS);
> + 
> RADV_DOMAIN_VRAM,
> + 
> RADV_FLAG_NO_CPU_ACCESS);
> if (!scratch_bo)
> goto fail;
> } else
> @@ -1561,8 +1561,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
> compute_scratch_bo = 
> queue->device->ws->buffer_create(queue->device->ws,
>   
> compute_scratch_size,
>   4096,
> - 
> RADEON_DOMAIN_VRAM,
> - 
> RADEON_FLAG_NO_CPU_ACCESS);
> + 
> RADV_DOMAIN_VRAM,
> + 
> RADV_FLAG_NO_CPU_ACCESS);
> if (!compute_scratch_bo)
> goto fail;
>
> @@ -1573,8 +1573,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
> esgs_ring_bo = 
> queue->device->ws->buffer_create(queue->device->ws,
> 
> esgs_ring_size,
>

[Mesa-dev] [PATCH 3/3] radv: Rename winsys enums.

2017-06-10 Thread Bas Nieuwenhuizen 
Don't rename the enums and constants used for metadata.

Signed-off-by: Bas Nieuwenhuizen 
---
 src/amd/vulkan/radv_cmd_buffer.c  |  4 +--
 src/amd/vulkan/radv_descriptor_set.c  |  2 +-
 src/amd/vulkan/radv_device.c  | 48 +--
 src/amd/vulkan/radv_image.c   |  2 +-
 src/amd/vulkan/radv_pipeline.c|  2 +-
 src/amd/vulkan/radv_pipeline_cache.c  |  2 +-
 src/amd/vulkan/radv_query.c   |  2 +-
 src/amd/vulkan/radv_winsys.h  | 28 ++--
 src/amd/vulkan/si_cmd_buffer.c|  4 +--
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 22 ++--
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.h |  2 +-
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 14 
 12 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index b57ce9fd1de..0a82bf08ec6 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -258,8 +258,8 @@ radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer 
*cmd_buffer,
 
bo = device->ws->buffer_create(device->ws,
   new_size, 4096,
-  RADEON_DOMAIN_GTT,
-  RADEON_FLAG_CPU_ACCESS);
+  RADV_DOMAIN_GTT,
+  RADV_FLAG_CPU_ACCESS);
 
if (!bo) {
cmd_buffer->record_fail = true;
diff --git a/src/amd/vulkan/radv_descriptor_set.c 
b/src/amd/vulkan/radv_descriptor_set.c
index 3ea4936bfae..8d2623acd1b 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -427,7 +427,7 @@ VkResult radv_CreateDescriptorPool(
 
if (bo_size) {
pool->bo = device->ws->buffer_create(device->ws, bo_size,
-   32, RADEON_DOMAIN_VRAM, 
0);
+   32, RADV_DOMAIN_VRAM, 
0);
pool->mapped_ptr = (uint8_t*)device->ws->buffer_map(pool->bo);
}
pool->size = bo_size;
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 52de47f4bdc..63634e0db3d 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1126,7 +1126,7 @@ VkResult radv_CreateDevice(
 
if (getenv("RADV_TRACE_FILE")) {
device->trace_bo = device->ws->buffer_create(device->ws, 4096, 
8,
-
RADEON_DOMAIN_VRAM, RADEON_FLAG_CPU_ACCESS);
+RADV_DOMAIN_VRAM, 
RADV_FLAG_CPU_ACCESS);
if (!device->trace_bo)
goto fail;
 
@@ -1550,8 +1550,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
scratch_bo = queue->device->ws->buffer_create(queue->device->ws,
  scratch_size,
  4096,
- 
RADEON_DOMAIN_VRAM,
- 
RADEON_FLAG_NO_CPU_ACCESS);
+ RADV_DOMAIN_VRAM,
+ 
RADV_FLAG_NO_CPU_ACCESS);
if (!scratch_bo)
goto fail;
} else
@@ -1561,8 +1561,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
compute_scratch_bo = 
queue->device->ws->buffer_create(queue->device->ws,
  
compute_scratch_size,
  4096,
- 
RADEON_DOMAIN_VRAM,
- 
RADEON_FLAG_NO_CPU_ACCESS);
+ 
RADV_DOMAIN_VRAM,
+ 
RADV_FLAG_NO_CPU_ACCESS);
if (!compute_scratch_bo)
goto fail;
 
@@ -1573,8 +1573,8 @@ radv_get_preamble_cs(struct radv_queue *queue,
esgs_ring_bo = 
queue->device->ws->buffer_create(queue->device->ws,
esgs_ring_size,
4096,
-   
RADEON_DOMAIN_VRAM,
-   
RADEON_FLAG_NO_CPU_ACCESS);
+   
RADV_DOMAIN_VRAM,
+