[Mesa-dev] [PATCH v03 12/38] i965: Split out enum from brw_eu_defines.h

[Emil Velikov]

Hi Rafael,

On 2 May 2017 at 02:43, Rafael Antognolli <rafael.antognolli at intel.com> wrote:
> We need to use some enums inside genX_state_upload.c, but including the
> whole header will cause several conflicts between things defined in this
> header and the genxml auto-generated headers.
>
> So create a separate header that is included both by brw_eu_defines.h
> and genX_state_upload.c.
>
> Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
> Acked-by: Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/intel/Makefile.sources              |  1 +-
>  src/intel/compiler/brw_defines_common.h | 46 ++++++++++++++++++++++++++-
>  src/intel/compiler/brw_eu_defines.h     | 22 +------------
>  3 files changed, 48 insertions(+), 21 deletions(-)
>  create mode 100644 src/intel/compiler/brw_defines_common.h
>
> diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
> index e9a39a6..652f376 100644
> --- a/src/intel/Makefile.sources
> +++ b/src/intel/Makefile.sources
> @@ -27,6 +27,7 @@ COMPILER_FILES = \
>         compiler/brw_compiler.h \
>         compiler/brw_dead_control_flow.cpp \
>         compiler/brw_dead_control_flow.h \
> +       compiler/brw_defines_common.h \
Amazing, thank you!

>         compiler/brw_disasm.c \
>         compiler/brw_eu.c \
>         compiler/brw_eu_compact.c \
> diff --git a/src/intel/compiler/brw_defines_common.h b/src/intel/compiler/brw_defines_common.h
> new file mode 100644
> index 0000000..fdae125
> --- /dev/null
> +++ b/src/intel/compiler/brw_defines_common.h

> +
> +#ifndef BRW_DEFINES_COMMON_H
You want a "#define BRW_DEFINES_COMMON_H" here

> +#endif // BRW_DEFINES_COMMON_H
> +
And this line should be at the end of the file.

-Emil