VERSION | 2 - debian/changelog | 33 ++++++++++++++++++-------- debian/control | 38 ++++++++++++++++++++++--------- debian/libgl1-mesa-dri.install.in | 3 -- debian/libgl1-mesa-dri.install.linux.in | 3 ++ debian/libvdpau1-drivers-mesa.install.in | 1 debian/mesa-opencl-icd.install.in | 2 + debian/mesa-vdpau-drivers.install.in | 1 debian/patches/01_hurd.diff | 20 ---------------- debian/patches/series | 1 debian/rules | 2 + src/glx/dri2_query_renderer.c | 5 ++++ src/mesa/drivers/dri/i965/brw_draw.c | 2 - src/mesa/drivers/dri/i965/brw_program.h | 6 ++-- src/mesa/drivers/dri/i965/brw_tex.c | 2 - 15 files changed, 69 insertions(+), 52 deletions(-)
New commits: commit 8407f6098a4e35eba5def2daae116faab09e3264 Author: Maarten Lankhorst <[email protected]> Date: Thu Mar 13 16:30:51 2014 +0100 release to trusty diff --git a/debian/changelog b/debian/changelog index ab68863..cbaff13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -mesa (10.1.0-1ubuntu1) UNRELEASED; urgency=low +mesa (10.1.0-1ubuntu1) trusty; urgency=medium * Merge from released debian-experimental. * Rename libvdpau1-drivers-mesa to mesa-vdpau-drivers. - This makes ubuntu package names identical to debian. * Disable opencl for now. - -- Maarten Lankhorst <[email protected]> Thu, 13 Mar 2014 13:57:56 +0100 + -- Maarten Lankhorst <[email protected]> Thu, 13 Mar 2014 16:30:35 +0100 mesa (10.1.0-1) experimental; urgency=low commit 0a7a1c90922c962af7876f5f47802b43665bb446 Author: Maarten Lankhorst <[email protected]> Date: Thu Mar 13 14:02:07 2014 +0100 Create changelog and disable opencl. diff --git a/debian/changelog b/debian/changelog index b437db3..ab68863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mesa (10.1.0-1ubuntu1) UNRELEASED; urgency=low + + * Merge from released debian-experimental. + * Rename libvdpau1-drivers-mesa to mesa-vdpau-drivers. + - This makes ubuntu package names identical to debian. + * Disable opencl for now. + + -- Maarten Lankhorst <[email protected]> Thu, 13 Mar 2014 13:57:56 +0100 + mesa (10.1.0-1) experimental; urgency=low [ Andreas Boll ] diff --git a/debian/control b/debian/control index c4ec9cb..0f6633b 100644 --- a/debian/control +++ b/debian/control @@ -43,8 +43,6 @@ Build-Depends: libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libwayland-dev (>= 1.2.0) [linux-any], libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el], - libclang-3.4-dev [linux-any], - libclc-dev [linux-any], Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git Homepage: http://mesa3d.sourceforge.net/ @@ -665,6 +663,10 @@ Provides: vdpau-driver, Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} +Breaks: + libvdpau1-drivers-mesa, +Replaces: + libvdpau1-drivers-mesa, Description: Mesa VDPAU video acceleration drivers These libraries provide the Video Decode and Presentation API for Unix. They provide accelerated video playback (incl. H.264) and video @@ -681,6 +683,10 @@ Depends: ${misc:Depends}, Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} +Breaks: + libvdpau1-drivers-mesa-dbg, +Replaces: + libvdpau1-drivers-mesa-dbg, Description: Debugging symbols for the Mesa VDPAU video acceleration drivers These libraries provide the Video Decode and Presentation API for Unix. They provide accelerated video playback (incl. H.264) and video @@ -688,34 +694,4 @@ Description: Debugging symbols for the Mesa VDPAU video acceleration drivers . This package contains the debugging symbols for the VDPAU drivers. -Package: mesa-opencl-icd -Section: libs -Architecture: linux-any -Depends: - libclc-r600, - ocl-icd-libopencl1, - ${shlibs:Depends}, - ${misc:Depends}, -Provides: opencl-icd -Description: free implementation of the OpenCL API -- ICD runtime - This package contains the mesa implementation of the OpenCL (Open Compute - Language) library, which is intended for use with an ICD loader. OpenCL - provides a standardized interface for computational analysis on graphical - processing units. - -Package: mesa-opencl-icd-dbg -Section: debug -Priority: extra -Architecture: linux-any -Depends: - mesa-opencl-icd (= ${binary:Version}), - ${misc:Depends}, -Description: free implementation of the OpenCL API -- debugging symbols - This package contains the mesa implementation of the OpenCL (Open Compute - Language) library, which is intended for use with an ICD loader. OpenCL - provides a standardized interface for computational analysis on graphical - processing units. - . - This package contains the debugging symbols for the mesa OpenCL ICD library. - # vim: tw=0 diff --git a/debian/rules b/debian/rules index 8bebe44..8291b5c 100755 --- a/debian/rules +++ b/debian/rules @@ -76,9 +76,6 @@ else EGL_DISPLAYS += mir endif -# < aboll> opencl needs gallium-pipe-loader which needs udev -# so no opencl for kbsd - confflags_GALLIUM += --enable-opencl --enable-opencl-icd ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x)) DRI_DRIVERS += nouveau endif commit 0260251c1e4ea26e6bf6d597cef90fafae422ee4 Author: Julien Cristau <[email protected]> Date: Fri Mar 7 22:40:23 2014 +0100 Upload to experimental diff --git a/debian/changelog b/debian/changelog index a78dd52..c34f774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (10.1.0-1) UNRELEASED; urgency=low +mesa (10.1.0-1) experimental; urgency=low [ Andreas Boll ] * Disable dri3 on !linux @@ -10,7 +10,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low [ Sven Joachim ] * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri. - -- Andreas Boll <[email protected]> Mon, 03 Mar 2014 12:39:45 +0100 + -- Julien Cristau <[email protected]> Fri, 07 Mar 2014 22:16:32 +0100 mesa (10.1.0~rc2-1) experimental; urgency=medium commit 7f57081a8e1e7152f1480eccb60cffdf1c1c3e83 Author: Julien Cristau <[email protected]> Date: Fri Mar 7 22:16:20 2014 +0100 Disable opencl on kfreebsd per aboll diff --git a/debian/control b/debian/control index c280496..ed08431 100644 --- a/debian/control +++ b/debian/control @@ -41,8 +41,8 @@ Build-Depends: llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libwayland-dev (>= 1.2.0) [linux-any], - libclang-3.4-dev [linux-any kfreebsd-any], - libclc-dev [linux-any kfreebsd-any], + libclang-3.4-dev [linux-any], + libclc-dev [linux-any], Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git Homepage: http://mesa3d.sourceforge.net/ @@ -789,7 +789,7 @@ Description: Debugging symbols for the Mesa VDPAU video acceleration drivers Package: mesa-opencl-icd Section: libs -Architecture: linux-any kfreebsd-any +Architecture: linux-any Depends: libclc-r600, ocl-icd-libopencl1, @@ -805,7 +805,7 @@ Description: free implementation of the OpenCL API -- ICD runtime Package: mesa-opencl-icd-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: linux-any Depends: mesa-opencl-icd (= ${binary:Version}), ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 4dac588..481ea7a 100755 --- a/debian/rules +++ b/debian/rules @@ -70,6 +70,9 @@ else EGL_DISPLAYS += drm # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet: EGL_DISPLAYS += wayland +# < aboll> opencl needs gallium-pipe-loader which needs udev +# so no opencl for kbsd + confflags_GALLIUM += --enable-opencl --enable-opencl-icd ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x)) DRI_DRIVERS += nouveau endif @@ -106,7 +109,6 @@ else confflags_DIRECT_RENDERING = --enable-driglx-direct confflags_OPENVG = --enable-openvg --enable-gallium-egl confflags_GALLIUM += --enable-vdpau - confflags_GALLIUM += --enable-opencl --enable-opencl-icd endif confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GLES = --enable-gles1 --enable-gles2 commit d637474b442df21f6e2b5bf4d642bf3649b1a23c Author: Julian Wollrath <[email protected]> Date: Wed Mar 5 19:14:58 2014 +0100 Bug#717500: [PATCH] Enable OpenCL support v2: Add "Provides: opencl-icd" v3: Andreas Boll <[email protected]> - Add "Priority: extra" to debug package - Enable build on kfreebsd - Rename package to mesa-opencl-icd - Fix rules/confflags to disable building on hurd Signed-off-by: Andreas Boll <[email protected]> diff --git a/debian/control b/debian/control index c49cd58..c280496 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,8 @@ Build-Depends: llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libwayland-dev (>= 1.2.0) [linux-any], + libclang-3.4-dev [linux-any kfreebsd-any], + libclc-dev [linux-any kfreebsd-any], Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git Homepage: http://mesa3d.sourceforge.net/ @@ -785,4 +787,34 @@ Description: Debugging symbols for the Mesa VDPAU video acceleration drivers . This package contains the debugging symbols for the VDPAU drivers. +Package: mesa-opencl-icd +Section: libs +Architecture: linux-any kfreebsd-any +Depends: + libclc-r600, + ocl-icd-libopencl1, + ${shlibs:Depends}, + ${misc:Depends}, +Provides: opencl-icd +Description: free implementation of the OpenCL API -- ICD runtime + This package contains the mesa implementation of the OpenCL (Open Compute + Language) library, which is intended for use with an ICD loader. OpenCL + provides a standardized interface for computational analysis on graphical + processing units. + +Package: mesa-opencl-icd-dbg +Section: debug +Priority: extra +Architecture: linux-any kfreebsd-any +Depends: + mesa-opencl-icd (= ${binary:Version}), + ${misc:Depends}, +Description: free implementation of the OpenCL API -- debugging symbols + This package contains the mesa implementation of the OpenCL (Open Compute + Language) library, which is intended for use with an ICD loader. OpenCL + provides a standardized interface for computational analysis on graphical + processing units. + . + This package contains the debugging symbols for the mesa OpenCL ICD library. + # vim: tw=0 diff --git a/debian/mesa-opencl-icd.install.in b/debian/mesa-opencl-icd.install.in new file mode 100644 index 0000000..867081c --- /dev/null +++ b/debian/mesa-opencl-icd.install.in @@ -0,0 +1,2 @@ +dri/etc/OpenCL/vendors/mesa.icd etc/OpenCL/vendors +dri/usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* usr/lib/${DEB_HOST_MULTIARCH} diff --git a/debian/rules b/debian/rules index 2ba8af0..4dac588 100755 --- a/debian/rules +++ b/debian/rules @@ -106,6 +106,7 @@ else confflags_DIRECT_RENDERING = --enable-driglx-direct confflags_OPENVG = --enable-openvg --enable-gallium-egl confflags_GALLIUM += --enable-vdpau + confflags_GALLIUM += --enable-opencl --enable-opencl-icd endif confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GLES = --enable-gles1 --enable-gles2 commit b174eca4067c9106779124b0f815e869ed750b0c Author: Andreas Boll <[email protected]> Date: Thu Mar 6 11:37:29 2014 +0100 Next attempt to fix FTBFS on hurd diff --git a/debian/changelog b/debian/changelog index 8752e83..a78dd52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low * Enable building drivers for libvdpau1 (Closes: #705558). * New upstream release. * Drop 01-hurd.diff, upstream in 10.1.0. + * Next attempt to fix FTBFS on hurd [ Sven Joachim ] * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri. diff --git a/debian/libgl1-mesa-dri.install.hurd.in b/debian/libgl1-mesa-dri.install.hurd.in deleted file mode 100644 index e69de29..0000000 diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in deleted file mode 100644 index 211578e..0000000 --- a/debian/libgl1-mesa-dri.install.in +++ /dev/null @@ -1,2 +0,0 @@ -dri/etc/drirc etc -dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in new file mode 100644 index 0000000..211578e --- /dev/null +++ b/debian/libgl1-mesa-dri.install.linux.in @@ -0,0 +1,2 @@ +dri/etc/drirc etc +dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe commit 4cccc9e94de790cc1c345e2bd01dd148d56e5cd4 Author: Sven Joachim <[email protected]> Date: Wed Mar 5 21:27:08 2014 +0100 Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri This was only necessary due to egl_gallium.so being linked against libllvmradeon, and there is no shared llvmradeon library anymore. diff --git a/debian/changelog b/debian/changelog index 374ead5..8752e83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ mesa (10.1.0-1) UNRELEASED; urgency=low * New upstream release. * Drop 01-hurd.diff, upstream in 10.1.0. + [ Sven Joachim ] + * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri. + -- Andreas Boll <[email protected]> Mon, 03 Mar 2014 12:39:45 +0100 mesa (10.1.0~rc2-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 7c760e2..c49cd58 100644 --- a/debian/control +++ b/debian/control @@ -320,8 +320,6 @@ Depends: ${misc:Depends}, libegl1-mesa (= ${binary:Version}), libglapi-mesa (= ${binary:Version}), -# for libllvmradeon - libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64], Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: free implementation of the EGL API -- hardware drivers commit 03bd5fad9c04a141fde04aa90495d3a3eb29bb1a Author: Andreas Boll <[email protected]> Date: Wed Mar 5 18:46:26 2014 +0100 Fix typo diff --git a/debian/control b/debian/control index c63e630..7c760e2 100644 --- a/debian/control +++ b/debian/control @@ -776,7 +776,7 @@ Section: debug Priority: extra Architecture: linux-any kfreebsd-any Depends: - libvdpau1-mesa-drivers (= ${binary:Version}), + mesa-vdpau-drivers (= ${binary:Version}), ${misc:Depends}, Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} commit 6a6e73d41c653a96c26fcefb92f4ba7f595e6fdc Author: Andreas Boll <[email protected]> Date: Wed Mar 5 17:34:52 2014 +0100 Drop 01-hurd.diff, upstream in 10.1.0 diff --git a/debian/changelog b/debian/changelog index 9e834a0..374ead5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low * Disable dri3 on !linux * Enable building drivers for libvdpau1 (Closes: #705558). * New upstream release. + * Drop 01-hurd.diff, upstream in 10.1.0. -- Andreas Boll <[email protected]> Mon, 03 Mar 2014 12:39:45 +0100 diff --git a/debian/patches/01_hurd.diff b/debian/patches/01_hurd.diff deleted file mode 100644 index 5d64cdf..0000000 --- a/debian/patches/01_hurd.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c -index b50a202..95560cb 100644 ---- a/src/glx/dri2_query_renderer.c -+++ b/src/glx/dri2_query_renderer.c -@@ -20,6 +20,9 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+ -+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) -+ - #include "glxclient.h" - #include "glx_error.h" - #include "xf86drm.h" -@@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, - - return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value); - } -+ -+#endif /* GLX_DIRECT_RENDERING */ diff --git a/debian/patches/series b/debian/patches/series index 148b20f..bc8e424 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01_hurd.diff 02_gbm_no_undefined.diff 03_gbm_make_devices_static.diff 04_osmesa_version.diff commit 0829918fc0a1ffda46674ab03c0fd4484219d8c8 Author: Andreas Boll <[email protected]> Date: Wed Mar 5 17:30:54 2014 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 426da55..9e834a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ -mesa (10.1.0~rc3-1) UNRELEASED; urgency=medium +mesa (10.1.0-1) UNRELEASED; urgency=low [ Andreas Boll ] * Disable dri3 on !linux * Enable building drivers for libvdpau1 (Closes: #705558). - - [ Maarten Lankhorst ] * New upstream release. -- Andreas Boll <[email protected]> Mon, 03 Mar 2014 12:39:45 +0100 commit 4a86465f4754a0d79ed98f2d1ce425864854418b Author: Ian Romanick <[email protected]> Date: Wed Mar 5 08:59:46 2014 +0200 mesa: Bump version to 10.1 (final) Signed-off-by: Ian Romanick <[email protected]> diff --git a/VERSION b/VERSION index 4b9caf0..4149c39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.1.0-rc3 +10.1.0 commit 03d0c9fd308db2124efbe240eda24a2a67eb67d2 Author: Julien Cristau <[email protected]> Date: Sat Mar 1 10:11:11 2014 +0100 glx/dri2: fix build failure on HURD Patch from Debian package. Cc: "10.0 10.1" <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 6f0e2731e862d1c2d8d21927040bead5049a2d68) diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c index b50a202..95560cb 100644 --- a/src/glx/dri2_query_renderer.c +++ b/src/glx/dri2_query_renderer.c @@ -20,6 +20,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) + #include "glxclient.h" #include "glx_error.h" #include "xf86drm.h" @@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value); } + +#endif /* GLX_DIRECT_RENDERING */ commit 53bb4371dfab2fb5c0b77415ea685608598fa229 Author: Andreas Boll <[email protected]> Date: Mon Mar 3 17:47:31 2014 +0100 Enable building drivers for libvdpau1 Based on patches from Maarten Lankhorst <[email protected]> diff --git a/debian/changelog b/debian/changelog index f751601..426da55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mesa (10.1.0~rc3-1) UNRELEASED; urgency=medium [ Andreas Boll ] * Disable dri3 on !linux + * Enable building drivers for libvdpau1 (Closes: #705558). [ Maarten Lankhorst ] * New upstream release. diff --git a/debian/control b/debian/control index 16ca5cf..c63e630 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: libxfixes-dev, libxdamage-dev, libxext-dev, + libvdpau-dev [linux-any kfreebsd-any], autoconf, automake, libtool, @@ -750,4 +751,40 @@ Description: Mesa Off-screen rendering extension -- development files . For more information on OSmesa see the libosmesa6 package. +Package: mesa-vdpau-drivers +Section: libs +Architecture: linux-any kfreebsd-any +Depends: + libvdpau1, + ${shlibs:Depends}, + ${misc:Depends}, +Enhances: + libvdpau1, +Provides: + vdpau-driver, +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Description: Mesa VDPAU video acceleration drivers + These libraries provide the Video Decode and Presentation API for Unix. + They provide accelerated video playback (incl. H.264) and video + post-processing for the supported graphics cards. + . + This package enables support for VDPAU for some gallium drivers. + +Package: mesa-vdpau-drivers-dbg +Section: debug +Priority: extra +Architecture: linux-any kfreebsd-any +Depends: + libvdpau1-mesa-drivers (= ${binary:Version}), + ${misc:Depends}, +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Description: Debugging symbols for the Mesa VDPAU video acceleration drivers + These libraries provide the Video Decode and Presentation API for Unix. + They provide accelerated video playback (incl. H.264) and video + post-processing for the supported graphics cards. + . + This package contains the debugging symbols for the VDPAU drivers. + # vim: tw=0 diff --git a/debian/mesa-vdpau-drivers.install.in b/debian/mesa-vdpau-drivers.install.in new file mode 100644 index 0000000..50c703c --- /dev/null +++ b/debian/mesa-vdpau-drivers.install.in @@ -0,0 +1 @@ +dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so* usr/lib/${DEB_HOST_MULTIARCH}/vdpau/ diff --git a/debian/rules b/debian/rules index b148e5f..2ba8af0 100755 --- a/debian/rules +++ b/debian/rules @@ -105,6 +105,7 @@ else confflags_DIRECT_RENDERING = --enable-driglx-direct confflags_OPENVG = --enable-openvg --enable-gallium-egl + confflags_GALLIUM += --enable-vdpau endif confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GLES = --enable-gles1 --enable-gles2 @@ -120,7 +121,7 @@ confflags-dri = \ --enable-shared-glapi \ --enable-texture-float \ --enable-xa \ - --disable-xvmc --disable-vdpau \ + --disable-xvmc \ $(confflags_DIRECT_RENDERING) \ $(confflags_DRI3) \ $(confflags_EGL) \ commit 4c0702b05ca002e42dbf05c6c4451113df0c3799 Author: Chris Forbes <[email protected]> Date: Sat Feb 22 18:09:31 2014 +1300 i965: Validate (and resolve) all the bound textures. BRW_MAX_TEX_UNIT is the static limit on the number of textures we support per-stage, not in total. Core's `Unit` array is sized by MAX_COMBINED_TEXTURE_IMAGE_UNITS, which is significantly larger, and across the various shader stages, up to ctx->Const.MaxCombinedTextureImageUnits elements of it may be actually used. Fixes invisible bad behavior in piglit's max-samplers test (although this escalated to an assertion failure on HSW with texture_view, since non-immutable textures only have _Format set by validation.) Signed-off-by: Chris Forbes <[email protected]> Cc: "9.2 10.0 10.1" <[email protected]> Cc: Kenneth Graunke <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit befbda56a246f77797bdf13fc005353441db2879) diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 39da953..1e018bb 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -326,7 +326,7 @@ brw_predraw_resolve_buffers(struct brw_context *brw) /* Resolve depth buffer of each enabled depth texture, and color buffer of * each fast-clear-enabled color texture. */ - for (int i = 0; i < BRW_MAX_TEX_UNIT; i++) { + for (int i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) { if (!ctx->Texture.Unit[i]._ReallyEnabled) continue; tex_obj = intel_texture_object(ctx->Texture.Unit[i]._Current); diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c index 9234e3a..b1f4de0 100644 --- a/src/mesa/drivers/dri/i965/brw_tex.c +++ b/src/mesa/drivers/dri/i965/brw_tex.c @@ -47,7 +47,7 @@ void brw_validate_textures( struct brw_context *brw ) struct gl_context *ctx = &brw->ctx; int i; - for (i = 0; i < BRW_MAX_TEX_UNIT; i++) { + for (i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; if (texUnit->_ReallyEnabled) { commit 5fbd6494517be0bc2f2ead4d6966776fcb0d426d Author: Chris Forbes <[email protected]> Date: Thu Feb 27 07:28:05 2014 +1300 i965: Widen sampler key bitfields for 32 samplers Previously the `high` 16 samplers on Haswell+ would not get sampler workarounds applied. Don't bother widening YUV fields, since they're ignored and going away soon anyway. Signed-off-by: Chris Forbes <[email protected]> Cc: "10.1" <[email protected]> Cc: Kenneth Graunke <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4) diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index 51182ea..f4dedf8 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -33,7 +33,7 @@ struct brw_sampler_prog_key_data { */ uint16_t swizzles[MAX_SAMPLERS]; - uint16_t gl_clamp_mask[3]; + uint32_t gl_clamp_mask[3]; /** * YUV conversions, needed for the GL_MESA_ycbcr extension. @@ -44,12 +44,12 @@ struct brw_sampler_prog_key_data { /** * For RG32F, gather4's channel select is broken. */ - uint16_t gather_channel_quirk_mask; + uint32_t gather_channel_quirk_mask; /** * Whether this sampler uses the compressed multisample surface layout. */ - uint16_t compressed_multisample_layout_mask; + uint32_t compressed_multisample_layout_mask; }; #ifdef __cplusplus -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
