aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorNanley Chery <[email protected]>2020-05-20 11:46:46 -0700
committerMarge Bot <[email protected]>2020-06-19 21:03:31 +0000
commite533232d8c814dec0799650a6de3a710d029c63e (patch)
treecb839eb35e64750cac074cd266e33c0baa670c0a /src/gallium
parent7b7d28ed6de5dadc3a6b121d3bb2fec69571c69b (diff)
iris: Drop can_fast_clear_color's format parameter
Pull the resource's format from the pipe_resource instead. Makes the changes in later commits more obvious. Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4972>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/iris/iris_clear.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c
index 8fb95c8f790..32c8cd97772 100644
--- a/src/gallium/drivers/iris/iris_clear.c
+++ b/src/gallium/drivers/iris/iris_clear.c
@@ -69,7 +69,6 @@ can_fast_clear_color(struct iris_context *ice,
struct pipe_resource *p_res,
unsigned level,
const struct pipe_box *box,
- enum isl_format format,
enum isl_format render_format,
union isl_color_value color)
{
@@ -94,7 +93,7 @@ can_fast_clear_color(struct iris_context *ice,
* resource and not the renderbuffer.
*/
if (isl_format_srgb_to_linear(render_format) !=
- isl_format_srgb_to_linear(format)) {
+ isl_format_srgb_to_linear(res->surf.format)) {
return false;
}
@@ -102,7 +101,7 @@ can_fast_clear_color(struct iris_context *ice,
* see intel_miptree_create_for_dri_image()
*/
- if (!iris_is_color_fast_clear_compatible(ice, format, color))
+ if (!iris_is_color_fast_clear_compatible(ice, res->surf.format, color))
return false;
return true;
@@ -364,7 +363,7 @@ clear_color(struct iris_context *ice,
iris_batch_maybe_flush(batch, 1500);
bool can_fast_clear = can_fast_clear_color(ice, p_res, level, box,
- res->surf.format, format, color);
+ format, color);
if (can_fast_clear) {
fast_clear_color(ice, res, level, box, format, color,
blorp_flags);