diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2013-01-10 12:10:52 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2013-01-10 12:10:52 +0100 |
| commit | 4e35b2f530e2ca8c7b7220cacd05c661de43d20d (patch) | |
| tree | 845f6d7b671a3ec668d4229bb56799fc9f0a6167 /src/radeon_exa_render.c | |
| parent | 857d729eb3672443f89c0516f8226eacb37dad2b (diff) | |
Drop support for X servers older than 1.7.
The main purpose is to drop DRI2 compatibility code paths which are getting
awkward to deal with and at this point are probably only tested lightly if at
all. xserver 1.7 was released more than 3 years ago, and 1.6.2 was already
required before.
Mostly mechanical, there's probably potential for more cleanups.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/radeon_exa_render.c')
| -rw-r--r-- | src/radeon_exa_render.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index 1a357422..263a2b46 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -98,10 +98,8 @@ static struct formatinfo R300TexFormats[] = { {PICT_x8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8)}, {PICT_a8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, W, W8Z8Y8X8)}, {PICT_x8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)}, -#ifdef PICT_TYPE_BGRA {PICT_b8g8r8a8, R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)}, {PICT_b8g8r8x8, R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)}, -#endif {PICT_r5g6b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)}, {PICT_a1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)}, {PICT_x1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W1Z5Y5X5)}, @@ -142,10 +140,8 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format) case PICT_x8r8g8b8: case PICT_a8b8g8r8: case PICT_x8b8g8r8: -#ifdef PICT_TYPE_BGRA case PICT_b8g8r8a8: case PICT_b8g8r8x8: -#endif *dst_format = R300_COLORFORMAT_ARGB8888; break; case PICT_r5g6b5: @@ -1615,7 +1611,6 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture, R300_OUT_FMT_C2_SEL_BLUE | R300_OUT_FMT_C3_SEL_ALPHA); break; -#ifdef PICT_TYPE_BGRA case PICT_b8g8r8a8: case PICT_b8g8r8x8: output_fmt = (R300_OUT_FMT_C4_8 | @@ -1624,7 +1619,6 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture, R300_OUT_FMT_C2_SEL_GREEN | R300_OUT_FMT_C3_SEL_BLUE); break; -#endif case PICT_a8: output_fmt = (R300_OUT_FMT_C4_8 | R300_OUT_FMT_C0_SEL_ALPHA); |