From 0c5a7c208601110a0b36d24cdacb4d844af03f75 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 17 Dec 2013 16:32:17 -0800 Subject: [PATCH] glamor: Remove compat code for building out of tree. Signed-off-by: Eric Anholt Reviewed-by: Zhigang Gong Reviewed-by: Keith Packard --- glamor/Makefile.am | 1 - glamor/compat-api.h | 107 --------------------------------------------------- glamor/glamor.c | 4 +- glamor/glamor.h | 4 -- glamor/glamor_egl.c | 16 ++------ glamor/glamor_priv.h | 1 - 6 files changed, 6 insertions(+), 127 deletions(-) delete mode 100644 glamor/compat-api.h diff --git a/glamor/Makefile.am b/glamor/Makefile.am index 5eefd8e..6c80f24 100644 --- a/glamor/Makefile.am +++ b/glamor/Makefile.am @@ -11,7 +11,6 @@ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) libglamor_la_LDFLAGS = -version-info 0:0:0 libglamor_la_SOURCES = \ - compat-api.h \ glamor.c \ glamor_copyarea.c \ glamor_copywindow.c \ diff --git a/glamor/compat-api.h b/glamor/compat-api.h deleted file mode 100644 index 1608478..0000000 --- a/glamor/compat-api.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2012 Red Hat, Inc. - * - * 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, sublicense, - * 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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Dave Airlie - */ - -/* this file provides API compat between server post 1.13 and pre it, - it should be reused inside as many drivers as possible */ -#ifndef COMPAT_API_H -#define COMPAT_API_H - -#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -#endif - -#ifndef XF86_HAS_SCRN_CONV -#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -#endif - -#ifndef XF86_SCRN_INTERFACE - -#define SCRN_ARG_TYPE int -#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = xf86Screens[(arg1)] - -#define SCREEN_ARG_TYPE int -#define SCREEN_PTR(arg1) ScreenPtr screen = screenInfo.screens[(arg1)] - -#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr screen, int argc, char **argv - -#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer timeout, pointer read_mask -#define BLOCKHANDLER_ARGS arg, blockData, timeout, read_mask - -#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask -#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask - -#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr screen -#define CLOSE_SCREEN_ARGS scrnIndex, screen - -#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 - -#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 - -#define FREE_SCREEN_ARGS_DECL int arg, int flags -#define FREE_SCREEN_ARGS arg, flags - -#define VT_FUNC_ARGS_DECL int arg, int flags -#define VT_FUNC_ARGS(flags) scrn->scrnIndex, (flags) - -#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) - -#else -#define SCRN_ARG_TYPE ScrnInfoPtr -#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = (arg1) - -#define SCREEN_ARG_TYPE ScreenPtr -#define SCREEN_PTR(arg1) ScreenPtr screen = (arg1) - -#define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv - -#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout, pointer read_mask -#define BLOCKHANDLER_ARGS arg, timeout, read_mask - -#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask -#define WAKEUPHANDLER_ARGS arg, result, read_mask - -#define CLOSE_SCREEN_ARGS_DECL ScreenPtr screen -#define CLOSE_SCREEN_ARGS screen - -#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y - -#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -#define SWITCH_MODE_ARGS(arg, m) arg, m - -#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -#define FREE_SCREEN_ARGS arg - -#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -#define VT_FUNC_ARGS(flags) scrn - -#define XF86_ENABLEDISABLEFB_ARG(x) (x) - -#endif -#endif diff --git a/glamor/glamor.c b/glamor/glamor.c index 37136af..188aef5 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -495,7 +495,7 @@ glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv) } Bool -glamor_close_screen(CLOSE_SCREEN_ARGS_DECL) +glamor_close_screen(ScreenPtr screen) { glamor_screen_private *glamor_priv; PixmapPtr screen_pixmap; @@ -539,7 +539,7 @@ glamor_close_screen(CLOSE_SCREEN_ARGS_DECL) glamor_release_screen_priv(screen); - return screen->CloseScreen(CLOSE_SCREEN_ARGS); + return screen->CloseScreen(screen); } void diff --git a/glamor/glamor.h b/glamor/glamor.h index 4e47523..da1ad3d 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -116,11 +116,7 @@ extern _X_EXPORT void glamor_fini(ScreenPtr screen); * screen pixmap which must be a glamor pixmap and requires * the internal data structure still exist at that time. * Otherwise, the glamor internal structure will not be freed.*/ -#ifndef XF86_SCRN_INTERFACE -extern _X_EXPORT Bool glamor_close_screen(int scrnIndex, ScreenPtr screen); -#else extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen); -#endif /* Let glamor to know the screen's fbo. The low level * driver should already assign a tex diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index c65f701..4257808 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -60,7 +60,6 @@ #include #include "glamor.h" -#include "compat-api.h" #include "glamor_gl_dispatch.h" #ifdef GLX_USE_SHARED_DISPATCH #include "glapi.h" @@ -610,7 +609,7 @@ glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap) } static Bool -glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL) +glamor_egl_close_screen(ScreenPtr screen) { ScrnInfoPtr scrn; struct glamor_egl_screen_private *glamor_egl; @@ -638,7 +637,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL) screen->CloseScreen = glamor_egl->saved_close_screen; - return screen->CloseScreen(CLOSE_SCREEN_ARGS); + return screen->CloseScreen(screen); } static Bool @@ -672,17 +671,10 @@ glamor_egl_screen_init(ScreenPtr screen) } static void -glamor_egl_free_screen(FREE_SCREEN_ARGS_DECL) +glamor_egl_free_screen(ScrnInfoPtr scrn) { - ScrnInfoPtr scrn; struct glamor_egl_screen_private *glamor_egl; -#ifndef XF86_SCRN_INTERFACE - scrn = xf86Screens[arg]; -#else - scrn = arg; -#endif - glamor_egl = glamor_egl_get_screen_private(scrn); if (glamor_egl != NULL) { @@ -694,7 +686,7 @@ glamor_egl_free_screen(FREE_SCREEN_ARGS_DECL) #endif scrn->FreeScreen = glamor_egl->saved_free_screen; free(glamor_egl); - scrn->FreeScreen(FREE_SCREEN_ARGS); + scrn->FreeScreen(scrn); } } diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 08b6bb0..c733b90 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -36,7 +36,6 @@ #define NDEBUG #endif #include "glamor.h" -#include "compat-api.h" #define GL_GLEXT_PROTOTYPES -- 2.7.4