1 |
From 3ce50709aac9199e4d9fa8f1c42af29776eced64 Mon Sep 17 00:00:00 2001 |
2 |
From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= <marcheu@chromium.org> |
3 |
Date: Tue, 17 Apr 2012 18:16:18 -0700 |
4 |
Subject: [PATCH 1/2] i965: Allow the case where multiple flush types are |
5 |
enqueued. |
6 |
|
7 |
This happens when the miptree is allocated with intel_miptree_alloc_hiz |
8 |
which adds NEED_HIZ_RESOLVE and then NEED_DEPTH_RESOLVE is added to it. |
9 |
--- |
10 |
src/mesa/drivers/dri/intel/intel_resolve_map.c | 4 ++-- |
11 |
1 files changed, 2 insertions(+), 2 deletions(-) |
12 |
|
13 |
diff --git a/src/mesa/drivers/dri/intel/intel_resolve_map.c b/src/mesa/drivers/dri/intel/intel_resolve_map.c |
14 |
index e7d82fa..f6f6bf1 100644 |
15 |
--- a/src/mesa/drivers/dri/intel/intel_resolve_map.c |
16 |
+++ b/src/mesa/drivers/dri/intel/intel_resolve_map.c |
17 |
@@ -42,8 +42,8 @@ intel_resolve_map_set(struct intel_resolve_map *head, |
18 |
struct intel_resolve_map *prev = head; |
19 |
|
20 |
while (*tail) { |
21 |
- if ((*tail)->level == level && (*tail)->layer == layer) { |
22 |
- assert((*tail)->need == need); |
23 |
+ if ((*tail)->level == level && (*tail)->layer == layer |
24 |
+ && (*tail)->need == need) { |
25 |
return; |
26 |
} |
27 |
prev = *tail; |
28 |
-- |
29 |
1.7.5.3.367.ga9930 |
30 |
|