xserver: Branch 'master' - 2 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 6 14:36:22 UTC 2025
glx/clientinfo.c | 2 -
glx/glxbyteorder.h | 40 -------------------------------------
glx/indirect_dispatch.c | 6 ++---
glx/indirect_dispatch_swap.c | 6 ++---
glx/indirect_program.c | 3 --
glx/indirect_reqsize.c | 4 ++-
glx/indirect_texture_compression.c | 3 --
glx/indirect_util.c | 9 +++-----
glx/swap_interval.c | 2 -
9 files changed, 17 insertions(+), 58 deletions(-)
New commits:
commit c8daf76c3ed41f57c605b67173d7333d282f4bba
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Nov 7 09:03:10 2024 +0100
glx: drop obsolete warnings on files being generated
These files haven't been auto-generated, but instead manually changed for
at least over a decade now, so these warnings have become wrong.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1728>
diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index 40a3ccc64..6459dbf26 100644
--- a/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
@@ -1,5 +1,3 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */
-
/*
* (C) Copyright IBM Corporation 2005
* All Rights Reserved.
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 0ff8e10fd..aa31ebded 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -1,5 +1,3 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */
-
/*
* (C) Copyright IBM Corporation 2005
* All Rights Reserved.
commit 2d8af9cc5e30cc6f8ad0d8237a957f85ed126c80
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Oct 15 14:59:12 2024 +0200
glx: drop obsolete glxbyteorder.h
It's just a local header, doing nothing more than including misc.h,
so we can just include misc.h directly and drop glxbyteorder.h
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1728>
diff --git a/glx/clientinfo.c b/glx/clientinfo.c
index 3dcabf844..778ca31dd 100644
--- a/glx/clientinfo.c
+++ b/glx/clientinfo.c
@@ -22,9 +22,9 @@
*/
#include <dix-config.h>
+#include "misc.h"
#include "glxserver.h"
#include "indirect_dispatch.h"
-#include "glxbyteorder.h"
#include "unpack.h"
static int
diff --git a/glx/glxbyteorder.h b/glx/glxbyteorder.h
deleted file mode 100644
index 8f0cd8a4b..000000000
--- a/glx/glxbyteorder.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2006, 2007
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file glxbyteorder.h
- * Platform glue for handling byte-ordering issues in GLX protocol.
- *
- * \author Ian Romanick <idr at us.ibm.com>
- */
-#if !defined(__GLXBYTEORDER_H__)
-#define __GLXBYTEORDER_H__
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "misc.h"
-
-#endif /* !defined(__GLXBYTEORDER_H__) */
diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index 24784e693..40a3ccc64 100644
--- a/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
@@ -24,14 +24,16 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#include <dix-config.h>
#include <inttypes.h>
+
#include "glxserver.h"
#include "indirect_size.h"
#include "indirect_size_get.h"
#include "indirect_dispatch.h"
-#include "glxbyteorder.h"
#include "indirect_util.h"
+#include "misc.h"
#include "singlesize.h"
#define __GLX_PAD(x) (((x) + 3) & ~3)
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 3eeed00f3..0ff8e10fd 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -24,14 +24,16 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#include <dix-config.h>
#include <inttypes.h>
+
#include "glxserver.h"
#include "indirect_size.h"
#include "indirect_size_get.h"
#include "indirect_dispatch.h"
-#include "glxbyteorder.h"
#include "indirect_util.h"
+#include "misc.h"
#include "singlesize.h"
#define __GLX_PAD(x) (((x) + 3) & ~3)
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index c0c7ae898..1f10c41a7 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -28,12 +28,11 @@
*
* \author Ian Romanick <idr at us.ibm.com>
*/
-
#include <dix-config.h>
#include "glxserver.h"
-#include "glxbyteorder.h"
#include "glxext.h"
+#include "misc.h"
#include "singlesize.h"
#include "unpack.h"
#include "indirect_size_get.h"
diff --git a/glx/indirect_reqsize.c b/glx/indirect_reqsize.c
index 020aae2fe..18dcfee2a 100644
--- a/glx/indirect_reqsize.c
+++ b/glx/indirect_reqsize.c
@@ -24,12 +24,14 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#include <dix-config.h>
#include <GL/gl.h>
+
#include "glxserver.h"
-#include "glxbyteorder.h"
#include "indirect_size.h"
#include "indirect_reqsize.h"
+#include "misc.h"
#if defined(__CYGWIN__) || defined(__MINGW32__)
#undef HAVE_ALIAS
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index c82bc1cb7..d45b0a910 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -22,12 +22,11 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-
#include <dix-config.h>
#include "glxserver.h"
-#include "glxbyteorder.h"
#include "glxext.h"
+#include "misc.h"
#include "singlesize.h"
#include "unpack.h"
#include "indirect_size_get.h"
diff --git a/glx/indirect_util.c b/glx/indirect_util.c
index d91ec5d61..50b8e3f1c 100644
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@@ -22,24 +22,23 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-
#include <dix-config.h>
+#include <inttypes.h>
#include <string.h>
-
-#include <X11/Xmd.h>
+#include <X11/Xmd.h> // needs to be before glxproto.h
#include <GL/gl.h>
#include <GL/glxproto.h>
-#include <inttypes.h>
+
#include "indirect_size.h"
#include "indirect_size_get.h"
#include "indirect_dispatch.h"
#include "glxserver.h"
-#include "glxbyteorder.h"
#include "singlesize.h"
#include "glxext.h"
#include "indirect_table.h"
#include "indirect_util.h"
+#include "misc.h"
#define __GLX_PAD(a) (((a)+3)&~3)
diff --git a/glx/swap_interval.c b/glx/swap_interval.c
index 2f1b02cf7..0af258e09 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@@ -27,11 +27,11 @@
#include "glxserver.h"
#include "glxutil.h"
#include "glxext.h"
+#include "misc.h"
#include "singlesize.h"
#include "unpack.h"
#include "indirect_size_get.h"
#include "indirect_dispatch.h"
-#include "glxbyteorder.h"
static int DoSwapInterval(__GLXclientState * cl, GLbyte * pc, int do_swap);
More information about the xorg-commit
mailing list