Re: [Mesa-dev] [PATCH 27/29] anv/cmd_buffer: Pull the undefined layout condition into the if

[Pohjolainen, Topi]

On Mon, Nov 27, 2017 at 07:06:17PM -0800, Jason Ekstrand wrote:
> Now that this isn't a multi-case if and it's just the one case, it's a
> bit clearer if the condition is just part of the if instead of being
> pulled out into a boolean variable.

Reviewed-by: Topi Pohjolainen 

> ---
>  src/intel/vulkan/genX_cmd_buffer.c | 13 -
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/src/intel/vulkan/genX_cmd_buffer.c 
> b/src/intel/vulkan/genX_cmd_buffer.c
> index 3473fdd..9e584c1 100644
> --- a/src/intel/vulkan/genX_cmd_buffer.c
> +++ b/src/intel/vulkan/genX_cmd_buffer.c
> @@ -793,20 +793,15 @@ transition_color_buffer(struct anv_cmd_buffer 
> *cmd_buffer,
>anv_image_aux_layers(image, aspect, base_level) - 
> base_layer);
> last_level_num = base_level + level_count;
>  
> -   /* Record whether or not the layout is undefined. Pre-initialized images
> -* with auxiliary buffers have a non-linear layout and are thus undefined.
> -*/
> assert(image->tiling == VK_IMAGE_TILING_OPTIMAL);
> -   const bool undef_layout = initial_layout == VK_IMAGE_LAYOUT_UNDEFINED ||
> - initial_layout == 
> VK_IMAGE_LAYOUT_PREINITIALIZED;
>  
> -   /* Do preparatory work before the resolve operation or return early if no
> -* resolve is actually needed.
> -*/
> -   if (undef_layout) {
> +   if (initial_layout == VK_IMAGE_LAYOUT_UNDEFINED ||
> +   initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED) {
>/* A subresource in the undefined layout may have been aliased and
> * populated with any arrangement of bits. Therefore, we must 
> initialize
> * the related aux buffer and clear buffer entry with desirable values.
> +   * An initial layout of PREINITIALIZED is the same as UNDEFINED for
> +   * images with VK_IMAGE_TILING_OPTIMAL.
> *
> * Initialize the relevant clear buffer entries.
> */
> -- 
> 2.5.0.400.gff86faf
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 27/29] anv/cmd_buffer: Pull the undefined layout condition into the if

[Jason Ekstrand]

Now that this isn't a multi-case if and it's just the one case, it's a
bit clearer if the condition is just part of the if instead of being
pulled out into a boolean variable.
---
 src/intel/vulkan/genX_cmd_buffer.c | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/intel/vulkan/genX_cmd_buffer.c 
b/src/intel/vulkan/genX_cmd_buffer.c
index 3473fdd..9e584c1 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -793,20 +793,15 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
   anv_image_aux_layers(image, aspect, base_level) - 
base_layer);
last_level_num = base_level + level_count;
 
-   /* Record whether or not the layout is undefined. Pre-initialized images
-* with auxiliary buffers have a non-linear layout and are thus undefined.
-*/
assert(image->tiling == VK_IMAGE_TILING_OPTIMAL);
-   const bool undef_layout = initial_layout == VK_IMAGE_LAYOUT_UNDEFINED ||
- initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED;
 
-   /* Do preparatory work before the resolve operation or return early if no
-* resolve is actually needed.
-*/
-   if (undef_layout) {
+   if (initial_layout == VK_IMAGE_LAYOUT_UNDEFINED ||
+   initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED) {
   /* A subresource in the undefined layout may have been aliased and
* populated with any arrangement of bits. Therefore, we must initialize
* the related aux buffer and clear buffer entry with desirable values.
+   * An initial layout of PREINITIALIZED is the same as UNDEFINED for
+   * images with VK_IMAGE_TILING_OPTIMAL.
*
* Initialize the relevant clear buffer entries.
*/
-- 
2.5.0.400.gff86faf

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev