diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2018-05-23 12:18:36 +0200 |
---|---|---|
committer | Michel Dänzer <michel@daenzer.net> | 2018-07-09 18:14:19 +0200 |
commit | ac18a993a3a68629805b8f272a339e25444c0897 (patch) | |
tree | f45a6b03703c09158aa77e01183e7008b60b6e30 | |
parent | 25836375e0aab17a2e6bd91acb1c19b837ae2109 (diff) |
EXA: Remove old RADEONEXACreatePixmap hook
Not used by any supported version of xserver.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | src/evergreen_exa.c | 1 | ||||
-rw-r--r-- | src/evergreen_state.h | 1 | ||||
-rw-r--r-- | src/r600_exa.c | 1 | ||||
-rw-r--r-- | src/r600_state.h | 1 | ||||
-rw-r--r-- | src/radeon_exa.c | 29 | ||||
-rw-r--r-- | src/radeon_exa_funcs.c | 1 |
6 files changed, 0 insertions, 34 deletions
diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c index 85848133..41edd345 100644 --- a/src/evergreen_exa.c +++ b/src/evergreen_exa.c @@ -2065,7 +2065,6 @@ EVERGREENDrawInit(ScreenPtr pScreen) info->accel_state->exa->MarkSync = EVERGREENMarkSync; info->accel_state->exa->WaitMarker = EVERGREENSync; - info->accel_state->exa->CreatePixmap = RADEONEXACreatePixmap; info->accel_state->exa->DestroyPixmap = RADEONEXADestroyPixmap; info->accel_state->exa->PixmapIsOffscreen = RADEONEXAPixmapIsOffscreen; info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS; diff --git a/src/evergreen_state.h b/src/evergreen_state.h index 795d4472..ef331002 100644 --- a/src/evergreen_state.h +++ b/src/evergreen_state.h @@ -345,7 +345,6 @@ R600SetAccelState(ScrnInfoPtr pScrn, extern Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index); extern void RADEONFinishAccess_CS(PixmapPtr pPix, int index); -extern void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align); extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, int depth, int usage_hint, int bitsPerPixel, int *new_pitch); diff --git a/src/r600_exa.c b/src/r600_exa.c index c69b8fce..a111dd45 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -2044,7 +2044,6 @@ R600DrawInit(ScreenPtr pScreen) info->accel_state->exa->MarkSync = R600MarkSync; info->accel_state->exa->WaitMarker = R600Sync; - info->accel_state->exa->CreatePixmap = RADEONEXACreatePixmap; info->accel_state->exa->DestroyPixmap = RADEONEXADestroyPixmap; info->accel_state->exa->PixmapIsOffscreen = RADEONEXAPixmapIsOffscreen; info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS; diff --git a/src/r600_state.h b/src/r600_state.h index fda297d3..4898e8de 100644 --- a/src/r600_state.h +++ b/src/r600_state.h @@ -316,7 +316,6 @@ R600SetAccelState(ScrnInfoPtr pScrn, extern Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index); extern void RADEONFinishAccess_CS(PixmapPtr pPix, int index); -extern void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align); extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, int depth, int usage_hint, int bitsPerPixel, int *new_pitch); diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 9106d5c6..ef60bc0c 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -235,35 +235,6 @@ void RADEONFinishAccess_CS(PixmapPtr pPix, int index) } -void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_exa_pixmap_priv *new_priv; - - if (size != 0 && !info->exa_force_create && - info->exa_pixmaps == FALSE) - return NULL; - - new_priv = calloc(1, sizeof(struct radeon_exa_pixmap_priv)); - if (!new_priv) - return NULL; - - if (size == 0) - return new_priv; - - new_priv->bo = radeon_bo_open(info->bufmgr, 0, size, align, - RADEON_GEM_DOMAIN_VRAM, 0); - if (!new_priv->bo) { - free(new_priv); - ErrorF("Failed to alloc memory\n"); - return NULL; - } - - return new_priv; - -} - void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, int depth, int usage_hint, int bitsPerPixel, int *new_pitch) diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index da0524ed..add89458 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -638,7 +638,6 @@ Bool RADEONDrawInit(ScreenPtr pScreen) } #endif - info->accel_state->exa->CreatePixmap = RADEONEXACreatePixmap; info->accel_state->exa->DestroyPixmap = RADEONEXADestroyPixmap; info->accel_state->exa->PixmapIsOffscreen = RADEONEXAPixmapIsOffscreen; info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS; |