From d5538ccc6a557dfa4be8dda4420072ad09d3e653 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 29 Jul 2025 12:14:56 +0200 Subject: [PATCH] drop using glamor_egl_destroy_textured_pixmap() on ancient Xservers No need to support ancient Xserver versions anymore. Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 6 ------ src/amdgpu_glamor.c | 11 ----------- 2 files changed, 17 deletions(-) diff --git a/configure.ac b/configure.ac index 2d0f47e..72c34e5 100644 --- a/configure.ac +++ b/configure.ac @@ -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])], diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c index 8dcef1c..dcc86a0 100644 --- a/src/amdgpu_glamor.c +++ b/src/amdgpu_glamor.c @@ -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