From bd103f948302d4a75dc88509273e78ab959a50b2 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 26 Oct 2018 12:36:00 -0700 Subject: [PATCH] intel/blorp: Add brw_blorp_init_cs_prog_key Reworks: * Split out blorp_init_base_prog_key to share with fs/cs key init (s-b Jason) Signed-off-by: Jordan Justen Reviewed-by: Jason Ekstrand Reviewed-by: Kenneth Graunke Part-of: --- src/intel/blorp/blorp.c | 17 +++++++++++++++-- src/intel/blorp/blorp_priv.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index 8f0b7be..55df781 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -174,13 +174,26 @@ blorp_params_init(struct blorp_params *params) params->num_layers = 1; } +static void +blorp_init_base_prog_key(struct brw_base_prog_key *key) +{ + for (int i = 0; i < MAX_SAMPLERS; i++) + key->tex.swizzles[i] = SWIZZLE_XYZW; +} + void brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key) { memset(wm_key, 0, sizeof(*wm_key)); wm_key->nr_color_regions = 1; - for (int i = 0; i < MAX_SAMPLERS; i++) - wm_key->base.tex.swizzles[i] = SWIZZLE_XYZW; + blorp_init_base_prog_key(&wm_key->base); +} + +void +brw_blorp_init_cs_prog_key(struct brw_cs_prog_key *cs_key) +{ + memset(cs_key, 0, sizeof(*cs_key)); + blorp_init_base_prog_key(&cs_key->base); } const unsigned * diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index c5d8308..af8075f 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -395,6 +395,7 @@ struct brw_blorp_blit_prog_key */ void brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key); +void brw_blorp_init_cs_prog_key(struct brw_cs_prog_key *cs_key); const char *blorp_shader_type_to_name(enum blorp_shader_type type); -- 2.7.4