commit 42b9320fbf67844d97f054db1a427894c444edf3
author Chad Versace <chad.versace@intel.com> Thu Feb 04 11:41:59 2016 -0800
committer Chad Versace <chad.versace@intel.com> Thu Feb 04 12:20:51 2016 -0800
tree ca193c17c0b8f23ed5a61688df4b9a82e09a5977
parent 1f5d56304f51a09943e72f2b1aad0683d9220482

anv/image: Rename nonrt_surface_state

Let's call it what it is, not what it is not. Rename it to
'sampler_surface_state'.

src/vulkan/anv_image.c

diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index 6cc5700..be91cdc 100644
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -216,7 +216,7 @@
    image->tiling = pCreateInfo->tiling;
 
    if (image->usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
-      image->needs_nonrt_surface_state = true;
+      image->needs_sampler_surface_state = true;
    }
 
    if (image->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
@@ -570,14 +570,14 @@
       .depth  = anv_minify(iview->level_0_extent.depth , range->baseMipLevel),
    };
 
-   if (image->needs_nonrt_surface_state) {
-      iview->nonrt_surface_state = alloc_surface_state(device, cmd_buffer);
+   if (image->needs_sampler_surface_state) {
+      iview->sampler_surface_state = alloc_surface_state(device, cmd_buffer);
 
-      anv_fill_image_surface_state(device, iview->nonrt_surface_state,
+      anv_fill_image_surface_state(device, iview->sampler_surface_state,
                                    iview, &mCreateInfo,
                                    VK_IMAGE_USAGE_SAMPLED_BIT);
    } else {
-      iview->nonrt_surface_state.alloc_size = 0;
+      iview->sampler_surface_state.alloc_size = 0;
    }
 
    if (image->needs_color_rt_surface_state) {
@@ -641,9 +641,9 @@
                           iview->color_rt_surface_state);
    }
 
-   if (iview->image->needs_nonrt_surface_state) {
+   if (iview->image->needs_sampler_surface_state) {
       anv_state_pool_free(&device->surface_state_pool,
-                          iview->nonrt_surface_state);
+                          iview->sampler_surface_state);
    }
 
    if (iview->image->needs_storage_surface_state) {