mesa: Changes to 'ubuntu'
Makefile | 6
debian/changelog | 12
debian/control | 2
debian/patches/105_use_shared_libdricore.patch | 50 -
debian/patches/114_update_for_2.4.24_nouveau_headers.diff | 85 --
debian/patches/series | 1
docs/download.html | 83 --
docs/install.html | 104 --
docs/news.html | 20
docs/relnotes-7.10.1.html | 9
docs/relnotes-7.10.2.html | 206 +++++
docs/relnotes-7.9.2.html | 336 ++++++++
docs/relnotes.html | 3
src/gallium/drivers/r300/r300_emit.c | 5
src/gallium/drivers/r300/r300_screen.c | 4
src/gallium/drivers/r600/r600.h | 3
src/gallium/state_trackers/dri/common/dri_context.c | 8
src/gallium/winsys/r600/drm/evergreen_hw_context.c | 5
src/gallium/winsys/r600/drm/r600_drm.c | 25
src/gallium/winsys/r600/drm/r600_hw_context.c | 48 -
src/gallium/winsys/r600/drm/r600_priv.h | 3
src/gallium/winsys/r600/drm/radeon_bo.c | 4
src/gallium/winsys/r600/drm/radeon_pciid.c | 2
src/glsl/ast_to_hir.cpp | 486 ++++++------
src/glsl/glcpp/glcpp-lex.c | 514 +++++--------
src/glsl/glcpp/glcpp-lex.l | 49 -
src/glsl/ir_validate.cpp | 33
src/glsl/link_functions.cpp | 8
src/glsl/opt_function_inlining.cpp | 7
src/mesa/drivers/dri/i965/brw_fs.cpp | 19
src/mesa/drivers/dri/i965/brw_vs_state.c | 9
src/mesa/drivers/dri/i965/brw_wm.c | 4
src/mesa/drivers/dri/i965/brw_wm.h | 1
src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c | 6
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c | 18
src/mesa/drivers/dri/r300/compiler/r500_fragprog.c | 6
src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c | 5
src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 3
src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c | 13
src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h | 2
src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c | 128 +--
src/mesa/drivers/dri/radeon/radeon_chipset.h | 2
src/mesa/drivers/dri/radeon/radeon_screen.c | 2
src/mesa/main/fbobject.c | 2
src/mesa/main/get.c | 14
src/mesa/main/texgetimage.c | 3
src/mesa/main/version.h | 4
src/mesa/program/prog_optimize.c | 17
src/mesa/state_tracker/st_atom_sampler.c | 3
src/mesa/state_tracker/st_cb_blit.c | 3
src/mesa/state_tracker/st_cb_clear.c | 16
src/mesa/state_tracker/st_cb_fbo.c | 4
src/mesa/state_tracker/st_draw.c | 8
53 files changed, 1459 insertions(+), 954 deletions(-)
New commits:
commit 8a260092bb8c9acd1c6871acf2e849e687ffd79a
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Apr 11 15:34:30 2011 +1000
Release to natty
diff --git a/debian/changelog b/debian/changelog
index e78a3b4..7a802ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.2-0ubuntu1) UNRELEASED; urgency=low
+mesa (7.10.2-0ubuntu1) natty; urgency=low
[ Steve Langasek ]
* Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}: the
commit 01bc258f2a5fbb60b3e842636af415b66c72cee1
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Apr 11 15:18:07 2011 +1000
Close KWin crash bug from the changelog
diff --git a/debian/changelog b/debian/changelog
index 37af0d8..e78a3b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (7.10.2-0ubuntu1) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* New upstream bugfix release.
+ - Contains fix for KWin crash when enabling effects on r600 (LP: #738687)
* debian/patches/105_use_shared_libdricore.patch: Fix rpath for i386
libraries installed on amd64 via ia32-libs. (LP: #755720)
commit cb9735e2c560d9454424ec6f4b43f494e3dbdcf6
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Apr 11 15:07:00 2011 +1000
Fix rpath for dri drivers in ia32-libs
diff --git a/debian/changelog b/debian/changelog
index de33b64..37af0d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mesa (7.10.2-0ubuntu1) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* New upstream bugfix release.
+ * debian/patches/105_use_shared_libdricore.patch: Fix rpath for i386
+ libraries installed on amd64 via ia32-libs. (LP: #755720)
-- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 11 Apr 2011 10:10:35 +1000
diff --git a/debian/patches/105_use_shared_libdricore.patch b/debian/patches/105_use_shared_libdricore.patch
index 48bca3d..6c6e4d0 100644
--- a/debian/patches/105_use_shared_libdricore.patch
+++ b/debian/patches/105_use_shared_libdricore.patch
@@ -13,8 +13,8 @@ Date: Wed Nov 17 14:28:34 2010 +1100
Index: mesa/configs/autoconf.in
===================================================================
---- mesa.orig/configs/autoconf.in 2011-02-15 16:11:30.000000000 +1100
-+++ mesa/configs/autoconf.in 2011-02-16 10:20:03.222410207 +1100
+--- mesa.orig/configs/autoconf.in 2011-04-11 11:17:43.692242067 +1000
++++ mesa/configs/autoconf.in 2011-04-11 11:18:11.463257267 +1000
@@ -33,6 +33,8 @@
LLVM_LIBS = @LLVM_LIBS@
GLW_CFLAGS = @GLW_CFLAGS@
@@ -46,8 +46,8 @@ Index: mesa/configs/autoconf.in
LIBDRM_LIB = @LIBDRM_LIBS@
Index: mesa/configs/default
===================================================================
---- mesa.orig/configs/default 2011-02-15 16:11:30.000000000 +1100
-+++ mesa/configs/default 2011-02-16 10:20:03.222410207 +1100
+--- mesa.orig/configs/default 2011-04-11 11:17:43.722243160 +1000
++++ mesa/configs/default 2011-04-11 11:18:11.463257267 +1000
@@ -82,6 +82,9 @@
GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
VG_LIB_GLOB = $(VG_LIB_NAME)*
@@ -60,8 +60,8 @@ Index: mesa/configs/default
Index: mesa/configs/freebsd-dri
===================================================================
---- mesa.orig/configs/freebsd-dri 2011-02-15 15:14:26.000000000 +1100
-+++ mesa/configs/freebsd-dri 2011-02-16 10:20:03.222410207 +1100
+--- mesa.orig/configs/freebsd-dri 2011-04-11 11:17:43.702242435 +1000
++++ mesa/configs/freebsd-dri 2011-04-11 11:18:11.463257267 +1000
@@ -30,9 +30,11 @@
MESA_ASM_SOURCES =
@@ -77,8 +77,8 @@ Index: mesa/configs/freebsd-dri
Index: mesa/configs/linux-dri
===================================================================
---- mesa.orig/configs/linux-dri 2011-02-15 16:11:30.000000000 +1100
-+++ mesa/configs/linux-dri 2011-02-16 10:21:12.872512371 +1100
+--- mesa.orig/configs/linux-dri 2011-04-11 11:17:43.662240971 +1000
++++ mesa/configs/linux-dri 2011-04-11 11:18:11.473257629 +1000
@@ -43,9 +43,11 @@
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
@@ -94,8 +94,8 @@ Index: mesa/configs/linux-dri
Index: mesa/configs/linux-dri-xcb
===================================================================
---- mesa.orig/configs/linux-dri-xcb 2011-02-15 15:14:26.000000000 +1100
-+++ mesa/configs/linux-dri-xcb 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/configs/linux-dri-xcb 2011-04-11 11:17:43.682241704 +1000
++++ mesa/configs/linux-dri-xcb 2011-04-11 11:18:11.473257629 +1000
@@ -41,9 +41,11 @@
# Library/program dependencies
EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)
@@ -111,8 +111,8 @@ Index: mesa/configs/linux-dri-xcb
Index: mesa/configs/linux-egl
===================================================================
---- mesa.orig/configs/linux-egl 2011-02-15 15:14:26.000000000 +1100
-+++ mesa/configs/linux-egl 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/configs/linux-egl 2011-04-11 11:17:43.732243530 +1000
++++ mesa/configs/linux-egl 2011-04-11 11:18:11.473257629 +1000
@@ -38,9 +38,11 @@
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
@@ -128,8 +128,8 @@ Index: mesa/configs/linux-egl
$(LIBDRM_LIB)
Index: mesa/configs/linux-indirect
===================================================================
---- mesa.orig/configs/linux-indirect 2011-02-15 15:14:26.000000000 +1100
-+++ mesa/configs/linux-indirect 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/configs/linux-indirect 2011-04-11 11:17:43.742243890 +1000
++++ mesa/configs/linux-indirect 2011-04-11 11:18:11.473257629 +1000
@@ -42,7 +42,8 @@
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
@@ -142,8 +142,8 @@ Index: mesa/configs/linux-indirect
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-02-16 10:18:03.000000000 +1100
-+++ mesa/configure.ac 2011-02-16 10:23:12.322687577 +1100
+--- mesa.orig/configure.ac 2011-04-11 11:18:08.543150386 +1000
++++ mesa/configure.ac 2011-04-11 11:20:12.507714770 +1000
@@ -801,6 +801,34 @@
AC_SUBST([GLESv2_PC_LIB_PRIV])
@@ -158,7 +158,7 @@ Index: mesa/configure.ac
+ DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
+ DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
+ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
-+ DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
++ DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,--rpath=$(DRI_DRIVER_SEARCH_DIR) -ldricore -lglsl'
+ DRI_CFLAGS='$(filter-out -fvisibility=hidden,$(CFLAGS)) -DUSE_DRICORE'
+ DRI_CXXFLAGS='$(filter-out -fvisibility=hidden,$(CXXFLAGS)) -DUSE_DRICORE'
+ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
@@ -192,8 +192,8 @@ Index: mesa/configure.ac
AC_SUBST([EXPAT_INCLUDES])
Index: mesa/src/glsl/Makefile
===================================================================
---- mesa.orig/src/glsl/Makefile 2011-02-15 16:11:30.000000000 +1100
-+++ mesa/src/glsl/Makefile 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/src/glsl/Makefile 2011-04-11 11:17:43.652240611 +1000
++++ mesa/src/glsl/Makefile 2011-04-11 11:18:11.473257629 +1000
@@ -112,6 +112,9 @@
$(C_SOURCES:.c=.o) \
$(CXX_SOURCES:.cpp=.o)
@@ -237,8 +237,8 @@ Index: mesa/src/glsl/Makefile
Index: mesa/src/mesa/Makefile
===================================================================
---- mesa.orig/src/mesa/Makefile 2011-02-15 16:11:30.000000000 +1100
-+++ mesa/src/mesa/Makefile 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/src/mesa/Makefile 2011-04-11 11:17:43.592238416 +1000
++++ mesa/src/mesa/Makefile 2011-04-11 11:18:11.473257629 +1000
@@ -15,6 +15,7 @@
MESA_OBJ_DIR := .
ES1_OBJ_DIR := objs-es1
@@ -383,8 +383,8 @@ Index: mesa/src/mesa/Makefile
-rm -f depend depend.bak libmesa.a libmesagallium.a
Index: mesa/src/mesa/drivers/dri/Makefile.template
===================================================================
---- mesa.orig/src/mesa/drivers/dri/Makefile.template 2011-02-15 15:14:27.254277714 +1100
-+++ mesa/src/mesa/drivers/dri/Makefile.template 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/src/mesa/drivers/dri/Makefile.template 2011-04-11 11:17:43.622239515 +1000
++++ mesa/src/mesa/drivers/dri/Makefile.template 2011-04-11 11:18:11.473257629 +1000
@@ -1,7 +1,5 @@
# -*-makefile-*-
@@ -425,8 +425,8 @@ Index: mesa/src/mesa/drivers/dri/Makefile.template
mv -f $@.tmp $@
Index: mesa/src/mesa/x86/read_rgba_span_x86.S
===================================================================
---- mesa.orig/src/mesa/x86/read_rgba_span_x86.S 2011-02-03 11:33:56.000000000 +1100
-+++ mesa/src/mesa/x86/read_rgba_span_x86.S 2011-02-16 10:20:03.232410237 +1100
+--- mesa.orig/src/mesa/x86/read_rgba_span_x86.S 2011-04-11 11:17:43.602238784 +1000
++++ mesa/src/mesa/x86/read_rgba_span_x86.S 2011-04-11 11:18:11.473257629 +1000
@@ -77,7 +77,9 @@
*/
commit 43f6aba02bff0cfbaaa0853b21ae45a3f8cf74c7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Apr 11 10:12:08 2011 +1000
Drop libdrm 2.4.24 patch; it looks like we won't want 2.4.24
diff --git a/debian/changelog b/debian/changelog
index e1c32ff..de33b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.1-0ubuntu4) UNRELEASED; urgency=low
+mesa (7.10.2-0ubuntu1) UNRELEASED; urgency=low
[ Steve Langasek ]
* Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}: the
@@ -7,12 +7,9 @@ mesa (7.10.1-0ubuntu4) UNRELEASED; urgency=low
DEB_BUILD_ARCH.
[ Christopher James Halse Rogers ]
- * debian/patches/114_update_for_2.4.24_nouveau_headers.diff:
- - Cherry-pick from upstream to follow headers renamed in libdrm 2.4.24
- * debian/control:
- - Build-depend on libdrm 2.4.24
+ * New upstream bugfix release.
- -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 04 Apr 2011 19:10:45 +1000
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 11 Apr 2011 10:10:35 +1000
mesa (7.10.1-0ubuntu3) natty; urgency=low
diff --git a/debian/control b/debian/control
index 4a2c36c..12c1f8f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
- libdrm-dev (>= 2.4.24) [!hurd-i386], libx11-dev, xutils-dev,
+ libdrm-dev (>= 2.4.23) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
libexpat1-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
diff --git a/debian/patches/114_update_for_2.4.24_nouveau_headers.diff b/debian/patches/114_update_for_2.4.24_nouveau_headers.diff
deleted file mode 100644
index 7f57e69..0000000
--- a/debian/patches/114_update_for_2.4.24_nouveau_headers.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-commit 5c102dd94f435e97507213fbd128e50dd15f5f54
-Author: Ben Skeggs <bskeggs@redhat.com>
-Date: Mon Dec 20 13:39:36 2010 +1000
-
- nouveau: fix includes for latest libdrm
-
- Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-
-diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
-index ab480ca..747b084 100644
---- a/src/gallium/drivers/nouveau/nouveau_winsys.h
-+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
-@@ -10,7 +10,7 @@
- #include "nouveau/nouveau_grobj.h"
- #include "nouveau/nouveau_notifier.h"
- #include "nouveau/nouveau_resource.h"
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
-
- #ifndef NV04_PFIFO_MAX_PACKET_LEN
- #define NV04_PFIFO_MAX_PACKET_LEN 2047
-diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
-index ce48022..a99df76 100644
---- a/src/gallium/drivers/nv50/nv50_surface.c
-+++ b/src/gallium/drivers/nv50/nv50_surface.c
-@@ -22,7 +22,7 @@
-
- #define __NOUVEAU_PUSH_H__
- #include <stdint.h>
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
- #include "nv50_context.h"
- #include "nv50_resource.h"
- #include "pipe/p_defines.h"
-diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
-index e0e65e7..e2fadd3 100644
---- a/src/gallium/drivers/nvfx/nv04_2d.c
-+++ b/src/gallium/drivers/nvfx/nv04_2d.c
-@@ -34,11 +34,11 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <nouveau/nouveau_device.h>
--#include <nouveau/nouveau_pushbuf.h>
- #include <nouveau/nouveau_channel.h>
- #include <nouveau/nouveau_bo.h>
- #include <nouveau/nouveau_notifier.h>
- #include <nouveau/nouveau_grobj.h>
-+#include <nouveau/nv04_pushbuf.h>
- #include "nv04_2d.h"
-
- #include "nouveau/nv_object.xml.h"
-diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
-index 597664e..339b317 100644
---- a/src/gallium/drivers/nvfx/nvfx_vbo.c
-+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
-@@ -9,8 +9,7 @@
- #include "nvfx_resource.h"
-
- #include "nouveau/nouveau_channel.h"
--
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
-
- static inline unsigned
- util_guess_unique_indices_count(unsigned mode, unsigned indices)
-diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-index 8036b18..c5ac128 100644
---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-@@ -38,7 +38,6 @@
- #include <assert.h>
-
- #include "nouveau_device.h"
--#include "nouveau_pushbuf.h"
- #include "nouveau_grobj.h"
- #include "nouveau_channel.h"
- #include "nouveau_bo.h"
-@@ -46,6 +45,7 @@
- #include "nouveau_screen.h"
- #include "nouveau_state.h"
- #include "nouveau_surface.h"
-+#include "nv04_pushbuf.h"
-
- #define DRIVER_DATE "20091015"
- #define DRIVER_AUTHOR "Nouveau"
diff --git a/debian/patches/series b/debian/patches/series
index dd26b51..2ef13f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@
111_export_searchdirs_in_dripc.diff
112_fix_segfault_on_nvAF.diff
113_fix_tls.diff
-114_update_for_2.4.24_nouveau_headers.diff
commit 1fb1012bf124b524b0e8cf741fdcec3ed74a25c3
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 6 13:44:29 2011 -0700
docs: Add 7.10.2 md5sums
diff --git a/docs/relnotes-7.10.2.html b/docs/relnotes-7.10.2.html
index 0e2eb0d..55b6794 100644
--- a/docs/relnotes-7.10.2.html
+++ b/docs/relnotes-7.10.2.html
@@ -10,7 +10,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.10.2 Release Notes / TBD</H1>
+<H1>Mesa 7.10.2 Release Notes / April 6, 2011</H1>
<p>
Mesa 7.10.2 is a bug fix release which fixes bugs found since the 7.10 release.
@@ -28,7 +28,12 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2>
<pre>
-TBD
+2f9f444265534a2cfd9a99d1a8291089 MesaLib-7.10.2.tar.gz
+f5de82852f1243f42cc004039e10b771 MesaLib-7.10.2.tar.bz2
+47836e37bab6fcafe3ac90c9544ba0e9 MesaLib-7.10.2.zip
+175120325828f313621cc5bc6c504803 MesaGLUT-7.10.2.tar.gz
+8c71d273f5f8d6c5eda4ffc39e0fe03e MesaGLUT-7.10.2.tar.bz2
+03036c8efe7b791a90fa0f2c41b43f43 MesaGLUT-7.10.2.zip
</pre>
commit b0866f6cfdfcaf23686b1ae2a99627d468196db2
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 6 13:41:43 2011 -0700
docs: update news.html with 7.10.2 release
diff --git a/docs/news.html b/docs/news.html
index 97d5bfa..6791f98 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,13 @@
<H1>News</H1>
+<h2>April 6, 2011</h2>
+
+<p>
+<a href="relnotes-7.10.2.html">Mesa 7.10.2</a> is released. This is a bug
+fix release release.
+</p>
+
<h2>March 2, 2011</h2>
<p>
commit c6a68814b43569e67c3520671e887bcde3f9f62b
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 6 13:32:09 2011 -0700
docs: Add change log to 7.10.2 release notes
diff --git a/docs/relnotes-7.10.2.html b/docs/relnotes-7.10.2.html
index fa556a8..0e2eb0d 100644
--- a/docs/relnotes-7.10.2.html
+++ b/docs/relnotes-7.10.2.html
@@ -74,8 +74,128 @@ TBD
<p>The full set of changes can be viewed by using the following GIT command:</p>
<pre>
- git log mesa-7.10.1..origin/7.10
+ git log mesa-7.10.1..mesa-7.10.2
</pre>
+<p><em>Note:</em> Reverted commits and the reverts are not included in this list.</p>
+
+<p>Alex Deucher (2):
+<ul>
+ <li>r600c: add new ontario pci ids</li>
+ <li>r600g: add some additional ontario pci ids</li>
+</ul></p>
+
+<p>Benjamin Franzke (1):
+<ul>
+ <li>st/dri: Fix surfaceless gl using contexts with previous bound surfaces</li>
+</ul></p>
+
+<p>Brian Paul (9):
+<ul>
+ <li>docs: pull 7.9.2 release notes into 7.10 branch</li>
+ <li>docs: update news.html with 7.10.1 and 7.9.2 releases</li>
+ <li>docs: fill in 7.10.1 release data</li>
+ <li>docs: add, fix release notes links</li>
+ <li>docs: update info about Mesa packaging/contents</li>
+ <li>docs: update prerequisites, remove old demo info</li>
+ <li>mesa: Guard against null pointer deref in fbo validation</li>
+ <li>st/mesa: Apply LOD bias from correct texture unit</li>
+ <li>glsl: silence warning in printf() with a cast</li>
+</ul></p>
+
+<p>Chad Versace (1):
+<ul>
+ <li>i965: Fix tex_swizzle when depth mode is GL_RED</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+ <li>r600: don't close fd on failed load</li>
+</ul></p>
+
+<p>Eric Anholt (2):
+<ul>
+ <li>i965: Apply a workaround for the Ironlake "vertex flashing".</li>
+ <li>i965: Fix alpha testing when there is no color buffer in the FBO.</li>
+</ul></p>
+
+<p>Fabian Bieler (1):
+<ul>
+ <li>st/mesa: Apply LOD from texture object</li>
+</ul></p>
+
+<p>Henri Verbeet (1):
+<ul>
+ <li>st/mesa: Validate state before doing blits.</li>
+</ul></p>
+
+<p>Ian Romanick (13):
+<ul>
+ <li>docs: Add 7.10.1 md5sums</li>
+ <li>glsl: Refactor AST-to-HIR code handling variable initializers</li>
+ <li>glsl: Refactor AST-to-HIR code handling variable redeclarations</li>
+ <li>glsl: Process redeclarations before initializers</li>
+ <li>glsl: Function signatures cannot have NULL return type</li>
+ <li>glsl: Add several function / call related validations</li>
+ <li>linker: Add imported functions to the linked IR</li>
+ <li>glsl: Use insert_before for lists instead of open coding it</li>
+ <li>glsl: Only allow unsized array assignment in an initializer</li>
+ <li>glcpp: Refresh autogenerated lexer files</li>
+ <li>docs: Initial bits of 7.10.2 release notes</li>
+ <li>mesa: set version string to 7.10.2</li>
+ <li>mesa: Remove nonexistant files from _FILES lists</li>
+</ul></p>
+
+<p>Jerome Glisse (1):
+<ul>
+ <li>r600g: move user fence into base radeon structure</li>
+</ul></p>
+
+<p>José Fonseca (2):
+<ul>
+ <li>mesa: Fix typo glGet*v(GL_TEXTURE_COORD_ARRAY_*).</li>
+ <li>mesa: More glGet* fixes.</li>
+</ul></p>
+
+<p>Kenneth Graunke (4):
+<ul>
+ <li>glcpp: Rework lexer to use a SKIP state rather than REJECT.</li>
+ <li>glcpp: Remove trailing contexts from #if rules.</li>
+ <li>i965/fs: Fix linear gl_Color interpolation on pre-gen6 hardware.</li>
+ <li>glsl: Accept precision qualifiers on sampler types, but only in ES.</li>
+</ul></p>
+
+<p>Marek Olšák (15):
+<ul>
+ <li>st/mesa: fix crash when DrawBuffer->_ColorDrawBuffers[0] is NULL</li>
+ <li>st/mesa: fail to alloc a renderbuffer if st_choose_renderbuffer_format fails</li>
+ <li>r300/compiler: fix the saturate modifier when applied to TEX instructions</li>
+ <li>r300/compiler: fix translating the src negate bits in pair_translate</li>
+ <li>r300/compiler: Abs doesn't cancel Negate (in the conversion to native swizzles)</li>
+ <li>r300/compiler: TEX instructions don't support negation on source arguments</li>
+ <li>r300/compiler: do not set TEX_IGNORE_UNCOVERED on r500</li>
+ <li>r300/compiler: saturate Z before the shadow comparison</li>
+ <li>r300/compiler: fix equal and notequal shadow compare functions</li>
+ <li>r300/compiler: remove unused variables</li>
+ <li>st/mesa: fix crash when using both user and vbo buffers with the same stride</li>
+ <li>r300g: fix alpha-test with no colorbuffer</li>
+ <li>r300g: tell the GLSL compiler to lower the continue opcode</li>
+ <li>r300/compiler: propagate SaturateMode down to the result of shadow comparison</li>
+ <li>r300/compiler: apply the texture swizzle to shadow pass and fail values too</li>
+</ul></p>
+
+<p>Michel Dänzer (1):
+<ul>
+ <li>Use proper source row stride when getting depth/stencil texels.</li>
+</ul></p>
+
+<p>Tom Stellard (4):
+<ul>
+ <li>r300/compiler: Use a 4-bit writemask in pair instructions</li>
+ <li>prog_optimize: Fix reallocating registers for shaders with loops</li>
+ <li>r300/compiler: Fix vertex shader MAD instructions with constant swizzles</li>
+ <li>r300/compiler: Don't try to convert RGB to Alpha in full instructions</li>
+</ul></p>
+
</body>
</html>
commit 3831ba6dd1989e3e4299e033196ec60e0b96106f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 6 13:29:59 2011 -0700
mesa: Remove nonexistant files from _FILES lists
This allows 'make -j1 tarballs' to work.
diff --git a/Makefile b/Makefile
index 9159f9a..0862a65 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,6 @@ MAIN_FILES = \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/*.spec \
- $(DIRECTORY)/include/GL/internal/glcore.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
@@ -308,8 +307,7 @@ MAPI_FILES = \
$(DIRECTORY)/src/mapi/mapi/*.[ch] \
$(DIRECTORY)/src/mapi/vgapi/Makefile \
$(DIRECTORY)/src/mapi/vgapi/vgapi.csv \
- $(DIRECTORY)/src/mapi/vgapi/vg.pc.in \
- $(DIRECTORY)/src/mapi/vgapi/*.h
+ $(DIRECTORY)/src/mapi/vgapi/vg.pc.in
EGL_FILES = \
$(DIRECTORY)/include/KHR/*.h \
commit 812e11f4b4664593a84f63de5a396d7216c66ff0
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 6 10:01:02 2011 -0700
mesa: set version string to 7.10.2
diff --git a/Makefile b/Makefile
index ee16a2b..9159f9a 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.10.1
+VERSION=7.10.2
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
GLUT_NAME = MesaGLUT-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 8d54169..c4ec34d 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -34,8 +34,8 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 7
#define MESA_MINOR 10
-#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.10.1"
+#define MESA_PATCH 2
+#define MESA_VERSION_STRING "7.10.2"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 0c69a2fda5bd277110766b1a565f48aba149ed40
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Apr 5 16:35:15 2011 -0700
docs: Initial bits of 7.10.2 release notes
diff --git a/docs/relnotes-7.10.2.html b/docs/relnotes-7.10.2.html
new file mode 100644
index 0000000..fa556a8
--- /dev/null
+++ b/docs/relnotes-7.10.2.html
@@ -0,0 +1,81 @@
+<HTML>
+
+<head>
+<TITLE>Mesa Release Notes</TITLE>
+<link rel="stylesheet" type="text/css" href="mesa.css">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+</head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.10.2 Release Notes / TBD</H1>
+
+<p>
+Mesa 7.10.2 is a bug fix release which fixes bugs found since the 7.10 release.
+</p>
+<p>
+Mesa 7.10.2 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+</p>
+<p>
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
+for DRI hardware acceleration.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD
+</pre>
+
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+<p>This list is likely incomplete.</p>
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29172";>Bug 29172</a> - Arrandale - Pill Popper Pops Pills</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31159";>Bug 31159</a> - shadow problem in 0ad game</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32688";>Bug 32688</a> - [RADEON:KMS:R300G] some games have a wireframe or outline visible</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32949";>Bug 32949</a> - [glsl wine] Need for Speed renders incorrectly with GLSL enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34203";>Bug 34203</a> - [GLSL] fail to call long chains across shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34376";>Bug 34376</a> - [GLSL] allowing assignment to unsized array
+ <ul>
+ <li>The commit message incorrectly
+ lists <a href="https://bugs.freedesktop.org/show_bug.cgi?id=34367";>bug
+ 34367</a>.</li>
+ </ul>
+</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34370";>Bug 34370</a> - [GLSL] "i<5 && i<4" in for loop fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34374";>Bug 34374</a> - [GLSL] fail to redeclare an array using initializer</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35073";>Bug 35073</a> - [GM45] Alpha test is broken when rendering to FBO with no color attachment</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35483";>Bug 35483</a> - util_blit_pixels_writemask: crash in line 322 of src/gallium/auxiliary/util/u_blit.c</li>
+
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
+
+</ul>
+
+
+<h2>Changes</h2>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-7.10.1..origin/7.10
+</pre>
+
+</body>
+</html>
commit 6e08ceb77d4d4c98ea5bfd41e8fab1c3232de4a1
Author: Tom Stellard <tstellar@gmail.com>
Date: Tue Apr 5 23:49:23 2011 -0700
r300/compiler: Don't try to convert RGB to Alpha in full instructions
(cherry picked from commit cd2857fae16e1352f39b37f611797e66619d3fe5)
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
index 1a1e881..10b257c 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -600,7 +600,8 @@ static void is_rgb_to_alpha_possible(
struct rc_reader_data * reader_data = userdata;
if (!can_remap(inst->U.P.RGB.Opcode)
- || !can_remap(inst->U.P.Alpha.Opcode)) {
+ || !can_remap(inst->U.P.Alpha.Opcode)
+ || inst->U.P.Alpha.Opcode != RC_OPCODE_NOP) {
reader_data->Abort = 1;
return;
}
commit 50dccfdbefcf0a5c35668287508916a3a74da4c8
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Apr 5 16:14:39 2011 -0700
Revert "i965: bump VS thread number to 60 on SNB"
Increasing the number of VS threads beyond 1 causes some regressions
in vertex shader tests on Sugar Bay GT1 systems.
This reverts commit c21a44463a402a886bf58d0e689d5a098eda1ff4.
References: https://bugs.freedesktop.org/show_bug.cgi?id=35730
diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c
index 6ec6255..0411ce0 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@ -1561,7 +1561,6 @@ static void emit_vertex_write( struct brw_vs_compile *c)
int eot;
GLuint len_vertex_header = 2;
int next_mrf, i;
- int msg_len;
if (c->key.copy_edgeflag) {
brw_MOV(p,
@@ -1728,20 +1727,13 @@ static void emit_vertex_write( struct brw_vs_compile *c)
eot = (c->first_overflow_output == 0);
- msg_len = c->nr_outputs + 2 + len_vertex_header;
- if (intel->gen >= 6) {
- /* interleaved urb write message length for gen6 should be multiple of 2 */
- if ((msg_len % 2) != 0)
- msg_len++;
- }
-
brw_urb_WRITE(p,
brw_null_reg(), /* dest */
0, /* starting mrf reg nr */
c->r0, /* src */
0, /* allocate */
1, /* used */
- MIN2(msg_len - 1, (BRW_MAX_MRF - 1)), /* msg len */
+ MIN2(c->nr_outputs + 1 + len_vertex_header, (BRW_MAX_MRF-1)), /* msg len */
0, /* response len */
eot, /* eot */
eot, /* writes complete */
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 20dfb13..ed132bd 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -136,8 +136,7 @@ upload_vs_state(struct brw_context *brw)
OUT_BATCH((1 << GEN6_VS_DISPATCH_START_GRF_SHIFT) |
(brw->vs.prog_data->urb_read_length << GEN6_VS_URB_READ_LENGTH_SHIFT) |
(0 << GEN6_VS_URB_ENTRY_READ_OFFSET_SHIFT));
-
- OUT_BATCH(((60 - 1) << GEN6_VS_MAX_THREADS_SHIFT) | /* max 60 threads for gen6 */
+ OUT_BATCH((0 << GEN6_VS_MAX_THREADS_SHIFT) |
GEN6_VS_STATISTICS_ENABLE |
GEN6_VS_ENABLE);
ADVANCE_BATCH();
commit 22035e3d8423ac62d6d8b648170a01fbd1cc5fa0
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Apr 5 16:09:47 2011 -0700
glcpp: Refresh autogenerated lexer files
These are the results of commit 9ebb904 and 7cf7c966.
diff --git a/src/glsl/glcpp/glcpp-lex.c b/src/glsl/glcpp/glcpp-lex.c
index b53bea6..3e1b918 100644
--- a/src/glsl/glcpp/glcpp-lex.c
+++ b/src/glsl/glcpp/glcpp-lex.c
@@ -358,45 +358,43 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[137] =
+static yyconst flex_int16_t yy_acclist[125] =
{ 0,
3, 3, 44, 39, 43, 40, 43, 41, 43, 43,
38, 43, 43, 38, 43, 38, 43, 38, 43, 25,
39, 43, 24, 39, 43, 38, 43, 38, 43, 38,
43, 37, 39, 43, 37, 39, 43, 38, 43, 40,
- 43, 23, 43, 43, 3, 43, 4, 43, 5, 43,
- 42, 43, 39, 18, 40, 32, 35, 33, 2, 1,
- 25, 39, 25, 39, 39, 24, 39, 24, 39, 27,
- 29, 31, 30, 28, 37, 39, 37, 39, 34, 40,
- 23, 23, 3, 4, 5, 6, 5, 7, 1, 26,
- 39, 37, 39,16398, 26, 39, 37, 39, 18, 37,
-
- 39,16399,16400, 8206, 18, 8206, 37, 39, 8207, 18,
- 8208, 18,16401, 19,16396, 22, 36, 37, 39, 21,
- 8209, 18, 19, 8204, 18,16397,16404, 8205, 18, 11,
- 18, 9, 8, 8212, 10, 18
+ 43, 23, 43, 3, 43, 4, 43, 5, 43, 42,
+ 43, 18, 43, 18, 43, 18, 43, 39, 40, 32,
+ 35, 33, 2, 1, 25, 39, 25, 39, 39, 24,
+ 39, 24, 39, 27, 29, 31, 30, 28, 37, 39,
+ 37, 39, 34, 40, 23, 23, 3, 4, 5, 6,
+ 5, 7, 1, 26, 39, 37, 39, 26, 39, 37,
+
+ 39, 14, 37, 39, 15, 16, 37, 39, 17, 19,
+ 12, 22, 36, 37, 39, 21, 19, 13,16404, 11,
+ 9, 8, 8212, 10
} ;
-static yyconst flex_int16_t yy_accept[164] =
+static yyconst flex_int16_t yy_accept[155] =
{ 0,
- 1, 1, 1, 1, 1, 2, 3, 3, 3, 4,
- 6, 8, 10, 11, 13, 14, 16, 18, 20, 23,
- 26, 28, 30, 32, 35, 38, 40, 42, 44, 45,
- 47, 49, 51, 53, 54, 54, 55, 56, 57, 58,
- 59, 60, 61, 63, 65, 66, 68, 70, 71, 72,
- 73, 74, 75, 77, 79, 80, 81, 82, 83, 83,
- 83, 83, 83, 83, 83, 83, 84, 85, 86, 87,
- 88, 89, 90, 92, 94, 94, 94, 94, 94, 94,
- 95, 95, 95, 95, 95, 97, 99, 99, 99, 99,
- 99, 99, 99, 99, 100, 100, 100, 100, 100, 100,
-
- 100, 102, 102, 103, 104, 104, 104, 104, 104, 106,
- 106, 107, 107, 107, 107, 107, 107, 107, 109, 109,
- 109, 111, 111, 113, 114, 115, 115, 116, 116, 116,
- 116, 117, 117, 120, 121, 121, 123, 124, 124, 124,
- 126, 127, 127, 127, 127, 128, 128, 128, 130, 130,
- 132, 132, 133, 134, 134, 134, 134, 135, 135, 135,
- 137, 137, 137
+ 1, 1, 1, 1, 1, 2, 3, 3, 3, 3,
+ 3, 4, 6, 8, 10, 11, 13, 14, 16, 18,
+ 20, 23, 26, 28, 30, 32, 35, 38, 40, 42,
+ 44, 46, 48, 50, 52, 54, 56, 58, 59, 60,
+ 61, 62, 63, 64, 65, 67, 69, 70, 72, 74,
+ 75, 76, 77, 78, 79, 81, 83, 84, 85, 86,
+ 87, 87, 87, 87, 87, 87, 87, 87, 88, 89,
+ 90, 91, 92, 93, 93, 93, 93, 93, 94, 96,
+ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
+ 98, 100, 102, 102, 102, 102, 102, 102, 102, 103,
+
+ 103, 103, 103, 103, 103, 103, 105, 105, 106, 107,
+ 107, 107, 107, 107, 107, 107, 107, 107, 107, 109,
+ 109, 110, 111, 111, 112, 112, 112, 112, 113, 113,
+ 116, 117, 118, 118, 119, 119, 119, 119, 120, 120,
+ 120, 121, 121, 122, 123, 123, 123, 123, 124, 124,
+ 124, 125, 125, 125
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -433,198 +431,144 @@ static yyconst flex_int32_t yy_ec[256] =
static yyconst flex_int32_t yy_meta[40] =
{ 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1
+ 1, 2, 3, 4, 4, 4, 4, 4, 5, 6,
+ 4, 7, 7, 7, 4, 4, 4, 8, 8, 8,
+ 8, 8, 9, 8, 8, 8, 8, 8, 8, 9,
+ 8, 8, 8, 8, 8, 8, 8, 8, 4
} ;
-static yyconst flex_int16_t yy_base[182] =
+static yyconst flex_int16_t yy_base[168] =
{ 0,
- 0, 38, 0, 0, 38, 39, 499, 498, 500, 48,
- 43, 552, 496, 44, 63, 495, 59, 65, 87, 125,
- 58, 67, 68, 164, 203, 40, 75, 241, 552, 494,
- 552, 140, 552, 140, 493, 552, 144, 492, 491, 487,
- 486, 485, 156, 179, 267, 0, 209, 472, 471, 470,
- 469, 468, 446, 124, 466, 153, 462, 458, 154, 198,
- 159, 155, 183, 160, 193, 460, 552, 222, 552, 227,
- 552, 459, 204, 161, 231, 232, 238, 243, 236, 303,
- 245, 180, 247, 249, 281, 56, 257, 271, 248, 259,
- 252, 264, 455, 454, 297, 299, 312, 313, 320, 294,
-
- 407, 295, 427, 426, 321, 296, 324, 425, 552, 424,
- 552, 327, 329, 195, 328, 331, 332, 230, 334, 378,
- 552, 377, 552, 371, 370, 335, 365, 337, 358, 342,
- 360, 344, 326, 255, 340, 552, 260, 338, 246, 552,
- 197, 364, 192, 352, 382, 348, 186, 552, 420, 552,
- 423, 184, 141, 437, 421, 447, 79, 476, 346, 552,
- 453, 552, 515, 517, 519, 521, 523, 525, 71, 527,
- 529, 531, 533, 535, 537, 539, 541, 543, 545, 547,
- 549
+ 0, 38, 0, 0, 38, 39, 328, 327, 326, 44,
+ 328, 0, 325, 332, 332, 310, 319, 332, 316, 41,
+ 41, 44, 44, 307, 49, 321, 44, 282, 61, 79,
+ 317, 332, 72, 332, 332, 67, 68, 0, 317, 332,
+ 332, 332, 332, 0, 34, 0, 105, 0, 0, 332,
+ 332, 332, 332, 332, 317, 73, 332, 82, 311, 310,
+ 291, 61, 289, 286, 279, 281, 286, 306, 332, 90,
+ 332, 94, 332, 84, 85, 108, 48, 0, 88, 95,
+ 283, 86, 284, 273, 270, 91, 274, 281, 279, 268,
+ 0, 124, 273, 274, 274, 270, 265, 271, 332, 267,
+
+ 264, 262, 259, 260, 249, 125, 245, 332, 332, 241,
+ 229, 231, 223, 209, 222, 194, 197, 194, 130, 196,
+ 332, 0, 181, 332, 189, 131, 191, 332, 181, 210,
+ 162, 0, 136, 332, 134, 0, 130, 155, 111, 138,
+ 332, 153, 0, 332, 125, 41, 156, 332, 34, 136,
+ 332, 159, 332, 173, 182, 191, 200, 209, 218, 227,
+ 236, 245, 254, 263, 272, 280, 285
} ;
-static yyconst flex_int16_t yy_def[182] =
+static yyconst flex_int16_t yy_def[168] =
{ 0,
- 162, 1, 163, 163, 164, 164, 165, 165, 162, 166,
- 167, 162, 167, 167, 167, 167, 167, 167, 162, 166,
- 167, 167, 167, 168, 168, 167, 167, 167, 162, 169,
- 162, 170, 162, 20, 167, 162, 167, 167, 167, 167,
- 167, 171, 19, 20, 20, 20, 20, 167, 167, 167,
- 167, 167, 25, 25, 167, 167, 28, 28, 167, 167,
Reply to: