Re: [PATCH 06/12] Remove glamor support from UXA acceleration

Eric Anholt
2014-07-31T01:42:44Z

[-- Attachment #1.1: Type: text/plain, Size: 1779 bytes --]

Keith Packard <keithp-aN4HjG94KOLQT0dZR+AlfA@public.gmane.org> writes:

> Makes UXA no longer include calls to glamor acceleration functions.
>
> Signed-off-by: Keith Packard <keithp-aN4HjG94KOLQT0dZR+AlfA@public.gmane.org>
> ---
> src/uxa/Makefile.am | 9 --
> src/uxa/intel_dri.c | 60 +------------
> src/uxa/intel_driver.c | 1 -
> src/uxa/intel_uxa.c | 49 -----------
> src/uxa/intel_uxa.h | 1 -
> src/uxa/uxa-accel.c | 230 -------------------------------------------------
> src/uxa/uxa-glamor.h | 65 --------------
> src/uxa/uxa-glyphs.c | 28 ------
> src/uxa/uxa-render.c | 79 -----------------
> src/uxa/uxa.c | 7 --
> src/uxa/uxa.h | 16 ----
> 11 files changed, 2 insertions(+), 543 deletions(-)
> delete mode 100644 src/uxa/uxa-glamor.h
>
> diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am
> index 23b074d..b9618c9 100644
> --- a/src/uxa/Makefile.am
> +++ b/src/uxa/Makefile.am
> @@ -34,7 +34,6 @@ libuxa_la_SOURCES = \
> intel_batchbuffer.h \
> intel_display.c \
> intel_driver.c \
> - intel_glamor.h \
> intel_memory.c \
> intel_uxa.c \
> intel_video.c \
> @@ -65,14 +64,6 @@ libuxa_la_SOURCES = \
> uxa-unaccel.c
> $(NULL)
>
> -if GLAMOR
> -AM_CFLAGS += $(LIBGLAMOR_CFLAGS)
> -libuxa_la_LIBADD += $(LIBGLAMOR_LIBS)
> -libuxa_la_SOURCES += \
> - intel_glamor.c \
> - $(NULL)
> -endif
> -

Something weird happened in this commit.

uxa-glamor.h is removed from the repo, but the makefile only drops
intel_glamor.h, which keeps getting used. I suspect make distcheck is
broken.

intel_glamor.c is no longer built, but USE_GLAMOR might still be defined
I think, and if so intel_glamor_flush() from it is still getting called.

[-- Attachment #1.2: Type: application/pgp-signature, Size: 818 bytes --]

[-- Attachment #2: Type: text/plain, Size: 219 bytes --]

_______________________________________________
xorg-devel-go0+a7rfsptAfugRpC6u6w@public.gmane.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel