Commit 45d4e8dc authored by Chris Wilson's avatar Chris Wilson

uxa: Clear up the common intel directory

Move all the UXA backend specifc files into their own subdirectory.
Signed-off-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent ab28526e
......@@ -20,7 +20,7 @@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
SUBDIRS = man
SUBDIRS = man xvmc
if UXA
SUBDIRS += uxa
......
......@@ -506,20 +506,21 @@ AC_SUBST([moduledir])
AC_CONFIG_FILES([
Makefile
man/Makefile
uxa/Makefile
src/Makefile
src/xvmc/Makefile
src/xvmc/shader/Makefile
src/xvmc/shader/mc/Makefile
src/xvmc/shader/vld/Makefile
src/legacy/Makefile
src/legacy/i810/Makefile
src/legacy/i810/xvmc/Makefile
src/render_program/Makefile
src/sna/Makefile
src/sna/brw/Makefile
src/sna/fb/Makefile
man/Makefile
src/render_program/Makefile
src/uxa/Makefile
xvmc/Makefile
xvmc/shader/Makefile
xvmc/shader/mc/Makefile
xvmc/shader/vld/Makefile
test/Makefile
])
AC_OUTPUT
......@@ -18,7 +18,7 @@
# 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.
SUBDIRS = xvmc render_program legacy
SUBDIRS = render_program legacy
# this is obnoxious:
# -module lets us name the module exactly how we want
......@@ -38,6 +38,11 @@ SUBDIRS += sna
intel_drv_la_LIBADD += sna/libsna.la
endif
if UXA
SUBDIRS += uxa
intel_drv_la_LIBADD += uxa/libuxa.la
endif
NULL:=#
intel_drv_la_SOURCES = \
......@@ -45,70 +50,12 @@ intel_drv_la_SOURCES = \
intel_list.h \
intel_options.h \
intel_device.c \
intel_driver.h \
intel_options.c \
intel_module.c \
compat-api.h \
$(NULL)
if UXA
AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
intel_drv_la_LIBADD += @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ ../uxa/libuxa.la
intel_drv_la_SOURCES += \
brw_defines.h \
brw_structs.h \
common.h \
intel.h \
intel_batchbuffer.c \
intel_batchbuffer.h \
intel_display.c \
intel_driver.c \
intel_driver.h \
intel_glamor.h \
intel_memory.c \
intel_uxa.c \
intel_video.c \
intel_video.h \
i830_3d.c \
i830_render.c \
i830_reg.h \
i915_3d.h \
i915_reg.h \
i915_3d.c \
i915_render.c \
i915_video.c \
i965_reg.h \
i965_3d.c \
i965_video.c \
i965_render.c \
$(NULL)
if GLAMOR
AM_CFLAGS += @LIBGLAMOR_CFLAGS@
intel_drv_la_LIBADD += @LIBGLAMOR_LIBS@
intel_drv_la_SOURCES += \
intel_glamor.c \
$(NULL)
endif
if DRI2
intel_drv_la_SOURCES += \
intel_dri.c \
$(NULL)
intel_drv_la_LIBADD += \
$(DRI_LIBS) \
@CLOCK_GETTIME_LIBS@ \
$(NULL)
endif
if XVMC
intel_drv_la_SOURCES += \
intel_hwmc.h \
intel_hwmc.c \
$(NULL)
endif
endif
EXTRA_DIST = \
scripts/clock.5c \
scripts/clock-graph.5c \
......
......@@ -28,6 +28,7 @@
#include "config.h"
#endif
#include <xf86.h>
#include <xf86Parser.h>
#include <xorgVersion.h>
......@@ -35,11 +36,11 @@
#include <xf86Resources.h>
#endif
#include "common.h"
#include "intel_driver.h"
#include "intel_options.h"
#include "legacy/legacy.h"
#include "sna/sna_module.h"
#include "uxa/uxa_module.h"
#include "i915_pciids.h" /* copied from (kernel) include/drm/i915_pciids.h */
......
# Copyright 2005 Adam Jackson.
#
# 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
# on 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
# ADAM JACKSON 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.
AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program
noinst_LTLIBRARIES = libuxa.la
libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ $(top_builddir)/uxa/libuxa.la
libuxa_la_SOURCES = \
brw_defines.h \
brw_structs.h \
common.h \
intel.h \
intel_batchbuffer.c \
intel_batchbuffer.h \
intel_display.c \
intel_driver.c \
intel_glamor.h \
intel_memory.c \
intel_uxa.c \
intel_video.c \
intel_video.h \
i830_3d.c \
i830_render.c \
i830_reg.h \
i915_3d.h \
i915_reg.h \
i915_3d.c \
i915_render.c \
i915_video.c \
i965_reg.h \
i965_3d.c \
i965_video.c \
i965_render.c \
uxa_module.h \
$(NULL)
if GLAMOR
AM_CFLAGS += @LIBGLAMOR_CFLAGS@
libuxa_la_LIBADD += @LIBGLAMOR_LIBS@
libuxa_la_SOURCES += \
intel_glamor.c \
$(NULL)
endif
if DRI2
libuxa_la_SOURCES += \
intel_dri.c \
$(NULL)
libuxa_la_LIBADD += \
$(DRI_LIBS) \
@CLOCK_GETTIME_LIBS@ \
$(NULL)
endif
if XVMC
AM_CFLAGS += -I$(top_srcdir)/xvmc
libuxa_la_SOURCES += \
intel_hwmc.c \
$(NULL)
endif
......@@ -55,8 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define KB(x) ((x) * 1024)
#define MB(x) ((x) * KB(1024))
extern Bool intel_init_scrn(ScrnInfoPtr scrn);
/**
* Hints to CreatePixmap to tell the driver how the pixmap is going to be
* used.
......
......@@ -36,7 +36,7 @@
#include "fourcc.h"
#include "intel.h"
#include "intel_hwmc.h"
#include "intel_xvmc.h"
#include "intel_video.h"
#include "i830_reg.h"
#include "i965_reg.h"
......
......@@ -66,7 +66,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef INTEL_XVMC
#define _INTEL_XVMC_SERVER_
#include "intel_hwmc.h"
#include "intel_xvmc.h"
#endif
#include "legacy/legacy.h"
......
......@@ -30,7 +30,7 @@
#define _INTEL_XVMC_SERVER_
#include "intel.h"
#include "intel_hwmc.h"
#include "intel_xvmc.h"
#include <X11/extensions/Xv.h>
#include <X11/extensions/XvMC.h>
......
......@@ -75,7 +75,7 @@
#ifdef INTEL_XVMC
#define _INTEL_XVMC_SERVER_
#include "intel_hwmc.h"
#include "intel_xvmc.h"
#endif
#define OFF_DELAY 250 /* milliseconds */
......
#ifndef INTEL_MODULE_H
#define INTEL_MODULE_H
extern Bool intel_init_scrn(ScrnInfoPtr scrn);
#endif /* INTEL_MODULE_H */
......@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libuxa.la
# built (in hw/xfree86/os-support/solaris) until after UXA is built
SOLARIS_ASM_CFLAGS=""
AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) -I$(top_srcdir)/src/uxa
if GLAMOR
AM_CFLAGS += @LIBGLAMOR_CFLAGS@
......
......@@ -66,7 +66,7 @@
#include "uxa-priv.h"
#include "uxa-glamor.h"
#include "../src/common.h"
#include "common.h"
#include "mipict.h"
......
......@@ -4,17 +4,25 @@ endif
SUBDIRS = shader
libIntelXvMC_la_SOURCES = intel_xvmc.c \
intel_xvmc.h \
intel_xvmc_dump.c \
i915_structs.h \
i915_program.h \
i915_xvmc.c \
i915_xvmc.h \
i965_xvmc.c \
xvmc_vld.c \
intel_batchbuffer.c \
intel_batchbuffer.h
libIntelXvMC_la_SOURCES = \
intel_xvmc.c \
intel_xvmc.h \
intel_xvmc_private.h \
intel_xvmc_dump.c \
i830_reg.h \
i915_reg.h \
i915_structs.h \
i915_program.h \
i915_xvmc.c \
i915_xvmc.h \
brw_defines.h \
brw_structs.h \
i965_reg.h \
i965_xvmc.c \
xvmc_vld.c \
intel_batchbuffer.c \
intel_batchbuffer.h \
$(NULL)
AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@XVMCLIB_CFLAGS@ @XCB_CFLAGS@ \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -28,8 +28,7 @@
#ifndef _I915XVMC_H
#define _I915XVMC_H
#include "intel_xvmc.h"
#include "intel_hwmc.h"
#include "intel_xvmc_private.h"
#define I915_SUBPIC_PALETTE_SIZE 16
#define MAX_SUBCONTEXT_LEN 1024
......
This diff is collapsed.
......@@ -24,13 +24,11 @@
* Zou Nan hai <nanhai.zou@intel.com>
*
*/
#include "intel_xvmc.h"
#include "intel_xvmc_private.h"
#include "i830_reg.h"
#include "i965_reg.h"
#include "brw_defines.h"
#include "brw_structs.h"
#include "intel_batchbuffer.h"
#include "intel_hwmc.h"
#define BATCH_STRUCT(x) intelBatchbufferData(&x, sizeof(x), 0)
#define URB_SIZE 256 /* XXX */
......
......@@ -43,7 +43,7 @@
#include <X11/extensions/XvMC.h>
#include <X11/extensions/XvMClib.h>
#include "intel_xvmc.h"
#include "intel_xvmc_private.h"
#include "intel_batchbuffer.h"
#include "brw_defines.h"
#include "brw_structs.h"
......
......@@ -24,7 +24,7 @@
* Zhenyu Wang <zhenyu.z.wang@intel.com>
*
*/
#include "intel_xvmc.h"
#include "intel_xvmc_private.h"
#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
#include <xcb/dri2.h>
......
......@@ -24,7 +24,7 @@
* Zhenyu Wang <zhenyu.z.wang@intel.com>
*
*/
#include "intel_xvmc.h"
#include "intel_xvmc_private.h"
#define DUMPFILE "./intel_xvmc_dump"
......
......@@ -41,7 +41,6 @@
#include <stdint.h>
#include <xf86drm.h>
#include "intel_hwmc.h"
#include <X11/X.h>
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
......@@ -52,9 +51,11 @@
#include <X11/extensions/XvMClib.h>
#include <X11/extensions/vldXvMC.h>
#include <drm_sarea.h>
#include "i915_drm.h"
#include "intel_bufmgr.h"
#include "intel_xvmc.h"
#include "intel_batchbuffer.h"
#define GTT_PAGE_SIZE 4*1024
......