From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 24 Jan 2020 04:20:33 +0000 (-0600)
Subject: intel/isl: Plumb devinfo into isl_genX(buffer_fill_state_s)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4cd23420bd965be22df2fbdc884803cd219f9532;p=mesa.git

intel/isl: Plumb devinfo into isl_genX(buffer_fill_state_s)

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3547>
---

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 2e26bb02168..86517f662dd 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -2163,7 +2163,7 @@ void
 isl_buffer_fill_state_s(const struct isl_device *dev, void *state,
                         const struct isl_buffer_fill_state_info *restrict info)
 {
-   isl_genX_call(dev, buffer_fill_state_s, state, info);
+   isl_genX_call(dev, buffer_fill_state_s, dev, state, info);
 }
 
 void
diff --git a/src/intel/isl/isl_genX_priv.h b/src/intel/isl/isl_genX_priv.h
index a005e1c7b32..1dc6093614a 100644
--- a/src/intel/isl/isl_genX_priv.h
+++ b/src/intel/isl/isl_genX_priv.h
@@ -37,7 +37,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
                             const struct isl_surf_fill_state_info *restrict info);
 
 void
-isl_genX(buffer_fill_state_s)(void *state,
+isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state,
                               const struct isl_buffer_fill_state_info *restrict info);
 
 void
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index a7ef407360d..b1e38fdf66e 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -740,7 +740,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
 }
 
 void
-isl_genX(buffer_fill_state_s)(void *state,
+isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state,
                               const struct isl_buffer_fill_state_info *restrict info)
 {
    uint64_t buffer_size = info->size_B;