summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-15 18:43:01 +0100
committerDave Airlie <airlied@redhat.com>2012-06-15 18:43:01 +0100
commit997b0dddfeb180043ece5eff0ac0d6a1a751f9b5 (patch)
tree81b7ea226c1f1cc9767aa9003f5ba1245ce7f81f
parent639061edb3ac35a24e4d6633c9b6384434dcac64 (diff)
radeon: drop radeonGetPixmapOffset
no longer needed. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/radeon.h1
-rw-r--r--src/radeon_accel.c5
-rw-r--r--src/radeon_exa.c5
3 files changed, 2 insertions, 9 deletions
diff --git a/src/radeon.h b/src/radeon.h
index c80aae93..21f950b7 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -509,7 +509,6 @@ extern Bool RADEONAccelInit(ScreenPtr pScreen);
extern void RADEONEngineInit(ScrnInfoPtr pScrn);
extern void RADEONCopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap);
extern void RADEONInit3DEngine(ScrnInfoPtr pScrn);
-uint32_t radeonGetPixmapOffset(PixmapPtr pPix);
extern int radeon_cs_space_remaining(ScrnInfoPtr pScrn);
/* radeon_commonfuncs.c */
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index c8d52b95..32f3095b 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -146,11 +146,6 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
}
-uint32_t radeonGetPixmapOffset(PixmapPtr pPix)
-{
- return 0;
-}
-
int radeon_cs_space_remaining(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index be125335..99dc453b 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -150,17 +150,16 @@ static Bool RADEONGetOffsetPitch(PixmapPtr pPix, int bpp, uint32_t *pitch_offset
Bool RADEONGetPixmapOffsetPitch(PixmapPtr pPix, uint32_t *pitch_offset)
{
- uint32_t pitch, offset;
+ uint32_t pitch;
int bpp;
bpp = pPix->drawable.bitsPerPixel;
if (bpp == 24)
bpp = 8;
- offset = radeonGetPixmapOffset(pPix);
pitch = exaGetPixmapPitch(pPix);
- return RADEONGetOffsetPitch(pPix, bpp, pitch_offset, offset, pitch);
+ return RADEONGetOffsetPitch(pPix, bpp, pitch_offset, 0, pitch);
}
/**