From 419684091cb58e9c06e698c6eb2e86731815d279 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 22 Feb 2013 16:43:02 -0800 Subject: [PATCH] glx/dri2: Pull some internal structures out to a separate header file This structures will be accessed by internal functions that will be added in a file separate from dri2_glx.c. The new code will be added to a new file to facilitate unit testing. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/glx/dri2_glx.c | 21 +------------------ src/glx/dri2_priv.h | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 src/glx/dri2_priv.h diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index cfa5856484f..84e88ec2efd 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -50,6 +50,7 @@ #include "xf86drm.h" #include "dri2.h" #include "dri_common.h" +#include "dri2_priv.h" /* From xmlpool/options.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 @@ -78,26 +79,6 @@ struct dri2_display const __DRIextension *loader_extensions[4]; }; -struct dri2_screen { - struct glx_screen base; - - __DRIscreen *driScreen; - __GLXDRIscreen vtable; - const __DRIdri2Extension *dri2; - const __DRIcoreExtension *core; - - const __DRI2flushExtension *f; - const __DRI2configQueryExtension *config; - const __DRItexBufferExtension *texBuffer; - const __DRI2throttleExtension *throttle; - const __DRIconfig **driver_configs; - - void *driver; - int fd; - - int show_fps_interval; -}; - struct dri2_context { struct glx_context base; diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h new file mode 100644 index 00000000000..3ddcd6e698f --- /dev/null +++ b/src/glx/dri2_priv.h @@ -0,0 +1,51 @@ +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Soft- + * ware"), to deal in the Software without restriction, including without + * limitation the rights to use, copy, modify, merge, publish, distribute, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, provided that the above copyright + * notice(s) and this permission notice appear in all copies of the Soft- + * ware and that both the above copyright notice(s) and this permission + * notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- + * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY + * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN + * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- + * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- + * MANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder shall + * not be used in advertising or otherwise to promote the sale, use or + * other dealings in this Software without prior written authorization of + * the copyright holder. + * + * Authors: + * Kristian Høgsberg (krh@redhat.com) + */ + +struct dri2_screen { + struct glx_screen base; + + __DRIscreen *driScreen; + __GLXDRIscreen vtable; + const __DRIdri2Extension *dri2; + const __DRIcoreExtension *core; + + const __DRI2flushExtension *f; + const __DRI2configQueryExtension *config; + const __DRItexBufferExtension *texBuffer; + const __DRI2throttleExtension *throttle; + const __DRIconfig **driver_configs; + + void *driver; + int fd; + + int show_fps_interval; +}; -- 2.30.2