[Mesa-dev] [PATCH] i965: Move enums to brw_compiler.h.

[Jason Ekstrand]

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

On Tue, May 2, 2017 at 9:29 AM, Rafael Antognolli <
rafael.antognolli at intel.com> wrote:

> These enums live inside struct brw_wm_prog_data, so it makes sense to
> keep them in the same header. It also allows to use them without
> including brw_eu_defines.h.
>
> Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
> ---
>  src/intel/compiler/brw_compiler.h   | 21 +++++++++++++++++++++
>  src/intel/compiler/brw_eu_defines.h | 21 ---------------------
>  2 files changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_
> compiler.h
> index 9228413..b5b1ee9 100644
> --- a/src/intel/compiler/brw_compiler.h
> +++ b/src/intel/compiler/brw_compiler.h
> @@ -458,6 +458,27 @@ brw_mark_surface_used(struct brw_stage_prog_data
> *prog_data,
>        MAX2(prog_data->binding_table.size_bytes, (surf_index + 1) * 4);
>  }
>
> +enum brw_barycentric_mode {
> +   BRW_BARYCENTRIC_PERSPECTIVE_PIXEL       = 0,
> +   BRW_BARYCENTRIC_PERSPECTIVE_CENTROID    = 1,
> +   BRW_BARYCENTRIC_PERSPECTIVE_SAMPLE      = 2,
> +   BRW_BARYCENTRIC_NONPERSPECTIVE_PIXEL    = 3,
> +   BRW_BARYCENTRIC_NONPERSPECTIVE_CENTROID = 4,
> +   BRW_BARYCENTRIC_NONPERSPECTIVE_SAMPLE   = 5,
> +   BRW_BARYCENTRIC_MODE_COUNT              = 6
> +};
> +#define BRW_BARYCENTRIC_NONPERSPECTIVE_BITS \
> +   ((1 << BRW_BARYCENTRIC_NONPERSPECTIVE_PIXEL) | \
> +    (1 << BRW_BARYCENTRIC_NONPERSPECTIVE_CENTROID) | \
> +    (1 << BRW_BARYCENTRIC_NONPERSPECTIVE_SAMPLE))
> +
> +enum brw_pixel_shader_computed_depth_mode {
> +   BRW_PSCDEPTH_OFF   = 0, /* PS does not compute depth */
> +   BRW_PSCDEPTH_ON    = 1, /* PS computes depth; no guarantee about value
> */
> +   BRW_PSCDEPTH_ON_GE = 2, /* PS guarantees output depth >= source depth
> */
> +   BRW_PSCDEPTH_ON_LE = 3, /* PS guarantees output depth <= source depth
> */
> +};
> +
>  /* Data about a particular attempt to compile a program.  Note that
>   * there can be many of these, each in a different GL state
>   * corresponding to a different brw_wm_prog_key struct, with different
> diff --git a/src/intel/compiler/brw_eu_defines.h
> b/src/intel/compiler/brw_eu_defines.h
> index 13a70f6..ccc838d 100644
> --- a/src/intel/compiler/brw_eu_defines.h
> +++ b/src/intel/compiler/brw_eu_defines.h
> @@ -72,27 +72,6 @@
>  #define _3DPRIM_TRIFAN_NOSTIPPLE  0x16
>  #define _3DPRIM_PATCHLIST(n) ({ assert(n > 0 && n <= 32); 0x20 + (n - 1);
> })
>
> -enum brw_barycentric_mode {
> -   BRW_BARYCENTRIC_PERSPECTIVE_PIXEL       = 0,
> -   BRW_BARYCENTRIC_PERSPECTIVE_CENTROID    = 1,
> -   BRW_BARYCENTRIC_PERSPECTIVE_SAMPLE      = 2,
> -   BRW_BARYCENTRIC_NONPERSPECTIVE_PIXEL    = 3,
> -   BRW_BARYCENTRIC_NONPERSPECTIVE_CENTROID = 4,
> -   BRW_BARYCENTRIC_NONPERSPECTIVE_SAMPLE   = 5,
> -   BRW_BARYCENTRIC_MODE_COUNT              = 6
> -};
> -#define BRW_BARYCENTRIC_NONPERSPECTIVE_BITS \
> -   ((1 << BRW_BARYCENTRIC_NONPERSPECTIVE_PIXEL) | \
> -    (1 << BRW_BARYCENTRIC_NONPERSPECTIVE_CENTROID) | \
> -    (1 << BRW_BARYCENTRIC_NONPERSPECTIVE_SAMPLE))
> -
> -enum brw_pixel_shader_computed_depth_mode {
> -   BRW_PSCDEPTH_OFF   = 0, /* PS does not compute depth */
> -   BRW_PSCDEPTH_ON    = 1, /* PS computes depth; no guarantee about value
> */
> -   BRW_PSCDEPTH_ON_GE = 2, /* PS guarantees output depth >= source depth
> */
> -   BRW_PSCDEPTH_ON_LE = 3, /* PS guarantees output depth <= source depth
> */
> -};
> -
>  /* Bitfields for the URB_WRITE message, DW2 of message header: */
>  #define URB_WRITE_PRIM_END             0x1
>  #define URB_WRITE_PRIM_START           0x2
> --
> 2.9.3
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170502/b96bae64/attachment-0001.html>