xf86-video-ati: Branch 'master' - 3 commits
Dave Airlie
airlied at kemper.freedesktop.org
Sat Apr 25 02:39:50 PDT 2009
src/radeon_exa_render.c | 60 +++++++++++++++++++--------------------
src/radeon_textured_videofuncs.c | 6 ---
2 files changed, 30 insertions(+), 36 deletions(-)
New commits:
commit 32af0f097bccc4499d67e969d46ba35e7487c5e2
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Apr 25 19:39:34 2009 +1000
Revert "r300/r500: set R clamp mode."
This reverts commit dab3d61619d91ae6a3da3e9b29b8258313653813.
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index b5e36e7..831a6ff 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1117,28 +1117,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
else
txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
- txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
break;
case RepeatPad:
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST);
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST);
break;
case RepeatReflect:
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR);
break;
case RepeatNone:
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
break;
}
} else
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
switch (pPict->filter) {
case PictFilterNearest:
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index de0eeb6..dd6f862 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1079,7 +1079,6 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MAG_FILTER_LINEAR |
R300_TX_MIN_FILTER_LINEAR |
(0 << R300_TX_ID_SHIFT));
@@ -1108,7 +1107,6 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txpitch -= 1;
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MIN_FILTER_LINEAR |
R300_TX_MAG_FILTER_LINEAR);
@@ -1141,7 +1139,6 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
/* Tex filter */
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
R300_TX_MIN_FILTER_NEAREST |
R300_TX_MAG_FILTER_NEAREST |
(1 << R300_TX_ID_SHIFT));
@@ -2508,7 +2505,6 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MAG_FILTER_LINEAR |
R300_TX_MIN_FILTER_LINEAR |
(0 << R300_TX_ID_SHIFT));
@@ -2541,7 +2537,6 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txpitch -= 1;
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MIN_FILTER_LINEAR |
R300_TX_MAG_FILTER_LINEAR);
@@ -2574,7 +2569,6 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
/* Tex filter */
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
R300_TX_MIN_FILTER_NEAREST |
R300_TX_MAG_FILTER_NEAREST |
(1 << R300_TX_ID_SHIFT));
commit b2c8f57bccbd46164907049a26ad2dd209d7b108
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Apr 25 19:39:19 2009 +1000
Revert "r3xx/r5xx: fix typo in last commit"
This reverts commit 1a7b982457ead5f21c6e62a409ca0dbf86005607.
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 71f9652..b5e36e7 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1127,7 +1127,7 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
case RepeatReflect:
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_MIRROR);
+ R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR);
break;
case RepeatNone:
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
commit 253731dce6ab25122f2eda559233c098536b7143
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Apr 25 19:39:05 2009 +1000
Revert "radeon: attempt to fix R clamping for repeat again"
This reverts commit 5998f262a52cb85b334fcc1fe24c7b2ae474ce93.
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 02bada4..71f9652 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1104,36 +1104,41 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
txfilter = (unit << R300_TX_ID_SHIFT);
- switch (pPict->repeatType) {
- case RepeatNormal:
- if (unit != 0 || !info->accel_state->need_src_tile_x)
- txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP);
- else
- txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL);
-
- if (unit != 0 || !info->accel_state->need_src_tile_y)
- txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP);
- else
- txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
-
- txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER);
- break;
- case RepeatPad:
- txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER);
- break;
- case RepeatReflect:
- txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER);
- break;
- case RepeatNone:
- txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER);
- break;
- }
+ if (pPict->repeat) {
+ switch (pPict->repeatType) {
+ case RepeatNormal:
+ if (unit != 0 || !info->accel_state->need_src_tile_x)
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP);
+ else
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL);
+
+ if (unit != 0 || !info->accel_state->need_src_tile_y)
+ txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP);
+ else
+ txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+
+ txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
+ break;
+ case RepeatPad:
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST);
+ break;
+ case RepeatReflect:
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
+ R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_MIRROR);
+ break;
+ case RepeatNone:
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
+ break;
+ }
+ } else
+ txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
+ R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
switch (pPict->filter) {
case PictFilterNearest:
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 217abfb..de0eeb6 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1079,7 +1079,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MAG_FILTER_LINEAR |
R300_TX_MIN_FILTER_LINEAR |
(0 << R300_TX_ID_SHIFT));
@@ -1108,7 +1108,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
txpitch -= 1;
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
R300_TX_MIN_FILTER_LINEAR |
R300_TX_MAG_FILTER_LINEAR);
@@ -1141,7 +1141,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
/* Tex filter */
txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
- R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
+ R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
R300_TX_MIN_FILTER_NEAREST |
R300_TX_MAG_FILTER_NEAREST |
(1 << R300_TX_ID_SHIFT));
More information about the xorg-commit
mailing list