xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/sna_trapezoids.c
Chris Wilson
ickle at kemper.freedesktop.org
Sun Oct 13 10:50:36 PDT 2013
src/sna/sna_display.c | 2 +-
src/sna/sna_trapezoids.c | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 2987a6d5662fb3337f1400a51d016e1c5e21c063
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 13 18:50:03 2013 +0100
sna: Fix typo in DBG
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index c2f5e98..ad5b5cd 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2390,7 +2390,7 @@ sna_output_set_property(xf86OutputPtr output, Atom property,
val = *(INT32 *)value->data;
DBG(("%s: setting backlight to %d (max=%d)\n",
- ___FUNCTION__, val, sna_output->backlight_max));
+ __FUNCTION__, val, sna_output->backlight_max));
if (val < 0 || val > sna_output->backlight_max)
return FALSE;
commit 0cd2c43fa8f3a66d612589ad1163a90e427668ac
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 13 14:46:45 2013 +0100
sna/trapezoids: Use the aligned fast path for fallbacks
Route the fallback methods through the force_fallback aligned fast
paths.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index f14a67c..9691689 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -560,26 +560,29 @@ sna_composite_trapezoids(CARD8 op,
return;
if (NO_ACCEL)
- goto fallback;
+ goto force_fallback;
+
+ if (FORCE_FALLBACK > 0)
+ goto force_fallback;
if (wedged(sna)) {
DBG(("%s: fallback -- wedged\n", __FUNCTION__));
- goto fallback;
+ goto force_fallback;
}
if (dst->alphaMap) {
DBG(("%s: fallback -- dst alpha map\n", __FUNCTION__));
- goto fallback;
+ goto force_fallback;
}
priv = sna_pixmap(pixmap);
if (priv == NULL) {
DBG(("%s: fallback -- dst is unattached\n", __FUNCTION__));
- goto fallback;
+ goto force_fallback;
}
- force_fallback = FORCE_FALLBACK > 0;
- if ((too_small(priv) || DAMAGE_IS_ALL(priv->cpu_damage)) &&
+ if (FORCE_FALLBACK == 0 &&
+ (too_small(priv) || DAMAGE_IS_ALL(priv->cpu_damage)) &&
!picture_is_gpu(sna, src) && untransformed(src)) {
DBG(("%s: force fallbacks --too small, %dx%d? %d, all-cpu? %d, src-is-cpu? %d\n",
__FUNCTION__,
@@ -588,10 +591,10 @@ sna_composite_trapezoids(CARD8 op,
too_small(priv),
(int)DAMAGE_IS_ALL(priv->cpu_damage),
!picture_is_gpu(sna, src)));
+
+force_fallback:
force_fallback = true;
}
- if (FORCE_FALLBACK < 0)
- force_fallback = false;
/* scan through for fast rectangles */
rectilinear = pixel_aligned = true;
@@ -630,6 +633,7 @@ sna_composite_trapezoids(CARD8 op,
DBG(("%s: rectilinear? %d, pixel-aligned? %d\n",
__FUNCTION__, rectilinear, pixel_aligned));
+
flags = 0;
if (rectilinear) {
if (pixel_aligned) {
More information about the xorg-commit
mailing list