From 3c6c32e61109635e97d8e817c54303c7a508bdd1 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 12 Jan 2026 18:37:22 +0100
Subject: [PATCH] drop #ifdef RANDR_12_INTERFACE

All non-ancient Xserver versions have it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 vmwgfx/vmwgfx_driver.c     | 2 --
 vmwgfx/vmwgfx_output.c     | 4 ----
 vmwgfx/vmwgfx_rr_inlines.h | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
index ea973c6..cba6cee 100644
--- a/vmwgfx/vmwgfx_driver.c
+++ b/vmwgfx/vmwgfx_driver.c
@@ -976,11 +976,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
 	xf86CrtcPtr crtc = xf86_config->crtc[c];
 
 	/* Make the change through RandR */
-#ifdef RANDR_12_INTERFACE
 	if (crtc->randr_crtc)
 	    RRCrtcGammaSet(crtc->randr_crtc, ms->lut_r, ms->lut_g, ms->lut_b);
 	else
-#endif
 	    crtc->funcs->gamma_set(crtc, ms->lut_r, ms->lut_g, ms->lut_b, 256);
     }
 }
diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c
index d0fea34..765baad 100644
--- a/vmwgfx/vmwgfx_output.c
+++ b/vmwgfx/vmwgfx_output.c
@@ -355,7 +355,6 @@ output_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
     return MODE_OK;
 }
 
-#ifdef RANDR_12_INTERFACE
 static Bool
 output_set_property(xf86OutputPtr output, Atom property, RRPropertyValuePtr value)
 {
@@ -406,7 +405,6 @@ output_set_property(xf86OutputPtr output, Atom property, RRPropertyValuePtr valu
 
     return TRUE;
 }
-#endif /* RANDR_12_INTERFACE */
 
 /**
  * vmwgfx_output_property_scan - Update a single property on a single output
@@ -503,9 +501,7 @@ output_destroy(xf86OutputPtr output)
 
 static const xf86OutputFuncsRec output_funcs = {
     .create_resources = output_create_resources,
-#ifdef RANDR_12_INTERFACE
     .set_property = output_set_property,
-#endif
 #ifdef RANDR_13_INTERFACE
     .get_property = output_get_property,
 #endif
diff --git a/vmwgfx/vmwgfx_rr_inlines.h b/vmwgfx/vmwgfx_rr_inlines.h
index 9608fd2..3734597 100644
--- a/vmwgfx/vmwgfx_rr_inlines.h
+++ b/vmwgfx/vmwgfx_rr_inlines.h
@@ -62,11 +62,7 @@ vmwgfx_notify_rr(ScreenPtr pScreen)
      */
     pScrPriv->lastSetTime = currentTime;
     pScrPriv->lastConfigTime = currentTime;
-#ifdef RANDR_12_INTERFACE
     xf86RandR12TellChanged(pScreen);
-#else
-    RRTellChanged(pScreen);
-#endif
 }
 
 /**