From 8647aa1a5029fcd96f134103331ddf3c21bc0a0b Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 26 Jul 2013 07:45:10 +0200 Subject: xserver mesa git update 26 Jul 2013 xserver commit bdd1e22cbde9ea2324e4e1991c9e152f22f88151 mesa commit 81a156d099b5c224d4a528b66a80e25626ed65bc --- mesalib/Android.common.mk | 2 +- mesalib/SConstruct | 2 +- mesalib/configure.ac | 4 ++-- mesalib/docs/devinfo.html | 6 +++--- mesalib/src/glsl/loop_analysis.cpp | 3 ++- mesalib/src/glsl/lower_named_interface_blocks.cpp | 8 ++------ xorg-server/hw/xfree86/modes/xf86RandR12.c | 19 ++++++++++++++++--- 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/mesalib/Android.common.mk b/mesalib/Android.common.mk index c6ee4e1db..dd37104b0 100644 --- a/mesalib/Android.common.mk +++ b/mesalib/Android.common.mk @@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \ # define ANDROID_VERSION (e.g., 4.0.x => 0x0400) LOCAL_CFLAGS += \ - -DPACKAGE_VERSION=\"9.2.0-devel\" \ + -DPACKAGE_VERSION=\"9.3.0-devel\" \ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \ -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION) diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 834e9d58a..b00a7fe1c 100644 --- a/mesalib/SConstruct +++ b/mesalib/SConstruct @@ -70,7 +70,7 @@ if env['gles']: # Environment setup env.Append(CPPDEFINES = [ - ('PACKAGE_VERSION', '\\"9.2.0-devel\\"'), + ('PACKAGE_VERSION', '\\"9.3.0-devel\\"'), ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'), ]) diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 21a1986b2..425b6eef7 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help output m4_divert_once([HELP_END], [ See docs/autoconf.html for more details on the options for Mesa.]) -AC_INIT([Mesa], [9.2.0-devel], +AC_INIT([Mesa], [9.3.0-devel], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) @@ -1973,7 +1973,7 @@ AC_SUBST([VDPAU_MINOR], 0) AC_SUBST([XVMC_MAJOR], 1) AC_SUBST([XVMC_MINOR], 0) -AC_SUBST([XA_MAJOR], 1) +AC_SUBST([XA_MAJOR], 2) AC_SUBST([XA_MINOR], 0) AC_SUBST([XA_TINY], 0) AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_TINY") diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html index 5aad0fb1d..bd11e5ccc 100644 --- a/mesalib/docs/devinfo.html +++ b/mesalib/docs/devinfo.html @@ -269,10 +269,10 @@ sftp USERNAME,mesa3d@web.sourceforge.net

Make an announcement on the mailing lists: -mesa-dev@lists.freedesktop.org, -mesa-users@lists.freedesktop.org +mesa-dev@lists.freedesktop.org, +mesa-users@lists.freedesktop.org and -mesa-announce@lists.freedesktop.org +mesa-announce@lists.freedesktop.org

diff --git a/mesalib/src/glsl/loop_analysis.cpp b/mesalib/src/glsl/loop_analysis.cpp index 191e92de7..40897bb6f 100644 --- a/mesalib/src/glsl/loop_analysis.cpp +++ b/mesalib/src/glsl/loop_analysis.cpp @@ -503,7 +503,8 @@ is_loop_terminator(ir_if *ir) ir_instruction *const inst = (ir_instruction *) ir->then_instructions.get_head(); - assert(inst != NULL); + if (inst == NULL) + return false; if (inst->ir_type != ir_type_loop_jump) return false; diff --git a/mesalib/src/glsl/lower_named_interface_blocks.cpp b/mesalib/src/glsl/lower_named_interface_blocks.cpp index d0d491d3d..20196a356 100644 --- a/mesalib/src/glsl/lower_named_interface_blocks.cpp +++ b/mesalib/src/glsl/lower_named_interface_blocks.cpp @@ -129,9 +129,9 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) iface_field_name); if (!found_var) { ir_variable *new_var; + char *var_name = + ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name); if (array_t == NULL) { - char *var_name = - ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name); new_var = new(mem_ctx) ir_variable(iface_t->fields.structure[i].type, var_name, @@ -141,10 +141,6 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) glsl_type::get_array_instance( iface_t->fields.structure[i].type, array_t->length); - char *var_name = - ralloc_asprintf(mem_ctx, "%s[%d]", - iface_t->fields.structure[i].name, - array_t->length); new_var = new(mem_ctx) ir_variable(new_array_type, var_name, diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c index 2817aaa1f..76614de78 100644 --- a/xorg-server/hw/xfree86/modes/xf86RandR12.c +++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c @@ -1771,6 +1771,19 @@ xf86RandR12EnterVT(ScrnInfoPtr pScrn) return RRGetInfo(pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ } +static void +xf86DetachOutputGPU(ScreenPtr pScreen) +{ + rrScrPrivPtr rp = rrGetScrPriv(pScreen); + int i; + + /* make sure there are no attached shared scanout pixmaps first */ + for (i = 0; i < rp->numCrtcs; i++) + RRCrtcDetachScanoutPixmap(rp->crtcs[i]); + + DetachOutputGPU(pScreen); +} + static Bool xf86RandR14ProviderSetOutputSource(ScreenPtr pScreen, RRProviderPtr provider, @@ -1780,7 +1793,7 @@ xf86RandR14ProviderSetOutputSource(ScreenPtr pScreen, if (provider->output_source) { ScreenPtr cmScreen = pScreen->current_master; - DetachOutputGPU(pScreen); + xf86DetachOutputGPU(pScreen); AttachUnboundGPU(cmScreen, pScreen); } provider->output_source = NULL; @@ -1808,7 +1821,7 @@ xf86RandR14ProviderSetOffloadSink(ScreenPtr pScreen, if (!sink_provider) { if (provider->offload_sink) { ScreenPtr cmScreen = pScreen->current_master; - DetachOutputGPU(pScreen); + xf86DetachOutputGPU(pScreen); AttachUnboundGPU(cmScreen, pScreen); } @@ -1899,7 +1912,7 @@ xf86RandR14ProviderDestroy(ScreenPtr screen, RRProviderPtr provider) RRSetChanged(screen); } else if (config->randr_provider->output_source) { - DetachOutputGPU(screen); + xf86DetachOutputGPU(screen); config->randr_provider->output_source = NULL; RRSetChanged(screen); } -- cgit v1.2.3