Makefile | 2
configs/autoconf.in | 3
configs/default | 5
configs/linux-dri | 2
configs/linux-llvm | 2
configure.ac | 14
debian/changelog | 76
debian/libgl1-mesa-dri.install | 3
debian/libgl1-mesa-dri.install.linux | 10
debian/not-installed | 21
debian/patches/10-fix-talloc-linking.diff | 45
debian/patches/105_use_shared_libdricore.patch | 88
debian/patches/107_winsys_buffer_nullptr.patch | 13
debian/patches/110_nv50_fix_tgsi_sign_mode.diff | 19
debian/patches/series | 3
debian/rules | 34
docs/news.html | 13
docs/relnotes-7.10.1.html | 84
docs/relnotes-7.10.html | 13
docs/relnotes-7.9.1.html | 6
docs/relnotes.html | 2
include/GL/gl_mangle.h | 332 +
src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 3
src/gallium/targets/SConscript.dri | 1
src/gallium/targets/libgl-gdi/SConscript | 1
src/gallium/targets/libgl-xlib/SConscript | 1
src/gallium/winsys/radeon/drm/radeon_r300.c | 2
src/glsl/Makefile | 5
src/glsl/SConscript | 7
src/glsl/ast.h | 21
src/glsl/ast_function.cpp | 20
src/glsl/ast_to_hir.cpp | 215 -
src/glsl/ast_type.cpp | 3
src/glsl/builtin_function.cpp | 8
src/glsl/builtin_types.h | 3
src/glsl/glcpp/glcpp-lex.c | 22
src/glsl/glcpp/glcpp-lex.l | 14
src/glsl/glcpp/glcpp-parse.c | 407 +-
src/glsl/glcpp/glcpp-parse.y | 193
src/glsl/glcpp/glcpp.c | 10
src/glsl/glcpp/glcpp.h | 4
src/glsl/glcpp/pp.c | 30
src/glsl/glsl_lexer.cpp | 1934 ++++-----
src/glsl/glsl_lexer.lpp | 6
src/glsl/glsl_parser.cpp | 2800 +++++++-------
src/glsl/glsl_parser.h | 149
src/glsl/glsl_parser.ypp | 53
src/glsl/glsl_parser_extras.cpp | 20
src/glsl/glsl_parser_extras.h | 18
src/glsl/glsl_symbol_table.cpp | 19
src/glsl/glsl_symbol_table.h | 20
src/glsl/glsl_types.cpp | 28
src/glsl/glsl_types.h | 22
src/glsl/ir.cpp | 19
src/glsl/ir.h | 16
src/glsl/ir_clone.cpp | 2
src/glsl/ir_constant_expression.cpp | 10
src/glsl/ir_expression_flattening.cpp | 2
src/glsl/ir_import_prototypes.cpp | 2
src/glsl/ir_reader.cpp | 22
src/glsl/ir_validate.cpp | 4
src/glsl/ir_variable_refcount.h | 4
src/glsl/link_functions.cpp | 16
src/glsl/linker.cpp | 72
src/glsl/list.h | 28
src/glsl/loop_analysis.cpp | 14
src/glsl/loop_controls.cpp | 4
src/glsl/loop_unroll.cpp | 4
src/glsl/lower_discard.cpp | 2
src/glsl/lower_if_to_cond_assign.cpp | 2
src/glsl/lower_mat_op_to_vec.cpp | 2
src/glsl/lower_noise.cpp | 2
src/glsl/lower_texture_projection.cpp | 2
src/glsl/lower_variable_index_to_cond_assign.cpp | 58
src/glsl/lower_vec_index_to_cond_assign.cpp | 4
src/glsl/lower_vec_index_to_swizzle.cpp | 2
src/glsl/lower_vector.cpp | 2
src/glsl/main.cpp | 24
src/glsl/opt_algebraic.cpp | 2
src/glsl/opt_constant_propagation.cpp | 6
src/glsl/opt_copy_propagation.cpp | 6
src/glsl/opt_dead_code_local.cpp | 4
src/glsl/opt_dead_functions.cpp | 4
src/glsl/opt_function_inlining.cpp | 6
src/glsl/opt_structure_splitting.cpp | 16
src/glsl/ralloc.c | 442 ++
src/glsl/ralloc.h | 345 +
src/glsl/s_expression.cpp | 2
src/glsl/s_expression.h | 2
src/mesa/Makefile | 6
src/mesa/drivers/dri/common/dri_util.c | 3
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2
src/mesa/drivers/dri/i965/brw_fs.cpp | 126
src/mesa/drivers/dri/i965/brw_fs.h | 25
src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 2
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 9
src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 14
src/mesa/drivers/dri/i965/brw_program.c | 4
src/mesa/drivers/dri/i965/brw_vs_emit.c | 8
src/mesa/drivers/dri/intel/intel_fbo.c | 13
src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c | 2
src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 6
src/mesa/drivers/dri/r600/r700_assembler.c | 83
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 3
src/mesa/drivers/osmesa/Makefile | 2
src/mesa/main/shaderapi.c | 8
src/mesa/main/shaderobj.c | 12
src/mesa/main/uniforms.c | 2
src/mesa/main/version.h | 4
src/mesa/program/ir_to_mesa.cpp | 38
src/mesa/program/register_allocate.c | 27
src/mesa/program/sampler.cpp | 20
112 files changed, 5038 insertions(+), 3364 deletions(-)
New commits:
commit 0bf6344797fa98fb1d0dde85c186cad9191cfe80
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Feb 16 10:37:27 2011 +1100
Add Unity-fixing nv50 cherry-pick
diff --git a/debian/changelog b/debian/changelog
index e808614..b5d28e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
- Refresh for talloc-dropping buildsystem changes.
* debian/patches/107_winsys_buffer_nullptr.patch:
- Drop. Included upstream.
+ * debian/patches/109_nv50_fix_tgsi_sign_mode.diff:
+ - Cherry-pick from master. Fixes assert hit by Unity on nv5x hardware
+ (LP: #710588)
- -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Feb 2011
16:31:44 +1100
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 16 Feb 2011
10:37:07 +1100
mesa (7.10-1ubuntu2) natty; urgency=low
diff --git a/debian/patches/109_nv50_fix_tgsi_sign_mode.diff
b/debian/patches/109_nv50_fix_tgsi_sign_mode.diff
new file mode 100644
index 0000000..7becbb6
--- /dev/null
+++ b/debian/patches/109_nv50_fix_tgsi_sign_mode.diff
@@ -0,0 +1,19 @@
+commit 7401590dedf6f2abb1f0f0db988be90acb1fb84f
+Author: Christoph Bumiller <e0425...@student.tuwien.ac.at>
+Date: Mon Feb 7 14:54:17 2011 +0100
+
+ nv50,nvc0: do not forget to apply sign mode to saved TGSI inputs
+
+diff --git a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
+index d6b80c3..ce9300a 100644
+--- a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
++++ b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
+@@ -1130,7 +1130,7 @@ emit_fetch(struct bld_context *bld, const struct
tgsi_full_instruction *insn,
+ case TGSI_FILE_INPUT:
+ res = bld_saved_input(bld, idx, swz);
+ if (res && (insn->Instruction.Opcode != TGSI_OPCODE_TXP))
+- return res;
++ break;
+
+ res = new_value(bld->pc, bld->ti->input_file, type);
+ res->reg.id = bld->ti->input_map[idx][swz];
diff --git a/debian/patches/series b/debian/patches/series
index d3a085d..3f1bd30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
103_savage-expose_fbmodes_with_nonzero_alpha.patch
105_use_shared_libdricore.patch
108_fix_leaks_dri2_screen_creation.patch
+109_nv50_fix_tgsi_sign_mode.diff
commit 8c2f695b57ae486c0631cb77aed529ce5eb5d2b2
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Feb 16 10:34:58 2011 +1100
Drop r300g NULL check patch; included upstream
diff --git a/debian/changelog b/debian/changelog
index 19c3f59..e808614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
- Drop. Upstream has replaced talloc with an in-tree replacement
* debian/patches/105_use_shared_libdricore.patch:
- Refresh for talloc-dropping buildsystem changes.
+ * debian/patches/107_winsys_buffer_nullptr.patch:
+ - Drop. Included upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Feb 2011
16:31:44 +1100
diff --git a/debian/patches/107_winsys_buffer_nullptr.patch
b/debian/patches/107_winsys_buffer_nullptr.patch
deleted file mode 100644
index 8042d6b..0000000
--- a/debian/patches/107_winsys_buffer_nullptr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gallium/winsys/radeon/drm/radeon_r300.c
b/src/gallium/winsys/radeon/drm/radeon_r300.c
-index 420522f..2d1bd1e 100644
---- a/src/gallium/winsys/radeon/drm/radeon_r300.c
-+++ b/src/gallium/winsys/radeon/drm/radeon_r300.c
-@@ -119,7 +119,7 @@ static struct r300_winsys_buffer
*radeon_r300_winsys_buffer_from_handle(struct r
-
- if (stride)
- *stride = whandle->stride;
-- if (size)
-+ if (size && _buf)
- *size = _buf->base.size;
-
- return radeon_libdrm_winsys_buffer(_buf);
diff --git a/debian/patches/series b/debian/patches/series
index 4370f07..d3a085d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,4 @@
101_ubuntu_hidden_glname.patch
103_savage-expose_fbmodes_with_nonzero_alpha.patch
105_use_shared_libdricore.patch
-107_winsys_buffer_nullptr.patch
108_fix_leaks_dri2_screen_creation.patch
commit abff848e394709d41db58d4610a8e3f29df2db72
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Feb 16 10:24:30 2011 +1100
Refresh dricore patch for new upstream
diff --git a/debian/changelog b/debian/changelog
index 932bc15..19c3f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
* New upstream snapshot from 7.10 release branch.
* debian/patches/10_fix_talloc_linking.diff:
- Drop. Upstream has replaced talloc with an in-tree replacement
+ * debian/patches/105_use_shared_libdricore.patch:
+ - Refresh for talloc-dropping buildsystem changes.
-- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Feb 2011
16:31:44 +1100
diff --git a/debian/patches/105_use_shared_libdricore.patch
b/debian/patches/105_use_shared_libdricore.patch
index 2995936..48bca3d 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 2010-11-26 10:17:38.652892000 +1100
-+++ mesa/configs/autoconf.in 2010-11-26 11:08:40.902892001 +1100
+--- 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
@@ -33,6 +33,8 @@
LLVM_LIBS = @LLVM_LIBS@
GLW_CFLAGS = @GLW_CFLAGS@
@@ -22,9 +22,9 @@ Index: mesa/configs/autoconf.in
+DRI_CFLAGS = @DRI_CFLAGS@
+DRI_CXXFLAGS = @DRI_CXXFLAGS@
- TALLOC_LIBS = @TALLOC_LIBS@
- TALLOC_CFLAGS = @TALLOC_CFLAGS@
-@@ -103,7 +105,10 @@
+ # dlopen
+ DLOPEN_LIBS = @DLOPEN_LIBS@
+@@ -100,7 +102,10 @@
GALLIUM_DRIVERS = $(foreach
DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
# Driver specific build vars
@@ -36,7 +36,7 @@ Index: mesa/configs/autoconf.in
EGL_PLATFORMS = @EGL_PLATFORMS@
EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
-@@ -131,6 +136,7 @@
+@@ -128,6 +133,7 @@
VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
# DRI dependencies
@@ -46,11 +46,11 @@ Index: mesa/configs/autoconf.in
LIBDRM_LIB = @LIBDRM_LIBS@
Index: mesa/configs/default
===================================================================
---- mesa.orig/configs/default 2010-11-26 10:17:38.712892000 +1100
-+++ mesa/configs/default 2010-11-26 11:08:40.912892001 +1100
-@@ -85,6 +85,9 @@
- TALLOC_LIBS = `pkg-config --libs talloc`
- TALLOC_CFLAGS = `pkg-config --cflags talloc`
+--- mesa.orig/configs/default 2011-02-15 16:11:30.000000000 +1100
++++ mesa/configs/default 2011-02-16 10:20:03.222410207 +1100
+@@ -82,6 +82,9 @@
+ GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
+ VG_LIB_GLOB = $(VG_LIB_NAME)*
+DRI_CFLAGS = $(CFLAGS)
+DRI_CXXFLAGS = $(CXXFLAGS)
@@ -60,8 +60,8 @@ Index: mesa/configs/default
Index: mesa/configs/freebsd-dri
===================================================================
---- mesa.orig/configs/freebsd-dri 2010-11-26 10:17:38.802892000 +1100
-+++ mesa/configs/freebsd-dri 2010-11-26 11:08:40.942892001 +1100
+--- 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
@@ -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 2010-11-26 10:17:39.292892001 +1100
-+++ mesa/configs/linux-dri 2010-11-26 11:08:40.952892001 +1100
+--- 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
@@ -43,9 +43,11 @@
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
@@ -87,15 +87,15 @@ Index: mesa/configs/linux-dri
+
LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
LIBDRM_LIB = $(shell pkg-config --libs libdrm)
--DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc
$(LIBDRM_LIB)
-+DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-ltalloc $(LIBDRM_LIB)
+-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
++DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
$(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl $(LIBDRM_LIB)
Index: mesa/configs/linux-dri-xcb
===================================================================
---- mesa.orig/configs/linux-dri-xcb 2010-11-26 10:17:39.432892001 +1100
-+++ mesa/configs/linux-dri-xcb 2010-11-26 11:08:40.952892001 +1100
+--- 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
@@ -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 2010-11-26 10:17:39.622892001 +1100
-+++ mesa/configs/linux-egl 2010-11-26 11:08:40.982892001 +1100
+--- 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
@@ -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 2010-11-26 10:17:39.742892001 +1100
-+++ mesa/configs/linux-indirect 2010-11-26 11:08:41.002892001 +1100
+--- 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
@@ -42,7 +42,8 @@
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
@@ -142,9 +142,9 @@ Index: mesa/configs/linux-indirect
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2010-11-26 11:08:40.472892001 +1100
-+++ mesa/configure.ac 2010-11-26 11:08:41.012892001 +1100
-@@ -699,6 +699,34 @@
+--- mesa.orig/configure.ac 2011-02-16 10:18:03.000000000 +1100
++++ mesa/configure.ac 2011-02-16 10:23:12.322687577 +1100
+@@ -801,6 +801,34 @@
AC_SUBST([GLESv2_PC_LIB_PRIV])
@@ -179,22 +179,22 @@ Index: mesa/configure.ac
AC_SUBST([HAVE_XF86VIDMODE])
PKG_CHECK_MODULES([LIBDRM_RADEON],
-@@ -903,8 +931,8 @@
- AC_CHECK_LIB([expat],[XML_ParserCreate],[],
- [AC_MSG_ERROR([Expat required for DRI.])])
+@@ -962,8 +990,8 @@
+ [AC_MSG_ERROR([Expat required for DRI.])])
+ fi
- # put all the necessary libs together
-- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread
$DLOPEN_LIBS $TALLOC_LIBS"
+- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread
$DLOPEN_LIBS"
+ # put all the necessary libs together, including possibly libdricore
-+ DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm
-lpthread $DLOPEN_LIBS $TALLOC_LIBS"
++ DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm
-lpthread $DLOPEN_LIBS"
fi
AC_SUBST([DRI_DIRS])
AC_SUBST([EXPAT_INCLUDES])
Index: mesa/src/glsl/Makefile
===================================================================
---- mesa.orig/src/glsl/Makefile 2010-11-26 10:17:39.902892001 +1100
-+++ mesa/src/glsl/Makefile 2010-11-26 11:08:41.022892001 +1100
-@@ -110,6 +110,9 @@
+--- 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
+@@ -112,6 +112,9 @@
$(C_SOURCES:.c=.o) \
$(CXX_SOURCES:.cpp=.o)
@@ -202,9 +202,9 @@ Index: mesa/src/glsl/Makefile
+OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))
+
INCLUDES = \
- $(TALLOC_CFLAGS) \
-I. \
-@@ -126,7 +129,14 @@
+ -I../mesa \
+@@ -127,7 +130,14 @@
##### TARGETS #####
@@ -220,7 +220,7 @@ Index: mesa/src/glsl/Makefile
lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template
$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS)
-@@ -160,6 +170,14 @@
+@@ -161,6 +171,14 @@
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
@@ -237,8 +237,8 @@ Index: mesa/src/glsl/Makefile
Index: mesa/src/mesa/Makefile
===================================================================
---- mesa.orig/src/mesa/Makefile 2010-11-26 10:17:40.042892000 +1100
-+++ mesa/src/mesa/Makefile 2010-11-26 11:38:35.000000000 +1100
+--- 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
@@ -15,6 +15,7 @@
MESA_OBJ_DIR := .
ES1_OBJ_DIR := objs-es1
@@ -262,7 +262,7 @@ Index: mesa/src/mesa/Makefile
+DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)
# append include dirs
- MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS)
+ MESA_CPPFLAGS += $(INCLUDE_DIRS)
@@ -43,18 +46,24 @@
CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
@@ -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 2010-11-26
10:17:40.232892001 +1100
-+++ mesa/src/mesa/drivers/dri/Makefile.template 2010-11-26
11:08:41.102892001 +1100
+--- 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
@@ -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 2010-11-26
10:17:40.522892002 +1100
-+++ mesa/src/mesa/x86/read_rgba_span_x86.S 2010-11-26 11:08:41.102892001
+1100
+--- 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
@@ -77,7 +77,9 @@
*/
commit 5b6fdf318f545399b90de9a19cc302ea1ad7773b
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Feb 16 10:17:53 2011 +1100
Talloc is no loger used; drop talloc-fixing patch
diff --git a/debian/changelog b/debian/changelog
index 9cdd9a5..932bc15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
* New upstream snapshot from 7.10 release branch.
+ * debian/patches/10_fix_talloc_linking.diff:
+ - Drop. Upstream has replaced talloc with an in-tree replacement
-- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Feb 2011
16:31:44 +1100
diff --git a/debian/patches/10-fix-talloc-linking.diff
b/debian/patches/10-fix-talloc-linking.diff
deleted file mode 100644
index 6976795..0000000
--- a/debian/patches/10-fix-talloc-linking.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix talloc linking.
-
-It seems impossible to mix static libraries with dynamic libraries, at
-least under the “foo.a bar.a -lbaz” form. Also, no combination of
-pkg-config/--libs/--static/talloc seems to return the wanted
-“/usr/lib/libtalloc.a”, one only gets “-ltalloc”.
-
-So hardcode the path for now, using another variable. This way,
-$(TALLOC_LIBS) might be added to other places where dynamic variables
-are OK, and we don't break that.
-
-Signed-off-by: Cyril Brulebois <k...@debian.org>
-
---- a/configs/default
-+++ b/configs/default
-@@ -84,6 +84,7 @@ VG_LIB_GLOB = $(VG_LIB_NAME)*
-
- TALLOC_LIBS = `pkg-config --libs talloc`
- TALLOC_CFLAGS = `pkg-config --cflags talloc`
-+TALLOC_STATIC_LIBS = /usr/lib/libtalloc.a
-
- # Optional assembly language optimization files for libGL
- MESA_ASM_SOURCES =
---- a/src/mesa/drivers/osmesa/Makefile
-+++ b/src/mesa/drivers/osmesa/Makefile
-@@ -40,7 +40,7 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(
- -major 6 -minor 5 -patch 3 \
- -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
-- $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) $(TALLOC_LIBS)
-+ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) $(TALLOC_STATIC_LIBS)
-
-
-
---- a/src/glsl/Makefile
-+++ b/src/glsl/Makefile
-@@ -84,7 +84,7 @@ CXX_SOURCES = \
-
- LIBS = \
- $(TOP)/src/glsl/libglsl.a \
-- $(TALLOC_LIBS)
-+ $(TALLOC_STATIC_LIBS)
-
- APPS = glsl_compiler glcpp/glcpp
-
diff --git a/debian/patches/series b/debian/patches/series
index ab4131f..4370f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
-10-fix-talloc-linking.diff
# Ubuntu patches.
100_no_abi_tag.patch
commit 632a9ab3bf06b2b3a8ee72c6ec702b6d692a61aa
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Feb 15 21:19:10 2011 +1100
Changelog entry for new snapshot
diff --git a/debian/changelog b/debian/changelog
index 4646ef1..9cdd9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
+
+ * New upstream snapshot from 7.10 release branch.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Feb 2011
16:31:44 +1100
+
mesa (7.10-1ubuntu2) natty; urgency=low
* Add 108_fix_leaks_dri2_screen_creation.patch: Cherrypick from upstream
commit 5032aeb66ae3407899e7319dce6bedbfcb18b0f0
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Feb 15 14:50:59 2011 +1100
Fix typo in 7.10-1ubuntu1 changelog
diff --git a/debian/changelog b/debian/changelog
index eff1c45..4646ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ mesa (7.10-1ubuntu2) natty; urgency=low
-- Bryce Harrington <br...@ubuntu.com> Mon, 14 Feb 2011 11:44:22 -0800
-mesa (7.10-1ubuntu1) natty; urgency=lowe
+mesa (7.10-1ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
- debian/control
commit cc1636b6db85604510f97f8a37d7fd0ecf453866
Author: Tom Stellard <tstel...@gmail.com>
Date: Wed Feb 9 01:43:29 2011 -0800
r300/compiler: Don't erase sources when converting RGB->Alpha
https://bugs.freedesktop.org/show_bug.cgi?id=34030
(cherry picked from commit 9106b98766e36b04daf738bd81c4f86eedfa1b8d)
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 9beb5d6..1a1e881 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -544,18 +544,12 @@ static void rgb_to_alpha_remap (
{
int new_src_index;
unsigned int i;
- struct rc_pair_instruction_source * old_src =
- rc_pair_get_src(&inst->U.P, arg);
- if (!old_src) {
- return;
- }
for (i = 0; i < 3; i++) {
if (get_swz(arg->Swizzle, i) == old_swz) {
SET_SWZ(arg->Swizzle, i, RC_SWIZZLE_W);
}
}
- memset(old_src, 0, sizeof(struct rc_pair_instruction_source));
new_src_index = rc_pair_alloc_source(&inst->U.P, 0, 1,
old_file, new_index);
/* This conversion is not possible, we must have made a mistake in
commit 995edd4c0a05412bb9c0f733546082cad707ecca
Author: Bryce Harrington <br...@canonical.com>
Date: Wed Jan 12 10:06:12 2011 -0800
r300g: Null pointer check for buffer deref in gallium winsys
radeon_drm_bufmgr_create_buffer_from_handle() can return NULL buffers
sometimes (seen when alt-tabbing in compiz). Avoid dereferencing the
buffer pointer in this case.
Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/691653
Also: https://bugzilla.redhat.com/show_bug.cgi?id=660143
Signed-off-by: Bryce Harrington <br...@canonical.com>
diff --git a/src/gallium/winsys/radeon/drm/radeon_r300.c
b/src/gallium/winsys/radeon/drm/radeon_r300.c
index 9f59b3d..7a07280 100644
--- a/src/gallium/winsys/radeon/drm/radeon_r300.c
+++ b/src/gallium/winsys/radeon/drm/radeon_r300.c
@@ -118,7 +118,7 @@ static struct r300_winsys_buffer
*radeon_r300_winsys_buffer_from_handle(struct r
if (stride)
*stride = whandle->stride;
- if (size)
+ if (size && _buf)
*size = _buf->base.size;
return (struct r300_winsys_buffer*)_buf;
commit 4edcabaa0c91d5f0b18b1e16918242aa01d43329
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 16:06:40 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 33621e6..5053c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10-3) UNRELEASED; urgency=low
+mesa (7.10-3) unstable; urgency=low
[ Julien Cristau ]
* debian/rules: RIP lpia.
@@ -15,7 +15,7 @@ mesa (7.10-3) UNRELEASED; urgency=low
r300g (Closes: #612380):
- dri_util: fail driCreateNewScreen if InitScreen is NULL
- -- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
+ -- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 16:06:38 +0100
mesa (7.10-2) unstable; urgency=low
commit e28687d4746c6f75b87637bb93cdc8122a31f2f2
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 16:06:33 2011 +0100
Document the cherry-pick, close #612380.
diff --git a/debian/changelog b/debian/changelog
index eb54c0d..33621e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ mesa (7.10-3) UNRELEASED; urgency=low
libgl1-mesa-dri.install.linux to that effect.
* According to Michel Dänzer, r600g (r600 gallium) is working well
enough to be shipped now. Let's ship it, then!
+ * Cherry-pick from upstream, fixing X's failure to start with UMS on
+ r300g (Closes: #612380):
+ - dri_util: fail driCreateNewScreen if InitScreen is NULL
-- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
commit 68dfc2dce9ae95cbc0571f1c14ce0e9e2bc3b279
Author: Paulo Zanoni <pzan...@mandriva.com>
Date: Thu Jan 13 04:59:12 2011 -0800
dri_util: fail driCreateNewScreen if InitScreen is NULL
Without this, X doesn't start with UMS on r300g.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Paulo Zanoni <pzan...@mandriva.com>
Signed-off-by: Brian Paul <bri...@vmware.com>
(cherry picked from commit dad914f6b2e5862a5174133f11276e975867be04)
diff --git a/src/mesa/drivers/dri/common/dri_util.c
b/src/mesa/drivers/dri/common/dri_util.c
index a5b71bd..bf8cf6e 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -790,6 +790,9 @@ driCreateNewScreen(int scrn,
static const __DRIextension *emptyExtensionList[] = { NULL };
__DRIscreen *psp;
+ if (driDriverAPI.InitScreen == NULL)
+ return NULL;
+
psp = calloc(1, sizeof *psp);
if (!psp)
return NULL;
commit fca99e1a47894449210a76b9f15358f042812750
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 14:07:36 2011 +0100
Time to ship r600g.
Thanks to Michel Dänzer for the hint.
diff --git a/debian/changelog b/debian/changelog
index 0d4b4c9..eb54c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mesa (7.10-3) UNRELEASED; urgency=low
This fixes the FTBFS on GNU/kFreeBSD.
* Ship r300g (r300 gallium) on Linux only: Introduce Linux-specific
libgl1-mesa-dri.install.linux to that effect.
+ * According to Michel Dänzer, r600g (r600 gallium) is working well
+ enough to be shipped now. Let's ship it, then!
-- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
diff --git a/debian/libgl1-mesa-dri.install.linux
b/debian/libgl1-mesa-dri.install.linux
index d724d6d..1b1e4de 100644
--- a/debian/libgl1-mesa-dri.install.linux
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -3,3 +3,4 @@ build/dri/lib/*_dri.so usr/lib/dri
# This part is Linux-specific:
build/dri/lib/gallium/r300_dri.so usr/lib/dri
+build/dri/lib/gallium/r600_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index adffe90..8353f05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -198,8 +198,6 @@ build-stamp: $(BUILD_STAMPS)
# Remove gallium drivers which replace existing classic drivers.
# Intel gallium is significantly behind the classic mesa drivers...
rm -f build/dri/lib/gallium/i915_dri.so
-# r600g is not yet in a fit state to ship
- rm -f build/dri/lib/gallium/r600_dri.so
>$@
$(STAMP)-build-%: configure
commit 69791880074b69d6831699cf7f000dd3c8868c48
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 14:04:03 2011 +0100
Ship r300g (r300 gallium) on Linux only.
Introduce Linux-specific libgl1-mesa-dri.install.linux to that effect.
diff --git a/debian/changelog b/debian/changelog
index 17c3399..0d4b4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mesa (7.10-3) UNRELEASED; urgency=low
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
This fixes the FTBFS on GNU/kFreeBSD.
+ * Ship r300g (r300 gallium) on Linux only: Introduce Linux-specific
+ libgl1-mesa-dri.install.linux to that effect.
-- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
index 8a77ea8..a470396 100644
--- a/debian/libgl1-mesa-dri.install
+++ b/debian/libgl1-mesa-dri.install
@@ -1,2 +1,2 @@
+# If this part gets modified, make sure to update .install.$os as well:
build/dri/lib/*_dri.so usr/lib/dri
-build/dri/lib/gallium/r300_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri.install.linux
b/debian/libgl1-mesa-dri.install.linux
new file mode 100644
index 0000000..d724d6d
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -0,0 +1,5 @@
+# Keep this part in sync with libgl1-mesa-dri.install:
+build/dri/lib/*_dri.so usr/lib/dri
+
+# This part is Linux-specific:
+build/dri/lib/gallium/r300_dri.so usr/lib/dri
commit 3ad7804b7a41b054742f1403332ebfff481a1415
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 13:56:16 2011 +0100
Mention the GNU/kFreeBSD FTBFS goes away.
diff --git a/debian/changelog b/debian/changelog
index d1609c0..17c3399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (7.10-3) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
+ This fixes the FTBFS on GNU/kFreeBSD.
-- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
commit 982964e6a62fa830dcb23952ba6dbab818c6b791
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 13:47:08 2011 +0100
debian/rules: RIP lpia.
diff --git a/debian/changelog b/debian/changelog
index a4ea6cc..d1609c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
mesa (7.10-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
+ * debian/rules: RIP lpia.
+
+ [ Cyril Brulebois ]
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
diff --git a/debian/rules b/debian/rules
index 38b567b..adffe90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,18 +77,15 @@ else
EGL_DISPLAYS += drm
endif
- ifeq ($(DEB_HOST_ARCH), lpia)
- DRI_DRIVERS += i915 i965
- GALLIUM_DRIVERS += i915
- else ifneq ($(DEB_HOST_ARCH), s390)
+ ifneq ($(DEB_HOST_ARCH), s390)
DRI_DRIVERS += mach64 mga r128 r200 r600 radeon savage tdfx
- ifeq ($(DEB_HOST_ARCH_CPU), i386)
+ endif
+ ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i810 i915 i965 sis unichrome
GALLIUM_DRIVERS += i915
- else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
+ else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
DRI_DRIVERS += i915 i965 sis unichrome
GALLIUM_DRIVERS += i915
- endif
endif
endif
commit 6ad8a698c4ead6fe7d29a786552e35fb77d89950
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Feb 8 13:19:31 2011 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index a27cd0c..a4ea6cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10-3) UNRELEASED; urgency=low
+
+ * Cherry-pick from upstream (thanks to Dave Airlie for the hint):
+ - radeon: fix build on non-KMS systems.
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
+
mesa (7.10-2) unstable; urgency=low
* Fix FTBFS on i386: Add some files to debian/not-installed, on a
commit 8300e1747dec6c0ddd8807d8bc014536913868e8
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Jan 3 06:02:43 2011 +1000
radeon: fix build on non-KMS systems.
Reported on irc by adamk.
(cherry picked from commit fb03510738e80716068a193a4078814d0e801120)
diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 6c2648b..60f1049 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -67,6 +67,9 @@ struct drm_radeon_info {
#define DRM_RADEON_INFO 0x1
#endif
+static inline void radeon_gem_get_kernel_name(struct radeon_bo *dummy,
uint32_t *value)
+{
+}
static inline uint32_t radeon_gem_name_bo(struct radeon_bo *dummy)
{
commit 546aade28653988eedcc1d3e8fdcf35fb19da059
Author: Vinson Lee <v...@vmware.com>
Date: Thu Feb 3 22:10:16 2011 -0800
ralloc: Add missing va_end following va_copy.
(cherry picked from commit cde443e0b94ec6d8d0a99284e72ca7f9e2591174)
diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c
index e92f433..f7edff6 100644
--- a/src/glsl/ralloc.c
+++ b/src/glsl/ralloc.c
@@ -387,6 +387,8 @@ printf_length(const char *fmt, va_list untouched_args)
size = vsnprintf(&junk, 1, fmt, args);
assert(size >= 0);
+ va_end(args);
+
return size;
}
commit 77e3c82ad132d76408295e6ae615cb28afbb7b77
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Mon Jan 24 10:36:15 2011 -0800
Remove the talloc sources from the Mesa repository.
(cherry picked from commit 1568b19e3b20275f8e56811ef8073aa2584666b1)
diff --git a/src/talloc/gpl-3.0.txt b/src/talloc/gpl-3.0.txt
deleted file mode 100644
index 94a9ed0..0000000
--- a/src/talloc/gpl-3.0.txt
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ppee3-0001dz...@alioth.debian.org
