xserver: Branch 'master'

[GitLab Mirror]

 hw/xquartz/GL/indirect.c |   36 ------------------------------------
 1 file changed, 36 deletions(-)

New commits:
commit 78d420870fb7169c0689058932acb4ce6c9e87ce
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon May 6 15:13:41 2024 +0200

    xquartz: drop unused code
    
    These code pieces have been commented out since their introduction back
    almost two decades ago, so probably no need for them anymore.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1603>

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 594c01a2c..993264bb7 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -341,33 +341,6 @@ attach(__GLXAquaContext *context, __GLXAquaDrawable *draw)
     return FALSE;
 }
 
-#if 0     // unused
-static void
-unattach(__GLXAquaContext *context)
-{
-    x_list *lst;
-    GLAQUA_DEBUG_MSG("unattach\n");
-    if (context == NULL) {
-        ErrorF("Tried to unattach a null context\n");
-        return;
-    }
-    if (context->isAttached) {
-        GLAQUA_DEBUG_MSG("unattaching\n");
-
-        if (surface_hash != NULL) {
-            lst = x_hash_table_lookup(surface_hash, (void *)context->sid,
-                                      NULL);
-            lst = x_list_remove(lst, context);
-            x_hash_table_insert(surface_hash, (void *)context->sid, lst);
-        }
-
-        CGLClearDrawable(context->ctx);
-        context->isAttached = FALSE;
-        context->sid = 0;
-    }
-}
-#endif
-
 static int
 __glXAquaContextMakeCurrent(__GLXcontext *baseContext)
 {
@@ -541,15 +514,6 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
     return &screen->base;
 }
 
-#if 0 // unused
-static void
-__glXAquaDrawableCopySubBuffer(__GLXdrawable *drawable,
-                               int x, int y, int w, int h)
-{
-    /*TODO finish me*/
-}
-#endif
-
 static void
 __glXAquaDrawableDestroy(__GLXdrawable *base)
 {