[Mesa-dev] [PATCH 21/21] compiler: remove copy_shader_info()

[Jason Ekstrand]

Woohoo!  Thanks for doing all this.  Series is

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

I think I would feel a tiny bit more comfortable if, for each info field,
you squashed the 2-5 corresponding patches together.

On Thu, Oct 20, 2016 at 1:47 AM, Timothy Arceri <
timothy.arceri at collabora.com> wrote:

> This temporary helper is no longer needed now that we have finished
> refactoring common shader metadata.
> ---
>  src/compiler/Makefile.sources |  4 +---
>  src/compiler/shader_info.c    | 32 --------------------------------
>  src/mesa/main/shaderapi.c     |  2 --
>  3 files changed, 1 insertion(+), 37 deletions(-)
>  delete mode 100644 src/compiler/shader_info.c
>
> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
> index df1db0c..a30443d 100644
> --- a/src/compiler/Makefile.sources
> +++ b/src/compiler/Makefile.sources
> @@ -5,9 +5,7 @@ LIBCOMPILER_FILES = \
>         nir_types.cpp \
>         nir_types.h \
>         shader_enums.c \
> -       shader_enums.h \
> -       shader_info.c \
> -       shader_info.h
> +       shader_enums.h
>
>  # libglsl
>
> diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c
> deleted file mode 100644
> index 1171bbf..0000000
> --- a/src/compiler/shader_info.c
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/*
> - * Copyright © 2016 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the
> "Software"),
> - * to deal in the Software without restriction, including without
> limitation
> - * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the
> next
> - * paragraph) shall be included in all copies or substantial portions of
> the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
> SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> - * IN THE SOFTWARE.
> - *
> - */
> -
> -#include "mesa/main/mtypes.h"
> -
> -void
> -copy_shader_info(const struct gl_shader_program *shader_prog,
> -                 struct gl_linked_shader *sh)
> -{
> -   shader_info *info = &sh->Program->info;
> -}
> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
> index 73b8931..be3c203 100644
> --- a/src/mesa/main/shaderapi.c
> +++ b/src/mesa/main/shaderapi.c
> @@ -2209,8 +2209,6 @@ _mesa_copy_linked_program_data(const struct
> gl_shader_program *src,
>     default:
>        break;
>     }
> -
> -   copy_shader_info(src, dst_sh);
>  }
>
>  /**
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161025/6f2cd73f/attachment-0001.html>