[Mesa-dev] [PATCH 10/13] i965/fs_surface_builder: Take a GL format enum instead of mesa_format

[Chad Versace]

On Sat 16 Apr 2016, Jason Ekstrand wrote:
> ---
>  src/mesa/drivers/dri/i965/brw_fs_nir.cpp             | 8 +++-----
>  src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp | 7 +++++--
>  src/mesa/drivers/dri/i965/brw_fs_surface_builder.h   | 4 ++--
>  3 files changed, 10 insertions(+), 9 deletions(-)


> @@ -911,7 +912,7 @@ namespace brw {
>        emit_image_load(const fs_builder &bld,
>                        const fs_reg &image, const fs_reg &addr,
>                        unsigned surf_dims, unsigned arr_dims,
> -                      mesa_format format)
> +                      unsigned gl_format)
>        {

In the method definitions, you replaced s/format/gl_format/.

> @@ -71,13 +71,13 @@ namespace brw {
>        emit_image_load(const fs_builder &bld,
>                        const fs_reg &image, const fs_reg &addr,
>                        unsigned surf_dims, unsigned arr_dims,
> -                      mesa_format format);
> +                      unsigned format);

Please do the same for the the declarations, because 'unsigned format'
is ambiguous.

With that change, patch 10 is
Reviewed-by: Chad Versace <chad.versace at intel.com>