XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-03-24 01:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop using glamor_egl_destroy_textured_pixmap() on ancient Xservers

Browse Source 
No need to support ancient Xserver versions anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-29 12:14:56 +02:00
committed by Enrico Weigelt
parent aa652bd913
commit d5538ccc6a
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -126,12 +126,6 @@ if test "x$GLAMOR" != "xno"; then
[#include "xorg-server.h"
#include "glamor.h"])
AC_CHECK_DECL(glamor_egl_destroy_textured_pixmap,
[AC_DEFINE(HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP, 1,
[Have glamor_egl_destroy_textured_pixmap API])], [],
[#include "xorg-server.h"
#include "glamor.h"])
AC_CHECK_DECL(glamor_finish,
[AC_DEFINE(HAVE_GLAMOR_FINISH, 1,
[Have glamor_finish API])],

11
src/amdgpu_glamor.c
View File

@@ -140,11 +140,9 @@ amdgpu_glamor_create_textured_pixmap(PixmapPtr pixmap, struct amdgpu_buffer *bo)
static Bool amdgpu_glamor_destroy_pixmap(PixmapPtr pixmap)
{
#ifndef HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP
ScreenPtr screen = pixmap->drawable.pScreen;
AMDGPUInfoPtr info = AMDGPUPTR(xf86ScreenToScrn(screen));
Bool ret = TRUE;
#endif
if (pixmap->refcnt == 1) {
if (pixmap->devPrivate.ptr) {
@@ -153,17 +151,9 @@ static Bool amdgpu_glamor_destroy_pixmap(PixmapPtr pixmap)
if (bo)
amdgpu_bo_unmap(bo);
}
#ifdef HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP
glamor_egl_destroy_textured_pixmap(pixmap);
#endif
amdgpu_set_pixmap_bo(pixmap, NULL);
}
#ifdef HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP
fbDestroyPixmap(pixmap);
return TRUE;
#else
screen->DestroyPixmap = info->glamor.SavedDestroyPixmap;
if (screen->DestroyPixmap)
ret = screen->DestroyPixmap(pixmap);
@@ -171,7 +161,6 @@ static Bool amdgpu_glamor_destroy_pixmap(PixmapPtr pixmap)
screen->DestroyPixmap = amdgpu_glamor_destroy_pixmap;
return ret;
#endif
}
static PixmapPtr