From: Eric Anholt Subject: Re: [PATCH 06/12] Remove glamor support from UXA acceleration Date: Wed, 30 Jul 2014 18:42:44 -0700 Message-ID: <87k36ue223.fsf@eliezer.anholt.net> References: <1406243908-1123-1-git-send-email-keithp@keithp.com> <1406243908-1123-7-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0811055303==" Return-path: In-Reply-To: <1406243908-1123-7-git-send-email-keithp-aN4HjG94KOLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xorg-devel-bounces-go0+a7rfsptAfugRpC6u6w@public.gmane.org Sender: "xorg-devel" To: Keith Packard , xorg-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: intel-gfx@lists.freedesktop.org --===============0811055303== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Keith Packard writes: > Makes UXA no longer include calls to glamor acceleration functions. > > Signed-off-by: Keith Packard > --- > 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 =3D \ > 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 =3D \ > uxa-unaccel.c > $(NULL) >=20=20 > -if GLAMOR > -AM_CFLAGS +=3D $(LIBGLAMOR_CFLAGS) > -libuxa_la_LIBADD +=3D $(LIBGLAMOR_LIBS) > -libuxa_la_SOURCES +=3D \ > - 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. --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJT2Z8VAAoJELXWKTbR/J7o21wP/imhh4KiwldWZKUz/FccJM8D 2CpbB9G4yUdtGlOoX6GLY8SiS4LC6W94lXtL6QUMhWrA4lopLlv4wE5j8SjhBQei NdWEEYtqHu5ol+nHo4qimiEDOc9pLSv2lqMK4+R6yBQ6CeuIbQYdrooLSwGoXoJW kdA+JJS/Q5XmeE5G3j8lkmFIQTGeOZLDKwCRcMX2/Yyl5pqLLRKaea5cMp18zPbg P9LDVKA5QsPyzPKLvSq/Zeoow9+SJF8qMQpKpoLntk7sUNxkhRjxpj3XdDhHmRJ3 R81dy58F8A5oEbMLntOie0Ng1DKI3hK+gecFxGwMHYJ14zDYhaAdURW8h9gYIpxa k/eqvSO5zwms37V9AJoE3yJaHmlKixWyeAV76f/Oq4hT8d5AcmRAkFUEpWm8YnZA sNX7q54gco9pg08Q8jyGlNlYnv0rFRbxuVxkgzHhcmpJccAN0/CEyENtv476O32R b7d2Z3koEjnY7Qmts1qNl0pC2pgJh4/4taNy7t48JfAfyUy5vUjPhLOMVdw9LOic NhbaetaEk5jfdDPYsTaC3xxpm/Ze22hxHM6I0FvBpA+6Dq9AIyeKPpCM1ZHmk7nw IHoziSx8FRxmaoe9UqViWgw84PUJ2x5fYI77421EgUm48wTIdkrG+xGxAPbo4NMJ xQ+dTYqTSTQhLnGQPc8S =xf/u -----END PGP SIGNATURE----- --=-=-=-- --===============0811055303== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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 --===============0811055303==--