summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-08-30 18:01:27 -0700
committerJason Ekstrand <[email protected]>2016-09-12 19:42:57 -0700
commitc70be1ead52b7a51819dc37220111bb0505610a7 (patch)
treeb4bbb06cc1d558cffe9caad48a8fe3ef959a6ede /src/intel
parentea1399aba07bfef728f43857643377c5842c1978 (diff)
intel/blorp: Add a swizzle parameter to blorp_clear
While we're here, we also re-arrange the parameters to better match the parameter order of blorp_blit. Signed-off-by: Jason Ekstrand <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/blorp/blorp.h3
-rw-r--r--src/intel/blorp/blorp_clear.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h
index 72cac202162..480f1bb104f 100644
--- a/src/intel/blorp/blorp.h
+++ b/src/intel/blorp/blorp.h
@@ -127,9 +127,10 @@ blorp_fast_clear(struct blorp_batch *batch,
void
blorp_clear(struct blorp_batch *batch,
const struct blorp_surf *surf,
+ enum isl_format format, struct isl_swizzle swizzle,
uint32_t level, uint32_t start_layer, uint32_t num_layers,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1,
- enum isl_format format, union isl_color_value clear_color,
+ union isl_color_value clear_color,
const bool color_write_disable[4]);
void
diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index d16933cc6fc..a8f29fd382f 100644
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -242,9 +242,10 @@ blorp_fast_clear(struct blorp_batch *batch,
void
blorp_clear(struct blorp_batch *batch,
const struct blorp_surf *surf,
+ enum isl_format format, struct isl_swizzle swizzle,
uint32_t level, uint32_t start_layer, uint32_t num_layers,
uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1,
- enum isl_format format, union isl_color_value clear_color,
+ union isl_color_value clear_color,
const bool color_write_disable[4])
{
struct blorp_params params;
@@ -290,6 +291,7 @@ blorp_clear(struct blorp_batch *batch,
while (num_layers > 0) {
brw_blorp_surface_info_init(batch->blorp, &params.dst, surf, level,
start_layer, format, true);
+ params.dst.view.swizzle = swizzle;
/* We may be restricted on the number of layers we can bind at any one
* time. In particular, Sandy Bridge has a maximum number of layers of