mesa: Changes to 'debian-experimental'
Makefile | 2
configs/autoconf.in | 3
configs/default | 5
configs/linux-dri | 2
configs/linux-llvm | 2
configure.ac | 14
debian/changelog | 84
debian/control | 32
debian/libgl1-mesa-dri-experimental.install | 1
debian/libgl1-mesa-dri.install | 2
debian/libgl1-mesa-dri.install.linux | 5
debian/local/control | 1
debian/local/script | 26
debian/not-installed | 6
debian/patches/10-fix-talloc-linking.diff | 45
debian/patches/11-hurd-ftbfs-again.diff | 87
debian/patches/series | 2
debian/rules | 57
docs/envvars.html | 102
docs/news.html | 13
docs/relnotes-7.10.1.html | 375 +
docs/relnotes-7.10.html | 13
docs/relnotes-7.9.1.html | 6
docs/relnotes.html | 3
docs/shading.html | 2
docs/sourcetree.html | 1
include/GL/gl_mangle.h | 332 +
src/gallium/auxiliary/cso_cache/cso_context.c | 2
src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 3
src/gallium/auxiliary/gallivm/lp_bld_const.h | 18
src/gallium/auxiliary/gallivm/lp_bld_format_aos.c | 54
src/gallium/drivers/llvmpipe/lp_setup.c | 4
src/gallium/drivers/nouveau/nouveau_winsys.h | 2
src/gallium/drivers/nv50/nv50_surface.c | 2
src/gallium/drivers/nv50/nv50_tgsi_to_nc.c | 2
src/gallium/drivers/nvfx/nv04_2d.c | 2
src/gallium/drivers/nvfx/nvfx_vbo.c | 3
src/gallium/drivers/softpipe/sp_setup.c | 2
src/gallium/state_trackers/dri/common/dri_context.c | 10
src/gallium/state_trackers/dri/common/dri_drawable.c | 1
src/gallium/state_trackers/dri/common/dri_drawable.h | 3
src/gallium/state_trackers/dri/drm/dri2.c | 2
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_expr.cpp | 4
src/glsl/ast_function.cpp | 129
src/glsl/ast_to_hir.cpp | 230 -
src/glsl/ast_type.cpp | 5
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 | 412 -
src/glsl/glcpp/glcpp-parse.y | 200
src/glsl/glcpp/glcpp.c | 10
src/glsl/glcpp/glcpp.h | 4
src/glsl/glcpp/pp.c | 30
src/glsl/glsl_lexer.cpp | 1983 ++++----
src/glsl/glsl_lexer.lpp | 23
src/glsl/glsl_parser.cpp | 3067 +++++++------
src/glsl/glsl_parser.h | 237 -
src/glsl/glsl_parser.ypp | 210
src/glsl/glsl_parser_extras.cpp | 52
src/glsl/glsl_parser_extras.h | 46
src/glsl/glsl_symbol_table.cpp | 19
src/glsl/glsl_symbol_table.h | 20
src/glsl/glsl_types.cpp | 30
src/glsl/glsl_types.h | 26
src/glsl/ir.cpp | 19
src/glsl/ir.h | 20
src/glsl/ir_clone.cpp | 2
src/glsl/ir_constant_expression.cpp | 34
src/glsl/ir_expression_flattening.cpp | 2
src/glsl/ir_import_prototypes.cpp | 4
src/glsl/ir_reader.cpp | 24
src/glsl/ir_validate.cpp | 4
src/glsl/ir_variable_refcount.h | 4
src/glsl/link_functions.cpp | 22
src/glsl/linker.cpp | 94
src/glsl/list.h | 28
src/glsl/loop_analysis.cpp | 14
src/glsl/loop_controls.cpp | 6
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 | 34
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 | 8
src/glsl/s_expression.h | 2
src/glx/glx_pbuffer.c | 11
src/glx/glxcmds.c | 8
src/glx/glxext.c | 2
src/mapi/glapi/gen/ARB_ES2_compatibility.xml | 58
src/mapi/glapi/gen/Makefile | 1
src/mapi/glapi/gen/gl_API.xml | 2
src/mapi/glapi/gen/gl_x86-64_asm.py | 3
src/mapi/glapi/gen/gl_x86_asm.py | 2
src/mapi/glapi/glapi_sparc.S | 609 +-
src/mapi/glapi/glapi_x86-64.S | 2788 ++++++------
src/mapi/glapi/glapi_x86.S | 913 ++--
src/mapi/glapi/glapitable.h | 567 +-
src/mapi/glapi/glapitemp.h | 244 -
src/mapi/glapi/glprocs.h | 1416 +++---
src/mesa/Makefile | 6
src/mesa/drivers/dri/common/dri_util.c | 3
src/mesa/drivers/dri/i915/i915_context.c | 28
src/mesa/drivers/dri/i915/i915_fragprog.c | 36
src/mesa/drivers/dri/i965/brw_context.c | 9
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2
src/mesa/drivers/dri/i965/brw_fs.cpp | 190
src/mesa/drivers/dri/i965/brw_fs.h | 37
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/i965/gen6_clip_state.c | 2
src/mesa/drivers/dri/i965/gen6_sf_state.c | 4
src/mesa/drivers/dri/intel/intel_context.c | 6
src/mesa/drivers/dri/intel/intel_extensions_es2.c | 13
src/mesa/drivers/dri/intel/intel_fbo.c | 13
src/mesa/drivers/dri/nouveau/nouveau_driver.h | 2
src/mesa/drivers/dri/r200/r200_state_init.c | 2
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/dri/radeon/radeon_span.c | 8
src/mesa/drivers/dri/radeon/radeon_state.c | 3
src/mesa/drivers/dri/radeon/radeon_state_init.c | 2
src/mesa/drivers/dri/radeon/radeon_texstate.c | 28
src/mesa/drivers/osmesa/Makefile | 2
src/mesa/main/APIspec.xml | 2
src/mesa/main/api_exec.c | 4
src/mesa/main/arrayobj.c | 2
src/mesa/main/context.c | 10
src/mesa/main/depth.c | 6
src/mesa/main/depth.h | 3
src/mesa/main/enums.c | 4
src/mesa/main/extensions.c | 910 +---
src/mesa/main/fbobject.c | 7
src/mesa/main/formats.c | 15
src/mesa/main/get.c | 28
src/mesa/main/glapidispatch.h | 1158 ++---
src/mesa/main/imports.c | 2
src/mesa/main/mipmap.c | 2
src/mesa/main/mtypes.h | 19
src/mesa/main/remap_helper.h | 3166 +++++++-------
src/mesa/main/shaderapi.c | 65
src/mesa/main/shaderobj.c | 12
src/mesa/main/texenvprogram.c | 4
src/mesa/main/uniforms.c | 55
src/mesa/main/varray.c | 68
src/mesa/main/version.h | 4
src/mesa/main/viewport.c | 6
src/mesa/main/viewport.h | 3
src/mesa/program/ir_to_mesa.cpp | 38
src/mesa/program/register_allocate.c | 27
src/mesa/program/sampler.cpp | 22
src/mesa/state_tracker/st_atom_sampler.c | 46
src/mesa/state_tracker/st_cb_clear.c | 18
src/mesa/state_tracker/st_cb_drawpixels.c | 7
src/mesa/state_tracker/st_cb_fbo.c | 2
src/mesa/state_tracker/st_cb_texture.c | 3
src/mesa/state_tracker/st_format.c | 59
src/mesa/state_tracker/st_format.h | 6
src/mesa/state_tracker/st_mesa_to_tgsi.c | 10
src/mesa/tnl/t_draw.c | 40
src/mesa/x86-64/xform4.S | 14
src/mesa/x86/read_rgba_span_x86.S | 2
190 files changed, 12799 insertions(+), 9588 deletions(-)
New commits:
commit 18e7d5331c3446d5b66ac8b770c9cdfe47449db1
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Sat Mar 5 19:32:21 2011 +1100
Build and install nouveau_vieux classic driver on linux.
Closes: 586064
diff --git a/debian/changelog b/debian/changelog
index 5c73d9c..d0cefdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
* Also drop patch fixing talloc linking.
* Cherry-pick fix from master for changed nouveau headers in libdrm 2.4.24.
- Also bump build-depend on libdrm to 2.4.24
+ * Build and install nouveau_vieux driver in libgl1-mesa-dri-experimental.
+ (Closes: #586062)
- -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +1100
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Sat, 05 Mar 2011 19:30:58 +1100
mesa (7.10-4) unstable; urgency=low
diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install
index d6170b8..2856366 100644
--- a/debian/libgl1-mesa-dri-experimental.install
+++ b/debian/libgl1-mesa-dri-experimental.install
@@ -1 +1,2 @@
build/dri/lib/gallium/nouveau_dri.so usr/lib/dri
+build/dri/lib/gallium/nouveau_vieux_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index 483bd84..2f25d15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,8 @@ else
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
+# Nouveau requires KMS, so even the classic DRI driver only works on linux
+ DRI_DRIVERS += nouveau
endif
ifneq ($(DEB_HOST_ARCH), s390)
@@ -207,6 +209,10 @@ build-stamp: $(BUILD_STAMPS)
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
+# Move nouveau_vieux alongside nouveau to install in dri-experimental package
+ifneq (,$(filter nouveau,$(DRI_DRIVERS)))
+ mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
+endif
>$@
$(STAMP)-build-%: configure
commit 57f29713bed26dae38178018fc90177e01c038f6
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Sat Mar 5 19:30:47 2011 +1100
Bump build-depend on libdrm to 2.4.24 for nouveau
diff --git a/debian/changelog b/debian/changelog
index 94492a7..5c73d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
* Remove talloc from build-depends. This has been re-implemented in-tree.
* Also drop patch fixing talloc linking.
* Cherry-pick fix from master for changed nouveau headers in libdrm 2.4.24.
+ - Also bump build-depend on libdrm to 2.4.24
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +1100
diff --git a/debian/control b/debian/control
index c7d6bb1..e0ed63e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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.23) [!hurd-i386], libx11-dev, xutils-dev,
+ libdrm-dev (>= 2.4.24) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
commit de5a3e9f376559077a631cc200ba66250043801e
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Sat Mar 5 19:29:19 2011 +1100
Changelog entry for cherry-pick
diff --git a/debian/changelog b/debian/changelog
index cc527ee..94492a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
- Drop 12-fix-fdo-31940.diff; included included in new release.
* Remove talloc from build-depends. This has been re-implemented in-tree.
* Also drop patch fixing talloc linking.
+ * Cherry-pick fix from master for changed nouveau headers in libdrm 2.4.24.
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +1100
commit 555c05ffb5a8b2222dc398b8c7c82524d73f3571
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>
(cherry picked from commit 5c102dd94f435e97507213fbd128e50dd15f5f54)
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"
commit a07c97f9547a965d6e760e6cbccdd90280b0e1f3
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Mar 4 12:25:02 2011 +1100
Drop 12-fix-fdo-31940.diff; now upstream
diff --git a/debian/changelog b/debian/changelog
index a66bcf5..cc527ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
* New upstream release
- Lots of intel bugfixes, mainly for Sandybridge.
- Lots of GLSL spec conformance fixes
+ - Drop 12-fix-fdo-31940.diff; included included in new release.
* Remove talloc from build-depends. This has been re-implemented in-tree.
* Also drop patch fixing talloc linking.
diff --git a/debian/patches/12-fix-fdo-31940.diff b/debian/patches/12-fix-fdo-31940.diff
deleted file mode 100644
index 7830bd8..0000000
--- a/debian/patches/12-fix-fdo-31940.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Jakob Bornecrantz <wallbraker@gmail.com>
-Description: [PATCH] st/dri: Track drawable context bindings
- Needs to track this ourself since because we get into a race condition with
- the dri_util.c code on make current when rendering to the front buffer.
- .
- This is what happens:
- Old context is rendering to the front buffer.
- .
- App calls MakeCurrent with a new context. dri_util.c sets
- drawable->driContextPriv to the new context and then calls the driver make
- current. st/dri make current flushes the old context, which calls back into
- st/dri via the flush frontbuffer hook. st/dri calls dri loader flush
- frontbuffer, which calls invalidate buffer on the drawable into st/dri.
- .
- This is where things gets wrong. st/dri grabs the context from the dri
- drawable (which now points to the new context) and calls invalidate
- framebuffer to the new context which has not yet set the new drawable as its
- framebuffers since we have not called make current yet, it asserts.
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=31940
-Origin: other, https://bugs.freedesktop.org/attachment.cgi?id=40689
----
- src/gallium/state_trackers/dri/common/dri_context.c | 10 +++++++++-
- src/gallium/state_trackers/dri/common/dri_drawable.c | 1 +
- src/gallium/state_trackers/dri/common/dri_drawable.h | 3 +++
- src/gallium/state_trackers/dri/drm/dri2.c | 2 +-
- 4 files changed, 14 insertions(+), 2 deletions(-)
-
---- a/src/gallium/state_trackers/dri/common/dri_context.c
-+++ b/src/gallium/state_trackers/dri/common/dri_context.c
-@@ -141,12 +141,18 @@ GLboolean
- dri_unbind_context(__DRIcontext * cPriv)
- {
- /* dri_util.c ensures cPriv is not null */
-+ struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
- struct dri_context *ctx = dri_context(cPriv);
-+ struct dri_drawable *draw = dri_drawable(ctx->dPriv);
-+ struct dri_drawable *read = dri_drawable(ctx->rPriv);
-+ struct st_api *stapi = screen->st_api;
-
- if (--ctx->bind_count == 0) {
- if (ctx->st == ctx->stapi->get_current(ctx->stapi)) {
- ctx->st->flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
-- ctx->stapi->make_current(ctx->stapi, NULL, NULL, NULL);
-+ stapi->make_current(stapi, NULL, NULL, NULL);
-+ draw->context = NULL;
-+ read->context = NULL;
- }
- }
-
-@@ -169,10 +175,12 @@ dri_make_current(__DRIcontext * cPriv,
-
- ++ctx->bind_count;
-
-+ draw->context = ctx;
- if (ctx->dPriv != driDrawPriv) {
- ctx->dPriv = driDrawPriv;
- draw->texture_stamp = driDrawPriv->lastStamp - 1;
- }
-+ read->context = ctx;
- if (ctx->rPriv != driReadPriv) {
- ctx->rPriv = driReadPriv;
- read->texture_stamp = driReadPriv->lastStamp - 1;
---- a/src/gallium/state_trackers/dri/common/dri_drawable.c
-+++ b/src/gallium/state_trackers/dri/common/dri_drawable.c
-@@ -132,6 +132,7 @@ dri_create_buffer(__DRIscreen * sPriv,
- drawable->base.validate = dri_st_framebuffer_validate;
- drawable->base.st_manager_private = (void *) drawable;
-
-+ drawable->screen = screen;
- drawable->sPriv = sPriv;
- drawable->dPriv = dPriv;
- dPriv->driverPrivate = (void *)drawable;
---- a/src/gallium/state_trackers/dri/common/dri_drawable.h
-+++ b/src/gallium/state_trackers/dri/common/dri_drawable.h
-@@ -41,6 +41,9 @@ struct dri_drawable
- struct st_framebuffer_iface base;
- struct st_visual stvis;
-
-+ struct dri_screen *screen;
-+ struct dri_context *context;
-+
- /* dri */
- __DRIdrawable *dPriv;
- __DRIscreen *sPriv;
---- a/src/gallium/state_trackers/dri/drm/dri2.c
-+++ b/src/gallium/state_trackers/dri/drm/dri2.c
-@@ -51,7 +51,7 @@ static void
- dri2_invalidate_drawable(__DRIdrawable *dPriv)
- {
- struct dri_drawable *drawable = dri_drawable(dPriv);
-- struct dri_context *ctx = dri_context(dPriv->driContextPriv);
-+ struct dri_context *ctx = drawable->context;
-
- dri2InvalidateDrawable(dPriv);
- drawable->dPriv->lastStamp = *drawable->dPriv->pStamp;
diff --git a/debian/patches/series b/debian/patches/series
index 4863b94..5578e89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
11-hurd-ftbfs-again.diff
-12-fix-fdo-31940.diff
commit d3fb7e96a25797d0ddb5c795c6db2318e93fe3f2
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Mar 4 12:23:03 2011 +1100
Drop 10-fix-talloc-linking.diff. Talloc is no longer used
diff --git a/debian/changelog b/debian/changelog
index 280efe9..a66bcf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
- Lots of intel bugfixes, mainly for Sandybridge.
- Lots of GLSL spec conformance fixes
* Remove talloc from build-depends. This has been re-implemented in-tree.
+ * Also drop patch fixing talloc linking.
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +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 <kibi@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 683d69f..4863b94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
-10-fix-talloc-linking.diff
11-hurd-ftbfs-again.diff
12-fix-fdo-31940.diff
commit b347f59b8d4285ea29c51a161b2e97a18174df55
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Mar 4 12:03:31 2011 +1100
Remove libtalloc from build-depends; it's been NIH'd in-tree
diff --git a/debian/changelog b/debian/changelog
index 0c5f537..280efe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mesa (7.10.1-1) UNRELEASED; urgency=low
* New upstream release
- Lots of intel bugfixes, mainly for Sandybridge.
- Lots of GLSL spec conformance fixes
+ * Remove talloc from build-depends. This has been re-implemented in-tree.
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +1100
diff --git a/debian/control b/debian/control
index 2cd81cd..c7d6bb1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
- libtalloc-dev, libudev-dev [linux-any],
+ libudev-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/
commit 9990d64dab9406f4dab09d271ba827f7db3e13a7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Mar 4 11:54:53 2011 +1100
Add changelog entry for 7.10.1 release
diff --git a/debian/changelog b/debian/changelog
index 2b4130b..0c5f537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10-5) UNRELEASED; urgency=low
+mesa (7.10.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Revert to r600 classic, r600 gallium doesn't seem ready yet, after all
@@ -9,7 +9,12 @@ mesa (7.10-5) UNRELEASED; urgency=low
the drivers after being relocated to /usr/lib32 by ia32-libs
(closes: #466790). Thanks to Javier Serrano Polo for the suggestion.
- -- Cyril Brulebois <kibi@debian.org> Thu, 17 Feb 2011 15:43:30 +0100
+ [ Christopher James Halse Rogers ]
+ * New upstream release
+ - Lots of intel bugfixes, mainly for Sandybridge.
+ - Lots of GLSL spec conformance fixes
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 04 Mar 2011 11:42:11 +1100
mesa (7.10-4) unstable; urgency=low
commit 565caabf40b872d2817c4181c2831ac7a917b51d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Mar 2 13:54:20 2011 -0800
docs: Add change log to 7.10.1 release notes
diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html
index 5b2fc78..75f325e 100644
--- a/docs/relnotes-7.10.1.html
+++ b/docs/relnotes-7.10.1.html
@@ -123,9 +123,252 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<p>The full set of changes can be viewed by using the following GIT command:</p>
<pre>
- git log mesa-7.10..origin/7.10
+ git log mesa-7.10..mesa-7.10.1
</pre>
+<p>Alberto Milone (1):
+<ul>
+ <li>r600c: add evergreen ARL support.</li>
+</ul></p>
+
+<p>Brian Paul (21):
+<ul>
+ <li>draw: Fix an off-by-one bug in a vsplit assertion.</li>
+ <li>docs: add links to 7.9.1 and 7.10 release notes</li>
+ <li>docs: added news item for 7.9.1 and 7.10 release</li>
+ <li>gallivm: work around LLVM 2.6 bug when calling C functions</li>
+ <li>gallivm: fix copy&paste error from previous commit</li>
+ <li>mesa: fix a few format table mistakes, assertions</li>
+ <li>mesa: fix num_draw_buffers==0 in fixed-function fragment program generation</li>
+ <li>mesa: don't assert in GetIntegerIndexed, etc</li>
+ <li>mesa: check for dummy renderbuffer in _mesa_FramebufferRenderbufferEXT()</li>
+ <li>llvmpipe: make sure binning is active when we begin/end a query</li>
+ <li>st/mesa: fix incorrect fragcoord.x translation</li>
+ <li>softpipe: fix off-by-one error in setup_fragcoord_coeff()</li>
+ <li>cso: fix loop bound in cso_set_vertex_samplers()</li>
+ <li>st/mesa: fix incorrect glCopyPixels position on fallback path</li>
+ <li>st/mesa: set renderbuffer _BaseFormat in a few places</li>
+ <li>st/mesa: fix the default case in st_format_datatype()</li>
+ <li>st/mesa: need to translate clear color according to surface's base format</li>
+ <li>docs: update 7.9.2 release notes with Brian's cherry-picks</li>
+ <li>docs: add link to 7.10.1 release notes</li>
+ <li>mesa: implement glGetShaderPrecisionFormat()</li>
+ <li>docs: updated environment variable list</li>
+</ul></p>
+
+<p>Bryce Harrington (1):
+<ul>
+ <li>r300g: Null pointer check for buffer deref in gallium winsys</li>
+</ul></p>
+
+<p>Chad Versace (20):
+<ul>
+ <li>glsl: At link-time, check that globals have matching centroid qualifiers</li>
+ <li>glcpp: Fix segfault when validating macro redefinitions</li>
+ <li>glsl: Fix parser rule for type_specifier</li>
+ <li>glsl: Change default value of ast_type_specifier::precision</li>
+ <li>glsl: Add semantic checks for precision qualifiers</li>
+ <li>glsl: Add support for default precision statements</li>
+ <li>glsl: Remove redundant semantic check in parser</li>
+ <li>glsl: Fix semantic checks on precision qualifiers</li>
+ <li>glsl: Fix segfault due to missing printf argument</li>
+ <li>glsl: Mark 'in' variables at global scope as read-only</li>
+ <li>mesa: Refactor handling of extension strings</li>
+ <li>mesa: Add/remove extensions in extension string</li>
+ <li>mesa: Change dependencies of some OES extension strings</li>
+ <li>mesa: Change OES_point_sprite to depend on ARB_point_sprite</li>
+ <li>mesa: Change OES_standard_derivatives to be stand-alone extension</li>
+ <li>i915: Disable extension OES_standard_derivatives</li>
+ <li>glcpp: Raise error when modulus is zero</li>
+ <li>glsl: Set operators '%' and '%=' to be reserved when GLSL < 1.30</li>
+ <li>glsl: Reinstate constant-folding for division by zero</li>
+ <li>tnl: Add support for datatype GL_FIXED in vertex arrays</li>
+</ul></p>
+
+<p>Chia-I Wu (1):
+<ul>
+ <li>mesa: Add glDepthRangef and glClearDepthf to APIspec.xml.</li>
+</ul></p>
+
+<p>Christoph Bumiller (1):
+<ul>
+ <li>nv50,nvc0: do not forget to apply sign mode to saved TGSI inputs</li>
+</ul></p>
+
+<p>Cyril Brulebois (1):
+<ul>
+ <li>Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org</li>
+</ul></p>
+
+<p>Dave Airlie (3):
+<ul>
+ <li>radeon/r200: fix fbo-clearmipmap + gen-teximage</li>
+ <li>radeon: calculate complete texture state inside TFP function</li>
+ <li>radeon: avoid segfault on 3D textures.</li>
+</ul></p>
+
+<p>Dimitry Andric (4):
+<ul>
+ <li>mesa: s/movzx/movzbl/</li>
+ <li>mesa: s/movzxw/movzwl/ in read_rgba_span_x86.S</li>
+ <li>glapi: adding @ char before type specifier in glapi_x86.S</li>
+ <li>glapi: add @GOTPCREL relocation type</li>
+</ul></p>
+
+<p>Eric Anholt (16):
+<ul>
+ <li>glsl: Fix the lowering of variable array indexing to not lose write_masks.</li>
+ <li>i965/fs: When producing ir_unop_abs of an operand, strip negate.</li>
+ <li>i965/vs: When MOVing to produce ABS, strip negate of the operand.</li>
+ <li>i965/fs: Do flat shading when appropriate.</li>
+ <li>i965: Avoid double-negation of immediate values in the VS.</li>
+ <li>intel: Make renderbuffer tiling choice match texture tiling choice.</li>
+ <li>i965: Fix dead pointers to fp->Parameters->ParameterValues[] after realloc.</li>
+ <li>docs: Add a relnote for the Civ IV on i965.</li>
+ <li>glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Add extension enable bit for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Add actual support for glReleaseShaderCompiler from ES2.</li>
+ <li>mesa: Add support for glDepthRangef and glClearDepthf.</li>
+ <li>mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.</li>
+ <li>mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.</li>
+ <li>i965: Fix a bug in i965 compute-to-MRF.</li>
+ <li>i965/fs: Add a helper function for detecting math opcodes.</li>
+</ul></p>
+
+<p>Fredrik Höglund (1):
+<ul>
+ <li>st/mesa: fix a regression from cae2bb76</li>
+</ul></p>
+
+<p>Ian Romanick (42):
+<ul>
+ <li>docs: Add 7.10 md5sums</li>
+ <li>glsl: Support the 'invariant(all)' pragma</li>
+ <li>glcpp: Generate an error for division by zero</li>
+ <li>glsl: Add version_string containing properly formatted GLSL version</li>
+ <li>glsl & glcpp: Refresh autogenerated lexer and parser files.</li>
+ <li>glsl: Disallow 'in' and 'out' on globals in GLSL 1.20</li>
+ <li>glsl: Track variable usage, use that to enforce semantics</li>
+ <li>glsl: Allow 'in' and 'out' when 'layout' is also available</li>
+ <li>docs: Initial bits of 7.10.1 release notes</li>
+ <li>mesa: bump version to 7.10.1-devel</li>
+ <li>doc: Update 7.10.1 release notes</li>
+ <li>glsl: Emit errors or warnings when 'layout' is used with 'attribute' or 'varying'</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>glsl: Refresh autogenerated lexer and parser files.</li>
+ <li>glsl: Don't assert when the value returned by a function has no rvalue</li>
+ <li>linker: Set sizes for non-global arrays as well</li>
+ <li>linker: Propagate max_array_access while linking functions</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>mesa: glGetUniform only returns a single element of an array</li>
+ <li>linker: Generate link errors when ES shaders are missing stages</li>
+ <li>mesa: Fix error checks in GetVertexAttrib functions</li>
+ <li>Use C-style system headers in C++ code to avoid issues with std:: namespace</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>glapi: Regenerate for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Connect glGetShaderPrecisionFormat into the dispatch table</li>
+ <li>i965: Set correct values for range/precision of fragment shader types</li>
+ <li>i915: Set correct values for range/precision of fragment shader types</li>
+ <li>intel: Fix typeos from 3d028024 and 790ff232</li>
+ <li>glsl: Ensure that all GLSL versions are supported in the stand-alone compiler</li>
+ <li>glsl: Reject shader versions not supported by the implementation</li>
+ <li>mesa: Initial size for secondary color array is 3</li>
+ <li>glsl: Finish out the reduce/reduce error fixes</li>
+ <li>glsl: Regenerate compiler and glcpp files from cherry picks</li>
+ <li>linker: Fix off-by-one error implicit array sizing</li>
+ <li>docs: update 7.10.1 release notes with Ian's recent cherry picks</li>
+ <li>i915: Only mark a register as available if all components are written</li>
+ <li>i915: Calculate partial result to temp register first</li>
+ <li>i915: Force lowering of all types of indirect array accesses in the FS</li>
+ <li>docs: Update 7.10.1 with (hopefully) the last of the cherry picks</li>
+ <li>docs: Clean up bug fixes list</li>
+ <li>intel: Remove driver date and related bits from renderer string</li>
+ <li>mesa: set version string to 7.10.1 (final)</li>
+</ul></p>
+
+<p>Jian Zhao (1):
+<ul>
+ <li>mesa: fix an error in uniform arrays in row calculating.</li>
+</ul></p>
+
+<p>Julien Cristau (3):
+<ul>
+ <li>glx: fix request lengths</li>
+ <li>glx: fix GLXChangeDrawableAttributesSGIX request</li>
+ <li>glx: fix length of GLXGetFBConfigsSGIX</li>
+</ul></p>
+
+<p>Keith Packard (1):
+<ul>
+ <li>glsl: Eliminate reduce/reduce conflicts in glsl grammar</li>
+</ul></p>
+
+<p>Kenneth Graunke (20):
+<ul>
+ <li>glsl: Expose a public glsl_type::void_type const pointer.</li>
+ <li>glsl: Don't bother unsetting a destructor that was never set.</li>
+ <li>glsl, i965: Remove unnecessary talloc includes.</li>
+ <li>glcpp: Remove use of talloc reference counting.</li>
+ <li>ralloc: Add a fake implementation of ralloc based on talloc.</li>
+ <li>Convert everything from the talloc API to the ralloc API.</li>
+ <li>ralloc: a new MIT-licensed recursive memory allocator.</li>
+ <li>Remove talloc from the make and automake build systems.</li>
+ <li>Remove talloc from the SCons build system.</li>
+ <li>Remove the talloc sources from the Mesa repository.</li>
+ <li>glsl: Fix use of uninitialized values in _mesa_glsl_parse_state ctor.</li>
+ <li>i965/fs: Apply source modifier workarounds to POW as well.</li>
+ <li>i965: Fix shaders that write to gl_PointSize on Sandybridge.</li>
+ <li>i965/fs: Avoid register coalescing away gen6 MATH workarounds.</li>
+ <li>i965/fs: Correctly set up gl_FragCoord.w on Sandybridge.</li>
+ <li>i965: Increase Sandybridge point size clamp.</li>
+ <li>i965/fs: Refactor control flow stack handling.</li>
+ <li>i965: Increase Sandybridge point size clamp in the clip state.</li>
+ <li>glsl: Use reralloc instead of plain realloc.</li>
+ <li>Revert "i965/fs: Correctly set up gl_FragCoord.w on Sandybridge."</li>
+</ul></p>
+
+<p>Marek Olšák (4):
+<ul>
+ <li>docs: fix messed up names with special characters in relnotes-7.10</li>
+ <li>docs: fix messed up names with special characters in relnotes-7.9.1</li>
+ <li>mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2</li>
+ <li>st/dri: Track drawable context bindings</li>
+</ul></p>
+
+<p>Paulo Zanoni (1):
+<ul>
+ <li>dri_util: fail driCreateNewScreen if InitScreen is NULL</li>
+</ul></p>
+
+<p>Sam Hocevar (2):
+<ul>
+ <li>docs: add glsl info</li>
+ <li>docs: fix glsl_compiler name</li>
+</ul></p>
+
+<p>Tom Fogal (1):
+<ul>
+ <li>Regenerate gl_mangle.h.</li>
+</ul></p>
+
+<p>Tom Stellard (2):
+<ul>
+ <li>r300/compiler: Disable register rename pass on r500</li>
+ <li>r300/compiler: Don't erase sources when converting RGB->Alpha</li>
+</ul></p>
+
+<p>Vinson Lee (3):
+<ul>
+ <li>ralloc: Add missing va_end following va_copy.</li>
+ <li>mesa: Move declaration before code in extensions.c.</li>
+ <li>mesa: Move loop variable declarations outside for loop in extensions.c.</li>
+</ul></p>
+
+<p>nobled (1):
+<ul>
+ <li>glx: Put null check before use</li>
+</ul></p>
+
</p>
</body>
commit e4fefc3c328f26d0e50d32224df01aed16c3c77c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Mar 2 13:49:17 2011 -0800
mesa: set version string to 7.10.1 (final)
diff --git a/Makefile b/Makefile
index 32a5f2f..ee16a2b 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.10.1-devel
+VERSION=7.10.1
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 6e10c83..8d54169 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
#define MESA_MAJOR 7
#define MESA_MINOR 10
#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.10.1-devel"
+#define MESA_VERSION_STRING "7.10.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit b0a7492aebeb4517346f0da2362d6991a7385b59
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Mar 1 13:35:39 2011 -0800
intel: Remove driver date and related bits from renderer string
Not only did this contain lies, it contained lies that wouldn't be
useful even if true.
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index d183d27..f6f0b03 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -62,10 +62,6 @@ int INTEL_DEBUG = (0);
#endif
-#define DRIVER_DATE "20100330 DEVELOPMENT"
-#define DRIVER_DATE_GEM "GEM " DRIVER_DATE
-
-
static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
{
@@ -182,7 +178,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
break;
}
- (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0);
+ (void) driGetRendererString(buffer, chipset, "", 0);
return (GLubyte *) buffer;
default:
commit 8aabb1bc9951e168719cc94dd80b2f55fb764512
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Mar 1 13:19:58 2011 -0800
docs: Clean up bug fixes list
All the unnumbered bugs are first. These are followed by numbered
bugs sorted by bug number.
Reply to: