---
src/mesa/drivers/dri/i965/blorp.c | 10 ++---
src/mesa/drivers/dri/i965/blorp.h | 40 +++++++++---------
src/mesa/drivers/dri/i965/blorp_blit.c | 30 +++++++-------
src/mesa/drivers/dri/i965/blorp_clear.c | 32 +++++++--------
src/mesa/drivers/dri/i965/blorp_priv.h | 7 ++--
src/mesa/drivers/dri/i965/brw_blorp.c | 64 ++++++++++++++---------------
src/mesa/drivers/dri/i965/genX_blorp_exec.c | 4 +-
src/mesa/drivers/dri/i965/genX_blorp_exec.h | 34 +++++++--------
8 files changed, 110 insertions(+), 111 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/blorp.c
b/src/mesa/drivers/dri/i965/blorp.c
index 1b00ccc..e7d7c13 100644
--- a/src/mesa/drivers/dri/i965/blorp.c
+++ b/src/mesa/drivers/dri/i965/blorp.c
@@ -56,7 +56,7 @@ blorp_finish(struct blorp_context *blorp)
void
brw_blorp_surface_info_init(struct blorp_context *blorp,
struct brw_blorp_surface_info *info,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
unsigned int level, unsigned int layer,
enum isl_format format, bool is_render_target)
{
@@ -136,7 +136,7 @@ brw_blorp_surface_info_init(struct blorp_context *blorp,
void
-brw_blorp_params_init(struct brw_blorp_params *params)
+blorp_params_init(struct blorp_params *params)
{
memset(params, 0, sizeof(*params));
params->num_draw_buffers = 1;
@@ -342,11 +342,11 @@ brw_blorp_compile_nir_shader(struct blorp_context *blorp,
struct nir_shader *nir
void
blorp_gen6_hiz_op(struct blorp_context *blorp, void *batch,
- struct brw_blorp_surf *surf, unsigned level, unsigned layer,
+ struct blorp_surf *surf, unsigned level, unsigned layer,
enum blorp_hiz_op op)
{
- struct brw_blorp_params params;
- brw_blorp_params_init(¶ms);
+ struct blorp_params params;
+ blorp_params_init(¶ms);
params.hiz_op = op;
diff --git a/src/mesa/drivers/dri/i965/blorp.h
b/src/mesa/drivers/dri/i965/blorp.h
index b3217d0..99df588 100644
--- a/src/mesa/drivers/dri/i965/blorp.h
+++ b/src/mesa/drivers/dri/i965/blorp.h
@@ -37,7 +37,7 @@ struct hash_table;
extern "C" {
#endif
-struct brw_blorp_params;
+struct blorp_params;
struct blorp_context {
void *driver_ctx;
@@ -59,7 +59,7 @@ struct blorp_context {
uint32_t (*upload_shader)(struct blorp_context *,
const void *data, uint32_t size);
void (*exec)(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
};
void blorp_init(struct blorp_context *blorp, void *driver_ctx,
@@ -73,7 +73,7 @@ struct blorp_address {
uint32_t offset;
};
-struct brw_blorp_surf
+struct blorp_surf
{
const struct isl_surf *surf;
struct blorp_address addr;
@@ -86,36 +86,36 @@ struct brw_blorp_surf
};
void
-brw_blorp_blit(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *src_surf,
- unsigned src_level, unsigned src_layer,
- enum isl_format src_format, int src_swizzle,
- const struct brw_blorp_surf *dst_surf,
- unsigned dst_level, unsigned dst_layer,
- enum isl_format dst_format,
- float src_x0, float src_y0,
- float src_x1, float src_y1,
- float dst_x0, float dst_y0,
- float dst_x1, float dst_y1,
- uint32_t filter, bool mirror_x, bool mirror_y);
+blorp_blit(struct blorp_context *blorp, void *batch,
+ const struct blorp_surf *src_surf,
+ unsigned src_level, unsigned src_layer,
+ enum isl_format src_format, int src_swizzle,
+ const struct blorp_surf *dst_surf,
+ unsigned dst_level, unsigned dst_layer,
+ enum isl_format dst_format,
+ float src_x0, float src_y0,
+ float src_x1, float src_y1,
+ float dst_x0, float dst_y0,
+ float dst_x1, float dst_y1,
+ uint32_t filter, bool mirror_x, bool mirror_y);
void
blorp_fast_clear(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
uint32_t level, uint32_t layer,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1);
void
blorp_clear(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
uint32_t level, uint32_t layer,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1,
enum isl_format format, union isl_color_value clear_color,
bool color_write_disable[4]);
void
-brw_blorp_ccs_resolve(struct blorp_context *blorp, void *batch,
- struct brw_blorp_surf *surf, enum isl_format format);
+blorp_ccs_resolve(struct blorp_context *blorp, void *batch,
+ struct blorp_surf *surf, enum isl_format format);
/**
* For an overview of the HiZ operations, see the following sections of the
@@ -136,7 +136,7 @@ enum blorp_hiz_op {
void
blorp_gen6_hiz_op(struct blorp_context *blorp, void *batch,
- struct brw_blorp_surf *surf, unsigned level, unsigned layer,
+ struct blorp_surf *surf, unsigned level, unsigned layer,
enum blorp_hiz_op op);
#ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/blorp_blit.c
b/src/mesa/drivers/dri/i965/blorp_blit.c
index b89d828..5ce1835 100644
--- a/src/mesa/drivers/dri/i965/blorp_blit.c
+++ b/src/mesa/drivers/dri/i965/blorp_blit.c
@@ -1186,7 +1186,7 @@ brw_blorp_build_nir_shader(struct blorp_context *blorp,
static void
brw_blorp_get_blit_kernel(struct blorp_context *blorp,
- struct brw_blorp_params *params,
+ struct blorp_params *params,
const struct brw_blorp_blit_prog_key *prog_key)
{
if (blorp_find_shader(blorp, BLORP_SHADER_TYPE_BLIT, prog_key,
@@ -1379,23 +1379,23 @@ surf_retile_w_to_y(const struct isl_device *isl_dev,
}
void
-brw_blorp_blit(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *src_surf,
- unsigned src_level, unsigned src_layer,
- enum isl_format src_format, int src_swizzle,
- const struct brw_blorp_surf *dst_surf,
- unsigned dst_level, unsigned dst_layer,
- enum isl_format dst_format,
- float src_x0, float src_y0,
- float src_x1, float src_y1,
- float dst_x0, float dst_y0,
- float dst_x1, float dst_y1,
- GLenum filter, bool mirror_x, bool mirror_y)
+blorp_blit(struct blorp_context *blorp, void *batch,
+ const struct blorp_surf *src_surf,
+ unsigned src_level, unsigned src_layer,
+ enum isl_format src_format, int src_swizzle,
+ const struct blorp_surf *dst_surf,
+ unsigned dst_level, unsigned dst_layer,
+ enum isl_format dst_format,
+ float src_x0, float src_y0,
+ float src_x1, float src_y1,
+ float dst_x0, float dst_y0,
+ float dst_x1, float dst_y1,
+ GLenum filter, bool mirror_x, bool mirror_y)
{
const struct brw_device_info *devinfo = blorp->isl_dev->info;
- struct brw_blorp_params params;
- brw_blorp_params_init(¶ms);
+ struct blorp_params params;
+ blorp_params_init(¶ms);
brw_blorp_surface_info_init(blorp, ¶ms.src, src_surf, src_level,
src_layer, src_format, false);
diff --git a/src/mesa/drivers/dri/i965/blorp_clear.c
b/src/mesa/drivers/dri/i965/blorp_clear.c
index fd27bf7..74df8fc 100644
--- a/src/mesa/drivers/dri/i965/blorp_clear.c
+++ b/src/mesa/drivers/dri/i965/blorp_clear.c
@@ -31,9 +31,9 @@
#define FILE_DEBUG_FLAG DEBUG_BLORP
static void
-brw_blorp_params_get_clear_kernel(struct blorp_context *blorp,
- struct brw_blorp_params *params,
- bool use_replicated_data)
+blorp_params_get_clear_kernel(struct blorp_context *blorp,
+ struct blorp_params *params,
+ bool use_replicated_data)
{
const enum blorp_shader_type shader_type = use_replicated_data ?
BLORP_SHADER_TYPE_REPCLEAR : BLORP_SHADER_TYPE_SLOW_CLEAR;
@@ -200,12 +200,12 @@ get_fast_clear_rect(const struct isl_device *dev,
void
blorp_fast_clear(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
uint32_t level, uint32_t layer,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1)
{
- struct brw_blorp_params params;
- brw_blorp_params_init(¶ms);
+ struct blorp_params params;
+ blorp_params_init(¶ms);
params.x0 = x0;
params.y0 = y0;
@@ -218,7 +218,7 @@ blorp_fast_clear(struct blorp_context *blorp, void *batch,
get_fast_clear_rect(blorp->isl_dev, surf->aux_surf,
¶ms.x0, ¶ms.y0, ¶ms.x1, ¶ms.y1);
- brw_blorp_params_get_clear_kernel(blorp, ¶ms, true);
+ blorp_params_get_clear_kernel(blorp, ¶ms, true);
brw_blorp_surface_info_init(blorp, ¶ms.dst, surf, level, layer,
surf->surf->format, true);
@@ -229,14 +229,14 @@ blorp_fast_clear(struct blorp_context *blorp, void *batch,
void
blorp_clear(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
uint32_t level, uint32_t layer,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1,
enum isl_format format, union isl_color_value clear_color,
bool color_write_disable[4])
{
- struct brw_blorp_params params;
- brw_blorp_params_init(¶ms);
+ struct blorp_params params;
+ blorp_params_init(¶ms);
params.x0 = x0;
params.y0 = y0;
@@ -265,7 +265,7 @@ blorp_clear(struct blorp_context *blorp, void *batch,
use_simd16_replicated_data = false;
}
- brw_blorp_params_get_clear_kernel(blorp, ¶ms,
use_simd16_replicated_data);
+ blorp_params_get_clear_kernel(blorp, ¶ms, use_simd16_replicated_data);
brw_blorp_surface_info_init(blorp, ¶ms.dst, surf, level, layer,
format, true);
@@ -274,11 +274,11 @@ blorp_clear(struct blorp_context *blorp, void *batch,
}
void
-brw_blorp_ccs_resolve(struct blorp_context *blorp, void *batch,
- struct brw_blorp_surf *surf, enum isl_format format)
+blorp_ccs_resolve(struct blorp_context *blorp, void *batch,
+ struct blorp_surf *surf, enum isl_format format)
{
- struct brw_blorp_params params;
- brw_blorp_params_init(¶ms);
+ struct blorp_params params;
+ blorp_params_init(¶ms);
brw_blorp_surface_info_init(blorp, ¶ms.dst, surf,
0 /* level */, 0 /* layer */, format, true);
@@ -329,7 +329,7 @@ brw_blorp_ccs_resolve(struct blorp_context *blorp, void
*batch,
* color" message.
*/
- brw_blorp_params_get_clear_kernel(blorp, ¶ms, true);
+ blorp_params_get_clear_kernel(blorp, ¶ms, true);
blorp->exec(blorp, batch, ¶ms);
}
diff --git a/src/mesa/drivers/dri/i965/blorp_priv.h
b/src/mesa/drivers/dri/i965/blorp_priv.h
index 74ad8ee..097c6e3 100644
--- a/src/mesa/drivers/dri/i965/blorp_priv.h
+++ b/src/mesa/drivers/dri/i965/blorp_priv.h
@@ -72,7 +72,7 @@ struct brw_blorp_surface_info
void
brw_blorp_surface_info_init(struct blorp_context *blorp,
struct brw_blorp_surface_info *info,
- const struct brw_blorp_surf *surf,
+ const struct blorp_surf *surf,
unsigned int level, unsigned int layer,
enum isl_format format, bool is_render_target);
@@ -165,7 +165,7 @@ brw_blorp_get_urb_length(const struct brw_blorp_prog_data
*prog_data)
return MAX2((prog_data->num_varying_inputs + 1) / 2, 1);
}
-struct brw_blorp_params
+struct blorp_params
{
uint32_t x0;
uint32_t y0;
@@ -185,8 +185,7 @@ struct brw_blorp_params
const struct brw_blorp_prog_data *wm_prog_data;
};
-void
-brw_blorp_params_init(struct brw_blorp_params *params);
+void blorp_params_init(struct blorp_params *params);
struct brw_blorp_blit_prog_key
{
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
b/src/mesa/drivers/dri/i965/brw_blorp.c
index 74f74c5..fa92bdb 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -59,15 +59,15 @@ brw_blorp_upload_shader(struct blorp_context *blorp,
}
void gen6_blorp_exec(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void gen7_blorp_exec(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void gen75_blorp_exec(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void gen8_blorp_exec(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void gen9_blorp_exec(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void
brw_blorp_init(struct brw_context *brw)
@@ -144,12 +144,12 @@ apply_gen6_stencil_hiz_offset(struct isl_surf *surf,
}
static void
-brw_blorp_surf_for_miptree(struct brw_context *brw,
- struct brw_blorp_surf *surf,
- struct intel_mipmap_tree *mt,
- bool is_render_target,
- unsigned *level,
- struct isl_surf tmp_surfs[2])
+blorp_surf_for_miptree(struct brw_context *brw,
+ struct blorp_surf *surf,
+ struct intel_mipmap_tree *mt,
+ bool is_render_target,
+ unsigned *level,
+ struct isl_surf tmp_surfs[2])
{
intel_miptree_get_isl_surf(brw, mt, &tmp_surfs[0]);
surf->surf = &tmp_surfs[0];
@@ -333,19 +333,19 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
intel_miptree_used_for_rendering(dst_mt);
struct isl_surf tmp_surfs[4];
- struct brw_blorp_surf src_surf, dst_surf;
- brw_blorp_surf_for_miptree(brw, &src_surf, src_mt, false,
- &src_level, &tmp_surfs[0]);
- brw_blorp_surf_for_miptree(brw, &dst_surf, dst_mt, true,
- &dst_level, &tmp_surfs[2]);
-
- brw_blorp_blit(&brw->blorp, brw, &src_surf, src_level, src_layer,
- brw_blorp_to_isl_format(brw, src_format, false), src_swizzle,
- &dst_surf, dst_level, dst_layer,
- brw_blorp_to_isl_format(brw, dst_format, true),
- src_x0, src_y0, src_x1, src_y1,
- dst_x0, dst_y0, dst_x1, dst_y1,
- filter, mirror_x, mirror_y);
+ struct blorp_surf src_surf, dst_surf;
+ blorp_surf_for_miptree(brw, &src_surf, src_mt, false,
+ &src_level, &tmp_surfs[0]);
+ blorp_surf_for_miptree(brw, &dst_surf, dst_mt, true,
+ &dst_level, &tmp_surfs[2]);
+
+ blorp_blit(&brw->blorp, brw, &src_surf, src_level, src_layer,
+ brw_blorp_to_isl_format(brw, src_format, false), src_swizzle,
+ &dst_surf, dst_level, dst_layer,
+ brw_blorp_to_isl_format(brw, dst_format, true),
+ src_x0, src_y0, src_x1, src_y1,
+ dst_x0, dst_y0, dst_x1, dst_y1,
+ filter, mirror_x, mirror_y);
intel_miptree_slice_set_needs_hiz_resolve(dst_mt, dst_level, dst_layer);
@@ -727,9 +727,9 @@ do_single_blorp_clear(struct brw_context *brw, struct
gl_framebuffer *fb,
/* We can't setup the blorp_surf until we've allocated the MCS above */
struct isl_surf isl_tmp[2];
- struct brw_blorp_surf surf;
+ struct blorp_surf surf;
unsigned level = irb->mt_level;
- brw_blorp_surf_for_miptree(brw, &surf, irb->mt, true, &level, isl_tmp);
+ blorp_surf_for_miptree(brw, &surf, irb->mt, true, &level, isl_tmp);
if (can_fast_clear) {
DBG("%s (fast) to mt %p level %d layer %d\n", __FUNCTION__,
@@ -822,12 +822,12 @@ brw_blorp_resolve_color(struct brw_context *brw, struct
intel_mipmap_tree *mt)
intel_miptree_used_for_rendering(mt);
struct isl_surf isl_tmp[2];
- struct brw_blorp_surf surf;
+ struct blorp_surf surf;
unsigned level = 0;
- brw_blorp_surf_for_miptree(brw, &surf, mt, true, &level, isl_tmp);
+ blorp_surf_for_miptree(brw, &surf, mt, true, &level, isl_tmp);
- brw_blorp_ccs_resolve(&brw->blorp, brw, &surf,
- brw_blorp_to_isl_format(brw, format, true));
+ blorp_ccs_resolve(&brw->blorp, brw, &surf,
+ brw_blorp_to_isl_format(brw, format, true));
mt->fast_clear_state = INTEL_FAST_CLEAR_STATE_RESOLVED;
}
@@ -842,8 +842,8 @@ gen6_blorp_hiz_exec(struct brw_context *brw, struct
intel_mipmap_tree *mt,
assert(intel_miptree_level_has_hiz(mt, level));
struct isl_surf isl_tmp[2];
- struct brw_blorp_surf surf;
- brw_blorp_surf_for_miptree(brw, &surf, mt, true, &level, isl_tmp);
+ struct blorp_surf surf;
+ blorp_surf_for_miptree(brw, &surf, mt, true, &level, isl_tmp);
blorp_gen6_hiz_op(&brw->blorp, brw, &surf, level, layer, op);
}
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index 0d24066..f795f93 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -168,11 +168,11 @@ blorp_emit_3dstate_multisample(struct blorp_context
*blorp, void *batch,
}
void genX(blorp_exec)(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params);
+ const struct blorp_params *params);
void
genX(blorp_exec)(struct blorp_context *blorp, void *batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
assert(blorp->driver_ctx == batch);
struct brw_context *brw = batch;
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.h
b/src/mesa/drivers/dri/i965/genX_blorp_exec.h
index f2c944b..292059b 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.h
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.h
@@ -31,7 +31,7 @@
*
* static void
* blorp_exec(struct blorp_context *blorp, void *batch_data,
- * const struct brw_blorp_params *params);
+ * const struct blorp_params *params);
*
* It is the job of whoever includes this header to wrap this in something
* to get an externally visible symbol.
@@ -135,7 +135,7 @@ __gen_combine_address(struct blorp_batch *batch, void
*location,
* The URB size is in turn expressed in 64 bytes (512 bits).
*/
static inline unsigned
-gen7_blorp_get_vs_entry_size(const struct brw_blorp_params *params)
+gen7_blorp_get_vs_entry_size(const struct blorp_params *params)
{
const unsigned num_varyings =
params->wm_prog_data ? params->wm_prog_data->num_varying_inputs : 0;
@@ -158,7 +158,7 @@ gen7_blorp_get_vs_entry_size(const struct brw_blorp_params
*params)
*/
static void
emit_urb_config(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
blorp_emit_urb_config(batch.blorp, batch.batch,
gen7_blorp_get_vs_entry_size(params));
@@ -166,7 +166,7 @@ emit_urb_config(struct blorp_batch batch,
static void
blorp_emit_vertex_data(struct blorp_batch batch,
- const struct brw_blorp_params *params,
+ const struct blorp_params *params,
struct blorp_address *addr,
uint32_t *size)
{
@@ -183,7 +183,7 @@ blorp_emit_vertex_data(struct blorp_batch batch,
static void
blorp_emit_input_varying_data(struct blorp_batch batch,
- const struct brw_blorp_params *params,
+ const struct blorp_params *params,
struct blorp_address *addr,
uint32_t *size)
{
@@ -215,7 +215,7 @@ blorp_emit_input_varying_data(struct blorp_batch batch,
static void
blorp_emit_vertex_buffers(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
struct GENX(VERTEX_BUFFER_STATE) vb[2];
memset(vb, 0, sizeof(vb));
@@ -269,7 +269,7 @@ blorp_emit_vertex_buffers(struct blorp_batch batch,
static void
blorp_emit_vertex_elements(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
const unsigned num_varyings =
params->wm_prog_data ? params->wm_prog_data->num_varying_inputs : 0;
@@ -378,7 +378,7 @@ blorp_emit_vertex_elements(struct blorp_batch batch,
static void
blorp_emit_sf_config(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
const struct brw_blorp_prog_data *prog_data = params->wm_prog_data;
@@ -455,7 +455,7 @@ blorp_emit_sf_config(struct blorp_batch batch,
static void
blorp_emit_ps_config(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
const struct brw_blorp_prog_data *prog_data = params->wm_prog_data;
@@ -671,7 +671,7 @@ blorp_emit_ps_config(struct blorp_batch batch,
static void
blorp_emit_depth_stencil_config(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
#if GEN_GEN >= 7
const uint32_t mocs = 1; /* GEN7_MOCS_L3 */
@@ -732,7 +732,7 @@ blorp_emit_depth_stencil_config(struct blorp_batch batch,
static uint32_t
blorp_emit_blend_state(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
struct GENX(BLEND_STATE) blend;
memset(&blend, 0, sizeof(blend));
@@ -775,7 +775,7 @@ blorp_emit_blend_state(struct blorp_batch batch,
static uint32_t
blorp_emit_color_calc_state(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
uint32_t offset;
void *state = blorp_alloc_dynamic_state(batch.blorp,
@@ -798,7 +798,7 @@ blorp_emit_color_calc_state(struct blorp_batch batch,
static uint32_t
blorp_emit_depth_stencil_state(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
#if GEN_GEN >= 8
@@ -900,7 +900,7 @@ blorp_emit_surface_state(struct blorp_context *blorp,
static void
blorp_emit_surface_states(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
uint32_t bind_offset, *bind_map;
void *surface_maps[2];
@@ -935,7 +935,7 @@ blorp_emit_surface_states(struct blorp_batch batch,
static void
blorp_emit_sampler_state(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
struct GENX(SAMPLER_STATE) sampler = {
.MipModeFilter = MIPFILTER_NONE,
@@ -980,7 +980,7 @@ blorp_emit_sampler_state(struct blorp_batch batch,
/* 3DSTATE_VIEWPORT_STATE_POINTERS */
static void
blorp_emit_viewport_state(struct blorp_batch batch,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
uint32_t cc_vp_offset;
@@ -1019,7 +1019,7 @@ blorp_emit_viewport_state(struct blorp_batch batch,
*/
static void
blorp_exec(struct blorp_context *blorp, void *batch_data,
- const struct brw_blorp_params *params)
+ const struct blorp_params *params)
{
struct blorp_batch batch = {
.blorp = blorp,
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
