mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION  |2 
 configure.ac |   16 
 docs/specs/enums.txt |   26 -
 meson.build  |2 
 src/Makefile.am  |2 
 src/amd/vulkan/radv_cmd_buffer.c |2 
 src/amd/vulkan/radv_descriptor_set.c |   55 +++
 src/amd/vulkan/radv_device.c |   32 +
 src/broadcom/compiler/v3d_compiler.c |   43 --
 src/compiler/glsl/ast_to_hir.cpp |2 
 src/compiler/glsl/link_atomics.cpp   |4 
 src/compiler/glsl/link_uniforms.cpp  |   17 -
 src/compiler/glsl/link_varyings.cpp  |   24 -
 src/compiler/glsl/linker.cpp |  168 
++
 src/compiler/glsl/shader_cache.cpp   |6 
 src/compiler/nir/nir.h   |1 
 src/compiler/nir/nir_print.c |2 
 src/compiler/spirv/spirv_to_nir.c|   12 
 src/compiler/spirv/vtn_private.h |1 
 src/compiler/spirv/vtn_variables.c   |1 
 src/egl/drivers/dri2/platform_wayland.c  |   32 +
 src/gallium/auxiliary/tgsi/tgsi_exec.c   |2 
 src/gallium/drivers/r600/r600_shader.c   |   13 
 src/gallium/drivers/swr/rasterizer/common/simdlib_512_avx512.inl |   12 
 src/gallium/drivers/swr/rasterizer/common/simdlib_512_emu.inl|   34 --
 src/gallium/drivers/vc5/Makefile.sources |1 
 src/gallium/targets/opencl/Makefile.am   |2 
 src/glx/dri3_glx.c   |3 
 src/glx/drisw_glx.c  |6 
 src/intel/Makefile.am|3 
 src/intel/Makefile.common.am |2 
 src/intel/blorp/blorp.h  |7 
 src/intel/blorp/blorp_genX_exec.h|   20 -
 src/intel/compiler/brw_fs.cpp|   94 +++--
 src/intel/compiler/brw_fs_generator.cpp  |   75 ++--
 src/intel/compiler/brw_fs_nir.cpp|  128 ++-
 src/intel/compiler/brw_fs_visitor.cpp|   60 +--
 src/intel/compiler/brw_nir.c |   63 ++-
 src/intel/compiler/brw_nir.h |4 
 src/intel/compiler/brw_reg.h |   16 
 src/intel/tools/aubinator_error_decode.c |2 
 src/intel/vulkan/anv_blorp.c |   68 ++--
 src/intel/vulkan/genX_blorp_exec.c   |1 
 src/intel/vulkan/genX_cmd_buffer.c   |   11 
 src/loader/loader_dri3_helper.c  |   77 +++-
 src/loader/loader_dri3_helper.h  |   10 
 src/mesa/drivers/dri/i965/brw_blorp.c|   32 +
 src/mesa/drivers/dri/i965/brw_context.c  |1 
 src/mesa/drivers/dri/i965/brw_defines.h  |2 
 src/mesa/drivers/dri/i965/brw_draw.c |4 
 src/mesa/drivers/dri/i965/brw_link.cpp   |   43 --
 src/mesa/drivers/dri/i965/brw_misc_state.c   |9 
 src/mesa/drivers/dri/i965/brw_pipe_control.c |   52 ++-
 src/mesa/drivers/dri/i965/brw_state.h|1 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   21 -
 src/mesa/drivers/dri/i965/gen7_l3_state.c|2 
 src/mesa/drivers/dri/i965/genX_blorp_exec.c  |   10 
 src/mesa/drivers/dri/i965/genX_state_upload.c|2 
 src/mesa/drivers/dri/i965/intel_batchbuffer.c|4 
 src/mesa/drivers/dri/i965/intel_blit.c   |   15 
 src/mesa/main/mtypes.h   |7 
 src/mesa/main/shaderobj.c|   60 ---
 src/mesa/main/shaderobj.h|3 
 src/mesa/program/ir_to_mesa.cpp  |2 
 64 files changed, 873 insertions(+), 561 deletions(-)

New commits:
commit d1e6cf4639cd771c5896fb82d549cf5c5681a9f8
Author: Emil Velikov 
Date:   Mon Nov 20 13:59:12 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION  |2 
 src/amd/vulkan/radv_device.c |  135 
 src/amd/vulkan/radv_pipeline_cache.c |  154 ---
 src/amd/vulkan/radv_private.h|3 
 src/amd/vulkan/radv_wsi.c|   16 ++
 src/compiler/nir/nir_opt_intrinsics.c|   24 +++
 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c |4 
 src/gallium/drivers/etnaviv/etnaviv_emit.c   |4 
 src/gallium/drivers/etnaviv/etnaviv_rs.c |1 
 src/gallium/drivers/etnaviv/etnaviv_rs.h |2 
 src/gallium/drivers/i915/i915_state_derived.c|   17 ++
 src/gallium/drivers/i915/i915_state_dynamic.c|3 
 src/gallium/drivers/i915/i915_state_immediate.c  |6 
 src/gallium/drivers/i915/i915_state_static.c |2 
 src/gallium/drivers/r600/sb/sb_sched.cpp |   43 --
 src/gallium/drivers/r600/sb/sb_sched.h   |8 -
 src/gallium/drivers/radeonsi/si_shader_nir.c |3 
 src/gallium/targets/dri/Android.mk   |5 
 src/intel/compiler/brw_fs.cpp|   33 
 src/mesa/drivers/dri/i965/brw_draw.c |   47 ++-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c|   29 
 src/util/disk_cache.c|2 
 22 files changed, 353 insertions(+), 190 deletions(-)

New commits:
commit 19b62847e0c3465c81efa949fea41b32a0c8c0dc
Author: Emil Velikov 
Date:   Tue Nov 7 11:51:45 2017 +

pdate version to 17.3.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 00ea172..0c573cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.0-rc2
+17.3.0-rc3

commit d5cc7e47a8ad6c3ebaeecb733190d19966d49109
Author: Plamena Manolova 
Date:   Mon Oct 30 21:14:24 2017 +

i965: Fix ARB_indirect_parameters logic.

This patch modifies the ARB_indirect_parameters logic in
brw_draw_prims, so that our implementation isn't affected if
another application attempts to use predicates. Previously we
were using a predicate with a DELTAS_EQUAL comparison operation
and relying on the MI_PREDICATE_DATA register being 0. Our code
to initialize MI_PREDICATE_DATA to 0 was incorrect, so we were
accidentally using whatever value was written there. Because the
kernel does not initialize the MI_PREDICATE_DATA register on
hardware context creation, we might inherit the value from whatever
context was last running on the GPU (likely another process).
The Haswell command parser also does not currently allow us to write
the MI_PREDICATE_DATA register. Rather than fixing this and requiring
an updated kernel, we switch to a different approach which uses a
SRCS_EQUAL predicate that makes no assumptions about the states of any
of the predicate registers.

Fixes Piglit's spec/arb_indirect_parameters/tf-count-arrays test.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103085
Signed-off-by: Plamena Manolova 
Reviewed-by: Kenneth Graunke 
(cherry picked from commit 048d4c45c94eb8d99f2a53f3bf200b2c6a9f9629)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 1e5c499..ecd1d67 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -875,7 +875,6 @@ brw_draw_prims(struct gl_context *ctx,
struct brw_context *brw = brw_context(ctx);
const struct gl_vertex_array **arrays = ctx->Array._DrawArrays;
int predicate_state = brw->predicate.state;
-   int combine_op = MI_PREDICATE_COMBINEOP_SET;
struct brw_transform_feedback_object *xfb_obj =
   (struct brw_transform_feedback_object *) gl_xfb_obj;
 
@@ -919,49 +918,35 @@ brw_draw_prims(struct gl_context *ctx,
 * to it.
 */
 
-if (brw->draw.draw_params_count_bo &&
-predicate_state == BRW_PREDICATE_STATE_USE_BIT) {
-  /* We need to empty the MI_PREDICATE_DATA register since it might
-   * already be set.
-   */
-
-  BEGIN_BATCH(4);
-  OUT_BATCH(MI_PREDICATE_DATA);
-  OUT_BATCH(0u);
-  OUT_BATCH(MI_PREDICATE_DATA + 4);
-  OUT_BATCH(0u);
-  ADVANCE_BATCH();
-
-  /* We need to combine the results of both predicates.*/
-  combine_op = MI_PREDICATE_COMBINEOP_AND;
-   }
-
for (i = 0; i < nr_prims; i++) {
   /* Implementation of ARB_indirect_parameters via predicates */
   if (brw->draw.draw_params_count_bo) {
- struct brw_bo *draw_id_bo = NULL;
- uint32_t draw_id_offset;
-
- intel_upload_data(brw, [i].draw_id, 4, 4, _id_bo,
-   _id_offset);
-
  brw_emit_pipe_control_flush(brw, PIPE_CONTROL_FLUSH_ENABLE);
 
+ /* Upload the current draw count from the draw parameters buffer to
+  * 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 src/amd/common/ac_nir_to_llvm.c   |6 
 src/amd/common/ac_surface.c   |   32 +
 src/amd/vulkan/radv_device.c  |9 
 src/amd/vulkan/radv_pipeline.c|   17 -
 src/amd/vulkan/radv_pipeline_cache.c  |2 
 src/amd/vulkan/radv_shader.c  |3 
 src/compiler/Makefile.sources |1 
 src/compiler/glsl/builtin_variables.cpp   |   94 -
 src/compiler/glsl/glsl_parser_extras.cpp  |2 
 src/compiler/glsl/ir.h|4 
 src/compiler/glsl/ir_optimization.h   |1 
 src/compiler/glsl/linker.cpp  |3 
 src/compiler/glsl/lower_cs_derived.cpp|  234 ++
 src/compiler/glsl/meson.build |1 
 src/compiler/glsl/opt_dead_builtin_variables.cpp  |   22 -
 src/compiler/nir/nir_intrinsics.h |2 
 src/compiler/spirv/spirv_to_nir.c |3 
 src/egl/meson.build   |9 
 src/egl/wayland/wayland-egl/Makefile.am   |2 
 src/egl/wayland/wayland-egl/meson.build   |1 
 src/gallium/drivers/radeon/radeon_video.c |5 
 src/gallium/drivers/radeonsi/driinfo_radeonsi.h   |2 
 src/gallium/drivers/radeonsi/si_blit.c|   10 
 src/gallium/drivers/radeonsi/si_pipe.c|4 
 src/gallium/drivers/radeonsi/si_pipe.h|2 
 src/gallium/drivers/radeonsi/si_shader.c  |   13 
 src/gallium/drivers/vc4/vc4_cl.h  |   12 
 src/gallium/state_trackers/clover/llvm/codegen/common.cpp |5 
 src/gallium/state_trackers/clover/llvm/compat.hpp |   12 
 src/intel/compiler/brw_eu_emit.c  |2 
 src/intel/compiler/brw_eu_validate.c  |3 
 src/intel/compiler/brw_fs.cpp |4 
 src/intel/compiler/brw_fs_generator.cpp   |1 
 src/intel/vulkan/anv_pipeline.c   |3 
 src/mesa/drivers/dri/i965/brw_blorp.c |   26 -
 src/mesa/drivers/dri/i965/brw_context.c   |6 
 src/mesa/drivers/dri/i965/brw_draw.c  |   13 
 src/mesa/drivers/dri/i965/brw_state_upload.c  |   24 -
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   13 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |   23 -
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h |9 
 src/mesa/drivers/dri/i965/intel_screen.c  |2 
 src/mesa/main/bufferobj.c |6 
 src/mesa/main/fbobject.c  |9 
 src/util/drirc|2 
 src/util/xmlpool/t_options.h  |6 
 47 files changed, 425 insertions(+), 242 deletions(-)

New commits:
commit 3eb187f3760866143a9aebe904aefa0e7b0105aa
Author: Emil Velikov 
Date:   Mon Oct 30 13:52:46 2017 +

Update version to 17.3.0-rc2

diff --git a/VERSION b/VERSION
index dd84678..00ea172 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.0-rc1
+17.3.0-rc2

commit 0c20849f9c30864d5aa183aaf7075916bb7ea4f2
Author: Eric Engestrom 
Date:   Thu Oct 26 17:13:47 2017 +0100

wayland-egl: fix wayland cflags

Fixes: 80bfff5c4f1d4d8c842a0 "wayland-egl: adds CFLAGS for wayland.egl.h 
include"
Suggested-by: Daniel Stone 
Signed-off-by: Eric Engestrom 
Acked-by: Emil Velikov 
Acked-by: Tobias Klausmann 
(cherry picked from commit 866c8a94d45fd88ea1e3a49c00a0ee5e589e4577)

diff --git a/src/egl/wayland/wayland-egl/Makefile.am 
b/src/egl/wayland/wayland-egl/Makefile.am
index 730fd03..7dde955 100644
--- a/src/egl/wayland/wayland-egl/Makefile.am
+++ b/src/egl/wayland/wayland-egl/Makefile.am
@@ -3,7 +3,7 @@ pkgconfig_DATA = wayland-egl.pc
 
 AM_CFLAGS = $(DEFINES) \
$(VISIBILITY_CFLAGS) \
-   $(WAYLAND_SERVER_CFLAGS)
+   $(WAYLAND_CLIENT_CFLAGS)
 
 lib_LTLIBRARIES = libwayland-egl.la
 noinst_HEADERS = wayland-egl-backend.h

commit fb09360ea51140ef84f5516ae668299d7a48cc77
Author: Eric Engestrom 
Date:   Wed Oct 25 14:08:58 2017 +0100

vc4: fix release build

Mesa's DEBUG and assert's NDEBUG are not tied to each other, so we need
to explicitly compile this code out.

Fixes: 3df78928786134874eafa "vc4: Drop reloc_count tracking for debug
   asserts on 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

Rebased ref, commits from common ancestor:
commit ae720e28735453f97db23a7345ed109b0b40b300
Author: Emil Velikov 
Date:   Mon Oct 23 13:30:56 2017 +0100

Update version to 17.3.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 12c2e3a..dd84678 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.0-devel
+17.3.0-rc1

commit 2665d012a8a12971c87861e789a520951df42f3c
Author: Juan A. Suarez Romero 
Date:   Thu Oct 19 12:46:02 2017 +0200

radv: automake: include radv_extensions.py in the tarball

Reviewed-by: Samuel Pitoiset 
Reviewed-by: Emil Velikov 

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 7364e54..6b352ae 100644
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -132,6 +132,7 @@ EXTRA_DIST = \
dev_icd.json.in \
radeon_icd.json.in \
radv_entrypoints_gen.py \
+   radv_extensions.py \
vk_format_layout.csv \
vk_format_parse.py \
vk_format_table.py

commit a548b727a147b4ead1accef10499c4cf81af3057
Author: Bas Nieuwenhuizen 
Date:   Mon Oct 23 03:27:28 2017 +0200

ac/nir: Only clamp shadow reference on radeonsi.

Vulkan CTS does not expect the value to be clamped (at least for D32),
and it makes a differences even though depth is in [0,1], due
to strict inequalities.

I couldn't find anything in the Vulkan spec about this, but the test
seemed to be copied from GL tests and the GL spec only specifies
clamping for fixed point formats. Hence I expect radeonsi to run into
this at some point as well, but given that they still have a usecase
with the Z16->Z32 promotion, I'll leave that for someone else to clean
up.

This at least fixes radv dEQP-VK.texture.shadow.* on VI.

Fixes: 0f9e32519bb 'ac/nir: clamp shadow texture comparison value on VI'
Reviewed-by: Dave Airlie 

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 5e5a46a..2ddc748 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4652,14 +4652,14 @@ static void visit_tex(struct ac_nir_context *ctx, 
nir_tex_instr *instr)
LLVMValueRef z = ac_to_float(>ac,
 llvm_extract_elem(>ac, 
comparator, 0));
 
-   /* TC-compatible HTILE promotes Z16 and Z24 to Z32_FLOAT,
+   /* TC-compatible HTILE on radeonsi promotes Z16 and Z24 to 
Z32_FLOAT,
 * so the depth comparison value isn't clamped for Z16 and
 * Z24 anymore. Do it manually here.
 *
 * It's unnecessary if the original texture format was
 * Z32_FLOAT, but we don't know that here.
 */
-   if (ctx->ac.chip_class == VI)
+   if (ctx->ac.chip_class == VI && 
ctx->abi->clamp_shadow_reference)
z = ac_build_clamp(>ac, z);
 
address[count++] = z;
@@ -6600,6 +6600,7 @@ LLVMModuleRef 
ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
ctx.abi.emit_outputs = handle_shader_outputs_post;
ctx.abi.load_ssbo = radv_load_ssbo;
ctx.abi.load_sampler_desc = radv_get_sampler_desc;
+   ctx.abi.clamp_shadow_reference = false;
 
if (shader_count >= 2)
ac_init_exec_full_mask();
diff --git a/src/amd/common/ac_nir_to_llvm.h b/src/amd/common/ac_nir_to_llvm.h
index 9579aee..1d9ec8c 100644
--- a/src/amd/common/ac_nir_to_llvm.h
+++ b/src/amd/common/ac_nir_to_llvm.h
@@ -80,6 +80,7 @@ struct ac_nir_compiler_options {
struct ac_shader_variant_key key;
bool unsafe_math;
bool supports_spill;
+   bool clamp_shadow_reference;
enum radeon_family family;
enum chip_class chip_class;
 };
diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index 5f296be..14517d5 100644
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -88,6 +88,10 @@ struct ac_shader_abi {
  LLVMValueRef index,
  enum ac_descriptor_type desc_type,
  bool image, bool write);
+
+   /* Whether to clamp the shadow reference value to [0,1]on VI. Radeonsi 
currently
+* uses it due to promoting D16 to D32, but radv needs it off. */
+   bool clamp_shadow_reference;
 };
 
 #endif /* AC_SHADER_ABI_H */
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c 
b/src/gallium/drivers/radeonsi/si_shader_nir.c
index a2d1753..e186661 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -498,6 +498,7 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, 
struct 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk |4 
 Android.mk|   12 
 VERSION   |2 
 bin/.cherry-ignore|4 
 configure.ac  |   24 
 include/EGL/egl.h |6 
 include/EGL/eglext.h  |   73 +
 include/KHR/khrplatform.h |   10 
 src/amd/Android.common.mk |4 
 src/amd/common/ac_nir_to_llvm.c   |   50 -
 src/amd/common/ac_surface.c   |5 
 src/amd/vulkan/radv_cmd_buffer.c  |   25 
 src/amd/vulkan/radv_descriptor_set.c  |1 
 src/amd/vulkan/radv_device.c  |6 
 src/amd/vulkan/radv_formats.c |4 
 src/amd/vulkan/radv_image.c   |   94 +-
 src/amd/vulkan/radv_meta_clear.c  |2 
 src/amd/vulkan/radv_meta_resolve.c|7 
 src/amd/vulkan/radv_meta_resolve_cs.c |   15 
 src/amd/vulkan/radv_meta_resolve_fs.c |7 
 src/amd/vulkan/radv_pipeline.c|  131 ++
 src/amd/vulkan/radv_private.h |3 
 src/amd/vulkan/radv_wsi.c |8 
 src/amd/vulkan/si_cmd_buffer.c|   19 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c |1 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c |5 
 src/compiler/Makefile.sources |4 
 src/compiler/glsl/ast_to_hir.cpp  |2 
 src/compiler/glsl/ir_constant_expression.cpp  |2 
 src/compiler/glsl/link_uniform_initializers.cpp   |2 
 src/compiler/glsl/link_uniforms.cpp   |2 
 src/compiler/glsl/link_varyings.cpp   |3 
 src/compiler/glsl/linker.cpp  |2 
 src/compiler/glsl/opt_constant_propagation.cpp|6 
 src/compiler/glsl/shader_cache.cpp|2 
 src/compiler/glsl/standalone.cpp  |2 
 src/compiler/glsl/string_to_uint_map.cpp  |   42 
 src/compiler/glsl/string_to_uint_map.h|  177 +++
 src/compiler/glsl/tests/set_uniform_initializer_tests.cpp |2 
 src/compiler/nir/nir.c|8 
 src/egl/drivers/dri2/egl_dri2.c   |3 
 src/egl/drivers/dri2/platform_wayland.c   |   26 
 src/egl/generate/egl.xml  |  626 +-
 src/egl/generate/eglFunctionList.py   |4 
 src/gallium/auxiliary/os/os_time.c|9 
 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir.cpp   |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |7 
 src/gallium/drivers/radeon/Android.mk |2 
 src/gallium/drivers/radeon/r600_pipe_common.c |1 
 src/gallium/drivers/radeon/r600_pipe_common.h |4 
 src/gallium/drivers/radeon/r600_texture.c |9 
 src/gallium/drivers/radeonsi/Android.mk   |2 
 src/gallium/drivers/radeonsi/si_descriptors.c |   85 +
 src/gallium/drivers/radeonsi/si_pipe.c|   24 
 src/gallium/drivers/radeonsi/si_state.c   |6 
 src/gallium/drivers/radeonsi/si_state_draw.c  |6 
 src/gallium/drivers/radeonsi/si_state_shaders.c   |   11 
 src/gallium/drivers/swr/rasterizer/core/api.cpp   |2 
 src/gallium/drivers/swr/rasterizer/core/context.h |8 
 src/gallium/drivers/swr/rasterizer/core/threads.cpp   |4 
 src/gallium/drivers/vc4/Android.mk|4 
 src/gallium/drivers/vc4/Makefile.am   |8 
 src/gallium/drivers/vc4/Makefile.sources  |3 
 src/gallium/drivers/vc4/vc4_tiling.h  |   17 
 src/gallium/state_trackers/wgl/stw_framebuffer.c  |7 
 src/glx/glxcmds.c |2 
 src/intel/blorp/blorp_blit.c  |1 
 src/intel/genxml/gen10.xml|4 
 src/mesa/drivers/dri/i965/brw_blorp.c |   16 
 src/mesa/drivers/dri/i965/brw_bufmgr.c|   16 
 src/mesa/drivers/dri/i965/brw_clear.c |   14 
 src/mesa/drivers/dri/i965/brw_context.c   |8 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |2 
 src/amd/common/ac_binary.c|   12 +
 src/amd/common/ac_binary.h|2 
 src/amd/common/ac_nir_to_llvm.c   |   18 +
 src/amd/vulkan/radv_cmd_buffer.c  |5 
 src/amd/vulkan/radv_device.c  |   10 -
 src/amd/vulkan/radv_meta.c|   46 
 src/amd/vulkan/radv_meta.h|1 
 src/amd/vulkan/radv_meta_decompress.c |  102 +++---
 src/amd/vulkan/radv_meta_resolve.c|5 
 src/amd/vulkan/radv_meta_resolve_cs.c |   48 -
 src/amd/vulkan/radv_meta_resolve_fs.c |   38 +---
 src/amd/vulkan/radv_private.h |4 
 src/amd/vulkan/vk_format.h|   23 ++
 src/egl/drivers/dri2/platform_x11.c   |1 
 src/egl/main/eglapi.c |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |8 
 src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c |2 
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c   |5 
 src/gallium/drivers/radeonsi/si_state.c   |   12 -
 src/intel/isl/isl.c   |  131 +-
 src/intel/vulkan/anv_formats.c|3 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |   13 -
 25 files changed, 230 insertions(+), 268 deletions(-)

New commits:
commit 3165f9877e65efd950b37eb9abc21bed8d13e2f0
Author: Emil Velikov 
Date:   Sat Aug 12 17:04:27 2017 +0100

Update version to 17.2.0-rc4

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index fd4078e..c879616 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.0-rc3
+17.2.0-rc4

commit 1e11687029372dc0f945d5e7a088b6c3ea75d531
Author: Dave Airlie 
Date:   Wed Jul 26 04:37:53 2017 +0100

radv: force cs/ps/l2 flush at end of command stream. (v2)

This seems like a workaround, but we don't see the bug on CIK/VI.

On SI with the dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.*
tests, when one tests complete, the first flush at the start of the next
test causes a VM fault as we've destroyed the VM, but we end up flushing
the compute shader then, and it must still be in the process of doing
something.

Could also be a kernel difference between SI and CIK.

v2: hit this with a bigger hammer. This fixes a bunch of hangs
in the vk cts with the robustness tests.

Fixes: f4e499ec791 ("radv: add initial non-conformant radv vulkan driver")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101334
Acked-by: Bas Nieuwenhuizen 
Signed-off-by: Dave Airlie 
(cherry picked from commit 82ba384c10d598bee4786ef5f79e92a0e7b53892)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 4b08781..c73b5f4 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2233,8 +2233,11 @@ VkResult radv_EndCommandBuffer(
 {
RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
 
-   if (cmd_buffer->queue_family_index != RADV_QUEUE_TRANSFER)
+   if (cmd_buffer->queue_family_index != RADV_QUEUE_TRANSFER) {
+   if (cmd_buffer->device->physical_device->rad_info.chip_class == 
SI)
+   cmd_buffer->state.flush_bits |= 
RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_PS_PARTIAL_FLUSH | 
RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2;
si_emit_cache_flush(cmd_buffer);
+   }
 
if (!cmd_buffer->device->ws->cs_finalize(cmd_buffer->cs) ||
cmd_buffer->record_fail)

commit ea595756f80db74cce174a7a2817587189ec7840
Author: Dave Airlie 
Date:   Mon Aug 7 07:39:41 2017 +0100

radv: fix MSAA on SI gpus.

This ports the workaround from radeonsi, that was missing in radv.

This fixes Talos rendering when MSAA is enabled on my Tahiti card.

Reviewed-by: Bas Nieuwenhuizen 
Fixes: f4e499ec7 (radv: add initial non-conformant radv vulkan driver)
Signed-off-by: Dave Airlie 
(cherry picked from commit 8bf39307517a04263532e3c5a49b5be1f4a99032)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 7cf4b12..47a0c7b 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3079,9 +3079,13 @@ radv_initialise_color_surface(struct radv_device *device,
format 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION |2 
 include/GLES/gl.h   |   15 -
 include/GLES/glext.h|3 -
 src/amd/common/ac_llvm_build.c  |   57 ++--
 src/amd/common/ac_llvm_build.h  |1 
 src/amd/common/ac_nir_to_llvm.c |   38 -
 src/amd/common/ac_nir_to_llvm.h |1 
 src/amd/vulkan/radv_device.c|6 +-
 src/amd/vulkan/radv_meta_blit.c |2 
 src/amd/vulkan/radv_meta_blit2d.c   |2 
 src/amd/vulkan/radv_meta_clear.c|2 
 src/amd/vulkan/radv_meta_resolve_fs.c   |2 
 src/amd/vulkan/radv_pipeline.c  |   37 +---
 src/amd/vulkan/radv_private.h   |2 
 src/compiler/nir/nir_opt_algebraic.py   |4 -
 src/compiler/spirv/spirv_to_nir.c   |2 
 src/gallium/drivers/radeon/r600_query.c |3 -
 src/gallium/drivers/radeonsi/si_shader.c|   16 -
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c |2 
 src/gallium/drivers/swr/SConscript  |2 
 src/gallium/state_trackers/dri/dri_screen.c |   12 
 src/gallium/state_trackers/osmesa/osmesa.c  |   11 +++
 src/intel/compiler/brw_vec4_gs_visitor.cpp  |1 
 src/intel/vulkan/anv_device.c   |4 -
 src/loader/loader_dri3_helper.c |   18 ++
 src/loader/loader_dri3_helper.h |3 +
 src/mesa/drivers/dri/i965/intel_blit.c  |5 -
 src/mesa/drivers/dri/i965/intel_pixel_bitmap.c  |2 
 src/mesa/main/uniform_query.cpp |3 -
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |   56 ++-
 src/mesa/state_tracker/st_manager.c |2 
 31 files changed, 212 insertions(+), 104 deletions(-)

New commits:
commit 29df4deef2743f0474902a4e467bac76b5403adf
Author: Emil Velikov 
Date:   Mon Aug 7 12:45:40 2017 +0100

Update version to 17.2.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index f309d4a..fd4078e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.0-rc2
+17.2.0-rc3

commit e4371d14f17049e4878966de60cfb88e8cd137cb
Author: Jason Ekstrand 
Date:   Mon Jul 31 11:27:23 2017 -0700

anv: Stop advertising VK_KHX_multiview

We don't want to advertise experimental extensions in actual releases.
However, there's no harm in leaving the code lying around in the tree.

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index c72a100..f69ebfc 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -496,10 +496,6 @@ static const VkExtensionProperties device_extensions[] = {
   .extensionName = VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME,
   .specVersion = 1,
},
-   {
-  .extensionName = VK_KHX_MULTIVIEW_EXTENSION_NAME,
-  .specVersion = 1,
-   },
 };
 
 static void *

commit 0b2c034f6457ef62cc20d308a91620116cdc057d
Author: Tomasz Figa 
Date:   Sun Jul 30 00:02:46 2017 +0900

st/dri: enable 32-bit RGBX/RGBA formats only on Android

X/GLX can't handle them. This removes almost 500 GLX visuals that were
incorrectly exposed.

This is a less invasive version of Marek's .getCapability series.
Note: the patch is not applicable for master, but only for the 17.2
branch.

Suggested-by: Marek Olšák 
Signed-off-by: Tomasz Figa 
CC: 
Fixes: f33d8af7aa354d "st/dri: add 32-bit RGBX/RGBA formats"
[Emil Velikov: commit message polish]
Reviewed-by: Emil Velikov 

diff --git a/src/gallium/state_trackers/dri/dri_screen.c 
b/src/gallium/state_trackers/dri/dri_screen.c
index 59a850b..6bd4790 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -133,6 +133,11 @@ dri_fill_in_modes(struct dri_screen *screen)
   MESA_FORMAT_B8G8R8A8_SRGB,
   MESA_FORMAT_B8G8R8X8_SRGB,
   MESA_FORMAT_B5G6R5_UNORM,
+#ifdef ANDROID
+  /*
+   * To reduce the risk of breaking non-Android users in stable release
+   * let's keep these for Android alone until this is handled properly.
+   */
 
   /* The 32-bit RGBA format must not precede the 32-bit BGRA format.
* Likewise for RGBX and BGRX.  Otherwise, the GLX client and the GLX
@@ -154,6 +159,7 @@ dri_fill_in_modes(struct dri_screen *screen)
 
   /* Required by Android, for HAL_PIXEL_FORMAT_RGBX_. */
   MESA_FORMAT_R8G8B8X8_UNORM,
+#endif
};
static const enum pipe_format pipe_formats[] = {
   

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 src/amd/common/ac_nir_to_llvm.c|   13 -
 src/amd/common/ac_surface.c|   12 +
 src/amd/vulkan/radv_device.c   |   17 +
 src/amd/vulkan/radv_image.c|5 
 src/egl/drivers/dri2/platform_wayland.c|4 
 src/egl/main/eglcontext.c  |   21 -
 src/gallium/drivers/r600/r600_pipe.h   |4 
 src/gallium/drivers/radeon/r600_pipe_common.c  |   39 ++-
 src/gallium/drivers/radeon/r600_pipe_common.h  |5 
 src/gallium/drivers/radeonsi/si_blit.c |   31 +-
 src/gallium/drivers/radeonsi/si_pipe.c |6 
 src/gallium/drivers/radeonsi/si_pipe.h |   10 
 src/gallium/drivers/radeonsi/si_shader.c   |  116 
++---
 src/gallium/drivers/radeonsi/si_shader_internal.h  |3 
 src/gallium/drivers/radeonsi/si_state.c|   43 +++
 src/gallium/drivers/radeonsi/si_state.h|1 
 src/gallium/drivers/radeonsi/si_state_draw.c   |   31 --
 src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp |   21 +
 src/gallium/drivers/swr/swr_draw.cpp   |   39 ++-
 src/gallium/drivers/swr/swr_shader.cpp |   32 ++
 src/gallium/drivers/swr/swr_shader.h   |3 
 src/gallium/drivers/swr/swr_state.cpp  |5 
 src/gallium/drivers/vc4/vc4_blit.c |   14 -
 src/gallium/drivers/virgl/virgl_encode.c   |2 
 src/gallium/drivers/virgl/virgl_tgsi.c |   10 
 src/gallium/include/state_tracker/st_api.h |   21 +
 src/gallium/state_trackers/dri/dri2.c  |   36 ++-
 src/gallium/state_trackers/dri/dri_drawable.c  |1 
 src/gallium/state_trackers/dri/dri_screen.c|3 
 src/gallium/state_trackers/glx/xlib/xm_api.c   |3 
 src/gallium/state_trackers/glx/xlib/xm_st.c|1 
 src/gallium/state_trackers/wgl/stw_device.c|3 
 src/gallium/state_trackers/wgl/stw_st.c|1 
 src/intel/vulkan/anv_cmd_buffer.c  |2 
 src/intel/vulkan/anv_private.h |2 
 src/mesa/drivers/dri/i965/brw_blorp.c  |2 
 src/mesa/drivers/dri/i965/brw_performance_query.c  |   16 -
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c   |6 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |2 
 src/mesa/state_tracker/st_manager.c|  119 
+++---
 41 files changed, 510 insertions(+), 197 deletions(-)

New commits:
commit 58fe86a6d69c1169cff0c0b3084c906dbda7e266
Author: Emil Velikov 
Date:   Mon Jul 31 10:52:13 2017 +0100

Update version to 17.2.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 8530591..f309d4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.0-rc1
+17.2.0-rc2

commit d466a7053247fb76f23d7cdaf1745aa9c9bd7fd5
Author: Samuel Pitoiset 
Date:   Thu Jul 27 17:12:09 2017 +0200

st/glsl_to_tgsi: fix getting the image type for array of structs

Since array splitting for AoA is disabled, we have to retrieve
the type of the first non-array type when an array of images is
declared inside a structure. Otherwise, it will hit an assert
in glsl_type::sampler_index() because it expects either a sampler
or an image type.

This fixes a regression in the following piglit test:
arb_bindless_texture/compiler/images/arrays-of-struct.frag

Fixes: 57165f2ef8 ("glsl: disable array splitting for AoA")
Cc: 17.2 
Signed-off-by: Samuel Pitoiset 
Reviewed-by: Marek Olšák 
(cherry picked from commit f99e9335e2ca46ec8ead00b63e79f800fec75592)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp 
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index baa8359..3983fe7 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -3790,7 +3790,7 @@ get_image_qualifiers(ir_dereference *ir, const glsl_type 
**type,
   for (unsigned i = 0; i < struct_type->length; i++) {
  if (!strcmp(struct_type->fields.structure[i].name,
  

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit a455f594bb6af2b2d8b61775c3774667db15c4a7
Author: Emil Velikov 
Date:   Mon Jul 24 14:43:29 2017 +0100

Update version to 17.2.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 250d02e..8530591 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.0-devel
+17.2.0-rc1

commit a955622c1aee4a89f3d38aa3f3d073a527f1ba32
Author: Emil Velikov 
Date:   Mon Jul 24 15:12:52 2017 +0100

intel/blorp: ship blorp_genX_exec.h within the tarball

Fixes: c9cb37b2a6c ("intel/blorp: Add a partial resolve pass for MCS")
Signed-off-by: Emil Velikov 
(cherry picked from commit 5d47dd9c2a7b3a64429aaf7863b5cdad68b683ec)

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 17027cf..2b3065e 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -3,6 +3,7 @@ BLORP_FILES = \
blorp/blorp.h \
blorp/blorp_blit.c \
blorp/blorp_clear.c \
+   blorp/blorp_nir_builder.h \
blorp/blorp_genX_exec.h \
blorp/blorp_priv.h
 

commit 33236a306d1567dd4a9fee09bbfc48fb8afcd7b2
Author: Emil Velikov 
Date:   Mon Jul 24 13:22:06 2017 +0100

egl: guard wayland header dep. tracking behind HAVE_PLATFORM_WAYLAND

Otherwise we'll attemt to generate the header even we don't need to.
In that case the dependencies may not be met, leading to build failure.

Fixes: 166852e "configure.ac: rework wayland-protocols handling"
Signed-off-by: Emil Velikov 
Reviewed-by: Tapani Pälli 

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index f881145..ecaf148 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -74,10 +74,10 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: 
$(WL_DMABUF_XML)
$(MKDIR_GEN)
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
 
+if HAVE_PLATFORM_WAYLAND
 drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: 
drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
 drivers/dri2/egl_dri2.lo: 
drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
 
-if HAVE_PLATFORM_WAYLAND
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
 libEGL_common_la_LIBADD += $(LIBDRM_LIBS)

commit da9e6fdfe27065b8ede8b2fe30c83b573245
Author: Emil Velikov 
Date:   Mon Jul 24 10:10:49 2017 +0100

swrast: add dri2ConfigQueryExtension to the correct extension list

The extension should be in the list as returned by getExtensions().
Seems to have gone unnoticed since close to nobody wants to change the
vblank mode for the software driver.

Signed-off-by: Emil Velikov 
Reviewed-by: Alex Deucher 

diff --git a/src/mesa/drivers/dri/swrast/swrast.c 
b/src/mesa/drivers/dri/swrast/swrast.c
index 43aef9a..7de90d3 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -208,6 +208,7 @@ static const __DRI2rendererQueryExtension 
swrast_query_renderer_extension = {
 static const __DRIextension *dri_screen_extensions[] = {
 ,
 _query_renderer_extension.base,
+,
 ,
 NULL
 };

commit 3057ca9a50122b7cde701931a34b9e1fdcbbf833
Author: Emil Velikov 
Date:   Mon Jul 24 10:35:04 2017 +0100

wayland-egl: update the SHA1 of the commit introducing v3

Signed-off-by: Emil Velikov 

diff --git a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c 
b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
index 40b54c6..4ea3854 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
@@ -78,7 +78,7 @@ struct wl_egl_window_v2 {
 void (*destroy_window_callback)(void *);
 };
 
-/* From: XXX - Miguel A. Vico : wayland-egl: Make wl_egl_window a versioned 
struct */
+/* From: 2d5d61bc49 - Miguel A. Vico : wayland-egl: Make wl_egl_window a 
versioned struct */
 #define WL_EGL_WINDOW_VERSION_v3 3
 struct wl_egl_window_v3 {
 const intptr_t version;

commit b6356c023d93ac28bbff552364936cc6087218b6
Author: Miguel A. Vico 
Date:   Wed Jul 19 17:27:58 2017 -0700

wayland-egl: Update ABI checker

This change updates wayland-egl-abi-check.c with the latest changes to
wl_egl_window.

Signed-off-by: Miguel A. Vico 
Reviewed-by: James Jones 
Acked-by: Daniel Stone 
Reviewed-by: Emil Velikov 

diff --git a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c 
b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
index 9701ea1..40b54c6 100644
--- 

mesa: Changes to 'upstream-experimental'

[Emilio Pozuelo Monfort]

 VERSION |2 
 configure.ac|   10 -
 docs/relnotes/17.1.2.html   |3 
 docs/relnotes/17.1.3.html   |  155 
 src/amd/vulkan/radv_cmd_buffer.c|   73 ++-
 src/amd/vulkan/radv_device.c|2 
 src/amd/vulkan/radv_image.c |3 
 src/amd/vulkan/radv_meta.c  |5 
 src/amd/vulkan/radv_query.c |5 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c   |   14 +-
 src/compiler/glsl/lower_distance.cpp|2 
 src/egl/drivers/dri2/platform_android.c |4 
 src/egl/drivers/dri2/platform_drm.c |2 
 src/egl/drivers/dri2/platform_wayland.c |2 
 src/egl/main/eglsurface.c   |6 
 src/gallium/drivers/etnaviv/etnaviv_transfer.c  |9 -
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c  |   19 ++
 src/gallium/drivers/radeonsi/si_pipe.h  |1 
 src/gallium/drivers/radeonsi/si_state_draw.c|   41 +++---
 src/gallium/drivers/swr/Makefile.am |4 
 src/gallium/drivers/swr/SConscript  |2 
 src/gallium/drivers/swr/rasterizer/core/state.h |   27 ++--
 src/gallium/targets/libgl-xlib/Makefile.am  |1 
 src/glx/dri3_glx.c  |6 
 src/mesa/drivers/dri/i965/brw_blorp.c   |   84 -
 src/mesa/drivers/dri/i965/brw_blorp.h   |3 
 src/mesa/drivers/dri/i965/brw_clear.c   |   66 --
 src/mesa/drivers/dri/i965/intel_blit.c  |2 
 src/mesa/drivers/dri/i965/intel_fbo.c   |6 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c   |4 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h   |4 
 src/mesa/drivers/x11/Makefile.am|1 
 src/mesa/drivers/x11/glxapi.c   |8 -
 src/mesa/drivers/x11/glxapi.h   |1 
 src/mesa/drivers/x11/xm_api.c   |8 +
 src/mesa/drivers/x11/xmesa.h|6 
 src/mesa/state_tracker/st_shader_cache.c|7 -
 src/util/rand_xor.c |1 
 38 files changed, 414 insertions(+), 185 deletions(-)

New commits:
commit f60875e211388e299724063af40c01738cc5d819
Author: Emil Velikov 
Date:   Mon Jun 19 12:13:25 2017 +0100

docs: add release notes for 17.1.3

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.1.3.html b/docs/relnotes/17.1.3.html
new file mode 100644
index 000..3ac4e40
--- /dev/null
+++ b/docs/relnotes/17.1.3.html
@@ -0,0 +1,155 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.1.3 Release Notes / June 19, 2017
+
+
+Mesa 17.1.3 is a bug fix release which fixes bugs found since the 17.1.2 
release.
+
+
+Mesa 17.1.3 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100988;>Bug 
100988 - glXGetCurrentDisplay() no longer works for FakeGLX contexts?
+
+
+
+
+Changes
+
+Bas Nieuwenhuizen (3):
+
+  radv: Set both compute and graphics SGPRS on descriptor set flush.
+  radv: Dirty all descriptors sets when changing the pipeline.
+  radv: Remove SI num RB override for occlusion queries.
+
+
+Brian Paul (1):
+
+  xlib: fix glXGetCurrentDisplay() failure
+
+
+Chad Versace (1):
+
+  i965/dri: Fix bad GL error in intel_create_winsys_renderbuffer()
+
+
+Chuck Atkins (1):
+
+  configure.ac: Reduce zlib requirement from 1.2.8 to 1.2.3.
+
+
+Dave Airlie (3):
+
+  radv: expose integrated device type for APUs.
+  radv: set fmask state to all 0s when no fmask. (v2)
+  glsl/lower_distance: only set max_array_access for 1D clip dist 
arrays
+
+
+Emil Velikov (1):
+
+  Update version to 17.1.3
+
+
+Grazvydas Ignotas (1):
+
+  radv: fix trace dumping for !use_ib_bos
+
+
+Jason Ekstrand (4):
+
+  i965/blorp: Take a layer range in intel_hiz_exec
+  i965: Move the pre-depth-clear flush/stalls to intel_hiz_exec
+  i965: Perform HiZ flush/stall prior to HiZ resolves
+  i965: Mark depth surfaces as needing a HiZ resolve after blitting
+
+
+José Fonseca (1):
+
+  automake: Link all libGL.so variants with -Bsymbolic.
+
+
+Juan A. Suarez Romero (1):
+
+  docs: add sha256 checksums for 17.1.2
+
+
+Lucas Stach (1):
+
+  etnaviv: always do cpu_fini in transfer_unmap
+
+
+Lyude (1):
+
+  nvc0: disable BGRA8 images on Fermi
+
+
+Marek Olšák (3):
+
+  st/mesa: 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 .travis.yml   |7 
 Android.common.mk |4 
 VERSION   |2 
 bin/.cherry-ignore|4 
 bin/get-extra-pick-list.sh|   10 
 bin/get-fixes-pick-list.sh|   59 +-
 configure.ac  |  290 +-
 docs/egl.html |   12 
 docs/releasing.html   |2 
 docs/relnotes/17.1.0.html |3 
 docs/relnotes/17.1.1.html |  188 ++
 docs/relnotes/17.1.2.html |  186 ++
 include/pci_ids/radeonsi_pci_ids.h|4 
 src/amd/Makefile.common.am|2 
 src/amd/addrlib/gfx9/gfx9addrlib.cpp  |   57 +
 src/amd/addrlib/gfx9/gfx9addrlib.h|8 
 src/amd/common/amd_family.h   |1 
 src/amd/common/amdgpu_id.h|   10 
 src/amd/vulkan/Makefile.am|   38 -
 src/amd/vulkan/radv_cmd_buffer.c  |8 
 src/compiler/glsl/shader_cache.cpp|2 
 src/compiler/nir/nir_lower_tex.c  |6 
 src/egl/Makefile.am   |   14 
 src/egl/drivers/dri2/egl_dri2.h   |4 
 src/egl/drivers/dri2/platform_android.c   |   13 
 src/egl/drivers/dri2/platform_wayland.c   |  130 ++--
 src/egl/main/eglapi.c |   19 
 src/egl/main/egldisplay.c |2 
 src/gallium/auxiliary/Makefile.am |   20 
 src/gallium/auxiliary/Makefile.sources|   10 
 src/gallium/auxiliary/gallivm/lp_bld_init.c   |   34 -
 src/gallium/auxiliary/renderonly/renderonly.c |1 
 src/gallium/auxiliary/vl/vl_winsys.h  |   21 
 src/gallium/drivers/etnaviv/etnaviv_resource.c|2 
 src/gallium/drivers/etnaviv/etnaviv_translate.h   |2 
 src/gallium/drivers/freedreno/freedreno_context.c |8 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |2 
 src/gallium/drivers/radeon/Makefile.am|6 
 src/gallium/drivers/radeon/r600_pipe_common.c |2 
 src/gallium/drivers/radeon/r600_texture.c |   16 
 src/gallium/drivers/radeonsi/si_pipe.c|   20 
 src/gallium/drivers/radeonsi/si_state.c   |3 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   14 
 src/gallium/drivers/radeonsi/si_state_shaders.c   |   29 -
 src/gallium/drivers/swr/Makefile.am   |   41 -
 src/gallium/drivers/swr/rasterizer/memory/StoreTile.h |   75 ++
 src/gallium/drivers/swr/swr_context.cpp   |   77 --
 src/gallium/drivers/swr/swr_screen.cpp|   10 
 src/gallium/drivers/vc4/vc4_resource.c|3 
 src/gallium/state_trackers/omx/Makefile.am|1 
 src/gallium/state_trackers/omx/entrypoint.c   |6 
 src/gallium/state_trackers/omx/vid_dec.h  |2 
 src/gallium/state_trackers/va/Makefile.am |1 
 src/gallium/state_trackers/va/context.c   |4 
 src/gallium/state_trackers/vdpau/Makefile.am  |1 
 src/gallium/state_trackers/vdpau/device.c |2 
 src/gallium/state_trackers/xvmc/Makefile.am   |3 
 src/gallium/targets/dri/Android.mk|3 
 src/gallium/targets/omx/Makefile.am   |7 
 src/gallium/targets/va/Makefile.am|7 
 src/gallium/targets/vdpau/Makefile.am |1 
 src/gallium/targets/xvmc/Makefile.am  |1 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |4 
 src/gallium/winsys/virgl/drm/virgl_drm_winsys.c   |   14 
 src/gbm/Makefile.am   |1 
 src/gbm/backends/dri/gbm_dri.c|2 
 src/glx/g_glxglvnddispatchfuncs.c |   14 
 src/glx/g_glxglvnddispatchindices.h   |1 
 src/intel/Android.vulkan.mk   |2 
 src/intel/Makefile.vulkan.am  

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 .travis.yml |  347 +---
 VERSION |2 
 docs/relnotes/17.1.0.html   |  143 
 scons/llvm.py   |   22 +
 src/amd/common/ac_llvm_util.c   |1 
 src/amd/common/ac_nir_to_llvm.c |   40 ++
 src/amd/common/gfx9d.h  |4 
 src/amd/common/sid.h|   13 
 src/amd/vulkan/radv_cmd_buffer.c|   17 
 src/amd/vulkan/radv_device.c|   31 +
 src/amd/vulkan/radv_formats.c   |4 
 src/amd/vulkan/radv_meta.c  |8 
 src/amd/vulkan/radv_meta_clear.c|3 
 src/amd/vulkan/radv_private.h   |2 
 src/amd/vulkan/radv_wsi.c   |   19 -
 src/amd/vulkan/si_cmd_buffer.c  |4 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c   |5 
 src/compiler/nir/nir_lower_bitmap.c |4 
 src/compiler/nir/nir_lower_drawpixels.c |4 
 src/egl/drivers/dri2/platform_android.c |   23 +
 src/egl/drivers/dri2/platform_drm.c |2 
 src/egl/main/eglapi.c   |   36 ++
 src/egl/main/eglsurface.c   |1 
 src/egl/main/eglsurface.h   |5 
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c |8 
 src/gallium/auxiliary/renderonly/renderonly.c   |   18 -
 src/gallium/auxiliary/renderonly/renderonly.h   |3 
 src/gallium/drivers/etnaviv/etnaviv_format.c|2 
 src/gallium/drivers/etnaviv/etnaviv_resource.c  |2 
 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c   |3 
 src/gallium/drivers/freedreno/freedreno_gmem.c  |3 
 src/gallium/drivers/freedreno/freedreno_gmem.h  |1 
 src/gallium/drivers/radeonsi/si_descriptors.c   |   33 +
 src/gallium/drivers/radeonsi/si_shader.c|   66 ++-
 src/gallium/drivers/radeonsi/si_state.c |   59 +++
 src/gallium/drivers/radeonsi/si_state_draw.c|   11 
 src/gallium/drivers/radeonsi/si_state_shaders.c |   21 +
 src/gallium/drivers/vc4/vc4_tiling_lt.c |4 
 src/gallium/targets/dri/Makefile.am |6 
 src/gallium/targets/pipe-loader/pipe_i915.c |2 
 src/gallium/targets/pipe-loader/pipe_msm.c  |2 
 src/gallium/targets/pipe-loader/pipe_nouveau.c  |2 
 src/gallium/targets/pipe-loader/pipe_r300.c |2 
 src/gallium/targets/pipe-loader/pipe_r600.c |2 
 src/gallium/targets/pipe-loader/pipe_radeonsi.c |2 
 src/gallium/targets/pipe-loader/pipe_vmwgfx.c   |2 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c   |1 
 src/glx/glxcmds.c   |2 
 src/intel/compiler/brw_fs_reg_allocate.cpp  |5 
 src/intel/compiler/brw_vec4.cpp |   69 ++-
 src/intel/compiler/brw_vec4_generator.cpp   |9 
 src/intel/vulkan/anv_allocator.c|   21 +
 src/intel/vulkan/anv_batch_chain.c  |6 
 src/intel/vulkan/anv_image.c|8 
 src/mapi/glapi/gen/glX_proto_send.py|6 
 src/mesa/drivers/dri/Makefile.am|   16 
 src/mesa/drivers/dri/i965/brw_program_cache.c   |   11 
 src/mesa/drivers/dri/i965/brw_sync.c|2 
 src/mesa/drivers/dri/i965/intel_screen.c|   69 ++-
 src/mesa/main/copyimage.c   |   25 -
 src/mesa/state_tracker/st_cb_fbo.h  |3 
 src/mesa/state_tracker/st_manager.c |3 
 src/util/disk_cache.c   |   24 -
 63 files changed, 1027 insertions(+), 247 deletions(-)

New commits:
commit 15a38605fc3aa49c01943f9ec2be19d58fef4aac
Author: Emil Velikov 
Date:   Wed May 10 12:11:03 2017 +0100

docs: Update 17.1.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index e7cfe38..af5094d 100644
--- a/docs/relnotes/17.1.0.html
+++ b/docs/relnotes/17.1.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 17.1.0 Release Notes / TBD
+Mesa 17.1.0 Release Notes / May 10, 2017
 
 
 Mesa 17.1.0 is a new development release.
@@ -63,6 +63,147 @@ Note: some of the new features are only available with 
certain drivers.
 Bug fixes
 
 
+
+https://bugs.freedesktop.org/show_bug.cgi?id=68504;>Bug 68504 
- 9.2-rc1 workaround for clover build failure on ppc/altivec: cannot convert 
'bool' to '__vector(4) __bool int' in return
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84325;>Bug 84325 
- X.Org segfaults when starting DE on an Intel+Radeon laptop, caused by 
libpciaccess cleanup, patch attached
+

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 2bf79cb2f1fddd004c7e33cbe572242660ee64d0
Author: Emil Velikov 
Date:   Mon Apr 24 15:23:07 2017 +0100

Update version to 17.1.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 0bc4493..a8a4fd4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.1.0-rc1
+17.1.0-rc2

commit fb6379697b8655ae93ff39cb3b806a8124aded26
Author: Emil Velikov 
Date:   Wed Apr 19 11:35:10 2017 +0100

st/clover: add space between < and ::

As pointed out by compiler

./llvm/codegen.hpp:52:22: error: ‘<::’ cannot begin a template-argument 
list [-fpermissive]
./llvm/codegen.hpp:52:22: note: ‘<:’ is an alternate spelling for ‘[’. 
Insert whitespace between ‘<’ and ‘::’

Cc: Francisco Jerez 
Signed-off-by: Emil Velikov 
Reviewed-by: Nicolai Hähnle 
Reviewed-by: Vedran Miletić 
(cherry picked from commit dd6ec78b4fc1208c9ec330642ad42361fea91678)

diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp 
b/src/gallium/state_trackers/clover/llvm/codegen.hpp
index 44971ad..25f6e01 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen.hpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen.hpp
@@ -49,7 +49,7 @@ namespace clover {
   build_module_library(const ::llvm::Module ,
enum module::section::type section_type);
 
-  std::unique_ptr<::llvm::Module>
+  std::unique_ptr< ::llvm::Module>
   parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log);
 
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
index d09207b..6737f7a 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
@@ -94,7 +94,7 @@ clover::llvm::build_module_library(const ::llvm::Module ,
return m;
 }
 
-std::unique_ptr<::llvm::Module>
+std::unique_ptr< ::llvm::Module>
 clover::llvm::parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log) {
auto mod = ::llvm::parseBitcodeFile(::llvm::MemoryBufferRef(
@@ -104,5 +104,5 @@ clover::llvm::parse_module_library(const module , 
::llvm::LLVMContext ,
  fail(r_log, error(CL_INVALID_PROGRAM), s);
   });
 
-   return std::unique_ptr<::llvm::Module>(std::move(*mod));
+   return std::unique_ptr< ::llvm::Module>(std::move(*mod));
 }
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
index 3b0014d..0751834 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
@@ -121,12 +121,12 @@ namespace {
  } else {
 // Other types.
 const auto actual_type =
-   isa<::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
-   cast<::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;
+   isa< ::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
+   cast< ::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;
 
 if (actual_type->isPointerTy()) {
const unsigned address_space =
-  cast<::llvm::PointerType>(actual_type)->getAddressSpace();
+  cast< ::llvm::PointerType>(actual_type)->getAddressSpace();
 
if (address_space == address_spaces[clang::LangAS::opencl_local
- compat::lang_as_offset]) {
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
index 4f24332..b9e6750 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
@@ -156,7 +156,7 @@ clover::llvm::print_module_native(const ::llvm::Module ,
   const target ) {
std::string log;
try {
-  std::unique_ptr<::llvm::Module> cmod { CloneModule() };
+  std::unique_ptr< ::llvm::Module> cmod { CloneModule() };
   return as_string(emit_code(*cmod, target,
  TargetMachine::CGFT_AssemblyFile, log));
} catch (...) {
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp 
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 987680c..cee51b9 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -132,18 +132,18 @@ namespace clover {
 #endif
  }
 
- inline std::unique_ptr<::llvm::Linker>
+ inline std::unique_ptr< ::llvm::Linker>
  

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 bin/.cherry-ignore|3 
 docs/relnotes/17.0.3.html |3 
 docs/relnotes/17.0.4.html |  148 
 include/pci_ids/radeonsi_pci_ids.h|1 
 src/amd/vulkan/radv_cmd_buffer.c  |3 
 src/gallium/auxiliary/util/u_debug.h  |4 
 src/gallium/drivers/freedreno/freedreno_draw.c|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   23 +
 src/gallium/drivers/nouveau/nouveau_buffer.c  |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/state_trackers/dri/dri2.c |2 
 src/gallium/targets/omx/omx.sym   |5 
 src/gallium/targets/pipe-loader/pipe.sym  |5 
 src/gallium/targets/va/va.sym |5 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |   11 
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c |   27 +-
 src/gallium/winsys/sw/hgl/hgl_sw_winsys.c |3 
 src/gbm/backends/dri/gbm_dri.c|8 
 src/intel/vulkan/anv_cmd_buffer.c |   10 
 src/intel/vulkan/genX_blorp_exec.c|   15 +
 src/intel/vulkan/genX_pipeline.c  |   27 +-
 src/loader/loader.c   |2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   18 -
 src/mesa/drivers/dri/i965/genX_blorp_exec.c   |   16 +
 src/mesa/drivers/dri/i965/intel_screen.c  |  172 +++---
 src/mesa/state_tracker/st_atom_image.c|2 
 src/mesa/state_tracker/st_atom_texture.c  |2 
 src/mesa/state_tracker/st_cb_fbo.c|2 
 src/mesa/state_tracker/st_cb_texture.c|5 
 src/mesa/state_tracker/st_cb_texture.h|3 
 src/mesa/state_tracker/st_gen_mipmap.c|2 
 32 files changed, 442 insertions(+), 97 deletions(-)

New commits:
commit 367bafc7c153611b39bb41145a9601e5f1cb4934
Author: Emil Velikov 
Date:   Mon Apr 17 14:38:04 2017 +0100

docs: add release notes for 17.0.4

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.0.4.html b/docs/relnotes/17.0.4.html
new file mode 100644
index 000..ccc3864
--- /dev/null
+++ b/docs/relnotes/17.0.4.html
@@ -0,0 +1,148 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.0.4 Release Notes / April 17, 2017
+
+
+Mesa 17.0.4 is a bug fix release which fixes bugs found since the 17.0.3 
release.
+
+
+Mesa 17.0.4 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=99515;>Bug 99515 
- SIGSEGV MAPERR on Android nougat-x86 with mesa 17.0.0rc
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100391;>Bug 
100391 - SachaWillems deferredmultisampling asserts
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100452;>Bug 
100452 - push_constants host memory leak when resetting command buffer
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100582;>Bug 
100582 - [GEN8+] piglit.spec.arb_stencil_texturing.glblitframebuffer 
corrupts state.gl_texture* assertions
+
+
+
+
+Changes
+
+Alex Deucher (1):
+
+  radeonsi: add new polaris10 pci id
+
+
+Alex Smith (1):
+
+  radv: Invalidate L2 for TRANSFER_WRITE barriers
+
+
+Andres Gomez (1):
+
+  docs: add sha256 checksums for 17.0.3
+
+
+Craig Stout (1):
+
+  anv/cmd_buffer: fix host memory leak
+
+
+Emil Velikov (3):
+
+  Revert "cherry-ignore: add the Flush after unmap in gbm/dri fix"
+  Revert "freedreno: fix memory leak"
+  Update version to 17.0.4
+
+
+Fabio Estevam (1):
+
+  loader: Move non-error message to debug level
+
+
+Ilia Mirkin (4):
+
+  nvc0/ir: fix LSB/BFE/BFI implementations
+  nvc0/ir: fix overwriting of offset register with interpolateAtOffset
+  nvc0: increase texture buffer object alignment to 256 for pre-GM107
+  nouveau: when mapping a persistent buffer, synchronize on former 
xfers
+
+
+Jason Ekstrand (5):
+
+  i965/fs: Always provide a default LOD of 0 for TXS and TXL
+  anv/pipeline: Properly handle unset gl_Layer and gl_ViewportIndex
+  anv/blorp: Align vertex buffers to 64B
+  i965/blorp: Align vertex buffers to 64B
+  i965/blorp: 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION |2 
 bin/.cherry-ignore  |6 
 docs/relnotes/17.0.2.html   |3 
 docs/relnotes/17.0.3.html   |  188 
 include/c11/threads.h   |5 
 include/pci_ids/radeonsi_pci_ids.h  |1 
 src/amd/vulkan/radv_cmd_buffer.c|8 
 src/compiler/glsl/linker.cpp|6 
 src/compiler/glsl/lower_jumps.cpp   |   17 -
 src/compiler/glsl/tests/cache_test.c|2 
 src/compiler/glsl/tests/lower_jumps/create_test_cases.py|   17 -
 src/gallium/drivers/freedreno/freedreno_draw.c  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp |1 
 src/gallium/drivers/radeonsi/si_state_shaders.c |2 
 src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp |2 
 src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp |2 
 src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp |2 
 src/gallium/state_trackers/clover/core/resource.cpp |   11 
 src/gallium/state_trackers/clover/core/resource.hpp |1 
 src/gallium/state_trackers/nine/nine_csmt_helper.h  |2 
 src/gallium/state_trackers/nine/resource9.c |4 
 src/gallium/state_trackers/nine/surface9.c  |   10 
 src/gallium/state_trackers/nine/volume9.c   |   10 
 src/intel/isl/isl.c |2 
 src/intel/vulkan/anv_blorp.c|   24 -
 src/intel/vulkan/anv_image.c|9 
 src/intel/vulkan/anv_private.h  |   13 
 src/intel/vulkan/anv_query.c|   60 ++-
 src/intel/vulkan/genX_cmd_buffer.c  |   59 ++-
 src/intel/vulkan/genX_pipeline.c|4 
 src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp   |2 
 src/mesa/drivers/dri/i965/brw_misc_state.c  |3 
 src/mesa/drivers/dri/i965/gen8_surface_state.c  |5 
 src/mesa/drivers/dri/i965/intel_screen.c|   11 
 src/mesa/main/api_validate.c|   24 +
 src/mesa/main/api_validate.h|2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |1 
 37 files changed, 420 insertions(+), 103 deletions(-)

New commits:
commit 7f34ecae7fddd3435346f0475557b34920763422
Author: Andres Gomez 
Date:   Sat Apr 1 17:29:34 2017 +0300

docs: add release notes for 17.0.3

Signed-off-by: Andres Gomez 

diff --git a/docs/relnotes/17.0.3.html b/docs/relnotes/17.0.3.html
new file mode 100644
index 000..64efe0b
--- /dev/null
+++ b/docs/relnotes/17.0.3.html
@@ -0,0 +1,188 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.0.3 Release Notes / April 1, 2017
+
+
+Mesa 17.0.3 is a bug fix release which fixes bugs found since the 17.0.2 
release.
+
+
+Mesa 17.0.3 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96743;>Bug 96743 
- [BYT, HSW, SKL, BXT, KBL] GPU hangs with GfxBench 4.0 CarChase
+
+https://bugs.freedesktop.org/show_bug.cgi?id=99246;>Bug 99246 
- [d3dadapter+radeonsi  bisect] EVE-Online : hang on wormhole sight
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100061;>Bug 
100061 - LODQ instruction generated with invalid dst mask
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100182;>Bug 
100182 - Flickering in The Talos Principle on Sky Lake GT4.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100201;>Bug 
100201 - Windows scons build with MSVC toolchain and LLVM 4.0 fails
+
+
+
+
+Changes
+
+Alex Deucher (1):
+
+  radeonsi: add new polaris12 pci id
+
+
+Andres Gomez (5):
+
+  glsl: on UBO/SSBOs link error reset the number of active blocks to 0
+  cherry-ignore: add the Invalidate L2 for TRANSFER_WRITE barriers fix
+  cherry-ignore: add the Flush after unmap in gbm/dri fix
+  cherry-ignore: corrected typo in the Flush after unmap in gbm/dri 
fix
+  Update version to 17.0.3
+
+
+Axel Davy (2):
+
+  st/nine: Resolve deadlock in surface/volume dtors when using csmt
+  st/nine: Use atomics for available_texture_mem
+
+
+Bas Nieuwenhuizen (1):
+
+  radv: 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION |2 
 bin/.cherry-ignore  |2 
 configure.ac|   14 +
 docs/relnotes/17.0.1.html   |3 
 docs/relnotes/17.0.2.html   |  184 
 src/amd/common/ac_nir_to_llvm.c |   17 +
 src/amd/common/ac_nir_to_llvm.h |4 
 src/amd/vulkan/radv_cmd_buffer.c|5 
 src/amd/vulkan/radv_device.c|2 
 src/amd/vulkan/radv_formats.c   |3 
 src/amd/vulkan/radv_image.c |3 
 src/amd/vulkan/radv_meta_buffer.c   |2 
 src/compiler/nir/nir_intrinsics.h   |4 
 src/egl/drivers/dri2/egl_dri2.c |   14 +
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c  |4 
 src/gallium/drivers/nouveau/nvc0/nve4_compute.c |4 
 src/gallium/drivers/radeonsi/si_descriptors.c   |3 
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c |   10 +
 src/gallium/state_trackers/clover/Makefile.am   |3 
 src/intel/vulkan/anv_blorp.c|   35 ++-
 src/intel/vulkan/anv_device.c   |   10 -
 src/intel/vulkan/anv_image.c|9 
 src/intel/vulkan/anv_pass.c |   22 +-
 src/mapi/glapi/gen/gl_API.xml   |2 
 src/mesa/drivers/dri/i965/brw_defines.h |6 
 src/mesa/drivers/dri/i965/brw_fs.cpp|   47 +++--
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp  |2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp|   47 ++---
 src/mesa/main/fbobject.c|2 
 src/mesa/state_tracker/st_atom.c|   10 -
 src/mesa/state_tracker/st_cb_readpixels.c   |   13 +
 src/mesa/state_tracker/st_cb_texture.c  |6 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |   11 -
 src/util/ralloc.c   |   15 +
 src/vulkan/wsi/wsi_common_x11.c |   51 -
 35 files changed, 476 insertions(+), 95 deletions(-)

New commits:
commit 373d88a7117150de984510453e1c30a455987686
Author: Emil Velikov 
Date:   Mon Mar 20 14:07:38 2017 +

docs: add release notes for 17.0.2

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.0.2.html b/docs/relnotes/17.0.2.html
new file mode 100644
index 000..ed4c7db
--- /dev/null
+++ b/docs/relnotes/17.0.2.html
@@ -0,0 +1,184 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.0.2 Release Notes / March 20, 2017
+
+
+Mesa 17.0.2 is a bug fix release which fixes bugs found since the 17.0.1 
release.
+
+
+Mesa 17.0.2 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=68504;>Bug 68504 
- 9.2-rc1 workaround for clover build failure on ppc/altivec: cannot convert 
'bool' to '__vector(4) __bool int' in return
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97988;>Bug 97988 
- [radeonsi] playing back videos with VDPAU exhibits 
deinterlacing/anti-aliasing issues not visible with VA-API
+
+https://bugs.freedesktop.org/show_bug.cgi?id=99484;>Bug 99484 
- Crusader Kings 2 - Loading bars, siege bars, morale bars, etc. do not render 
correctly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=99715;>Bug 99715 
- Don't print: Note: Buggy applications may crash, if they do please 
report to vendor
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100049;>Bug 
100049 - ralloc: Make sure ralloc() allocations match malloc()'s 
alignment. causes seg fault in 32bit build
+
+
+
+
+Changes
+
+Alex Smith (3):
+
+  radv: Emit pending flushes before executing a secondary command 
buffer
+  radv: Flush before copying with PKT3_WRITE_DATA in CmdUpdateBuffer
+  radv/ac: Fix shared memory offset calculation
+
+
+Bas Nieuwenhuizen (3):
+
+  radv: Disable HTILE for textures with multiple layers/levels.
+  radv: Emit cache flushes before CP DMA.
+  Revert "radv: Emit cache flushes before CP DMA."
+
+
+Dave Airlie (3):
+
+  radv: drop Z24 support.
+  radv: disable mip point pre clamping.
+  radv: setup llvm target data layout
+
+
+Emil Velikov (4):
+
+  docs: add sha256 checksums for 17.0.1
+  cherry-ignore: add the swizzle blorp_clear fix
+  i965: move brw_define.h ifndef guard to the top
+  Update version to 17.0.2

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 bin/get-extra-pick-list.sh |   22 -
 bin/get-fixes-pick-list.sh |   61 +++
 bin/get-pick-list.sh   |7 
 bin/get-typod-pick-list.sh |7 
 configure.ac   |   37 --
 docs/relnotes/17.0.0.html  |3 
 docs/relnotes/17.0.1.html  |  220 +
 src/amd/common/ac_nir_to_llvm.c|2 
 src/amd/common/amdgpu_id.h |2 
 src/amd/vulkan/radv_cmd_buffer.c   |1 
 src/amd/vulkan/radv_descriptor_set.c   |7 
 src/amd/vulkan/radv_device.c   |2 
 src/amd/vulkan/radv_meta_blit2d.c  |7 
 src/amd/vulkan/radv_private.h  |1 
 src/amd/vulkan/radv_query.c|   72 ++--
 src/amd/vulkan/si_cmd_buffer.c |   11 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c |   14 
 src/compiler/Android.glsl.mk   |1 
 src/compiler/glsl/ast_to_hir.cpp   |   17 -
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   21 -
 src/egl/drivers/dri2/platform_x11_dri3.c   |   20 +
 src/gallium/auxiliary/gallivm/lp_bld_init.c|5 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  |   41 ++
 src/gallium/auxiliary/tgsi/tgsi_sanity.c   |8 
 src/gallium/auxiliary/util/u_index_modify.c|   87 -
 src/gallium/auxiliary/util/u_index_modify.h|   26 -
 src/gallium/auxiliary/util/u_queue.c   |   79 
 src/gallium/auxiliary/util/u_queue.h   |4 
 src/gallium/drivers/etnaviv/etnaviv_context.c  |   10 
 src/gallium/drivers/etnaviv/etnaviv_screen.c   |   10 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c  |   12 
 src/gallium/drivers/nouveau/nvc0/nve4_compute.c|1 
 src/gallium/drivers/nouveau/nvc0/nve4_compute.h|7 
 src/gallium/drivers/r300/r300_render_translate.c   |4 
 src/gallium/drivers/r300/r300_texture.c|5 
 src/gallium/drivers/r600/r600_state_common.c   |2 
 src/gallium/drivers/radeon/r600_pipe_common.h  |1 
 src/gallium/drivers/radeonsi/Android.mk|4 
 src/gallium/drivers/radeonsi/si_pipe.h |3 
 src/gallium/drivers/radeonsi/si_shader.c   |   35 +-
 src/gallium/drivers/radeonsi/si_shader.h   |1 
 src/gallium/drivers/radeonsi/si_state.c|   17 -
 src/gallium/drivers/radeonsi/si_state_draw.c   |   66 +++
 src/gallium/drivers/radeonsi/si_state_shaders.c|9 
 src/gallium/drivers/vc4/vc4_opt_small_immediates.c |   11 
 src/gallium/drivers/vc4/vc4_program.c  |8 
 src/gallium/drivers/vc4/vc4_qir.c  |1 
 src/gallium/drivers/vc4/vc4_qir.h  |2 
 src/gallium/drivers/vc4/vc4_qpu_emit.c |2 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c  |6 
 src/glx/g_glxglvnddispatchindices.h|8 
 src/intel/blorp/blorp_clear.c  |   48 +-
 src/intel/blorp/blorp_genX_exec.h  |   19 +
 src/intel/genxml/gen6.xml  |2 
 src/intel/genxml/gen7.xml  |2 
 src/intel/genxml/gen75.xml |2 
 src/intel/vulkan/anv_device.c  |   14 
 src/intel/vulkan/anv_private.h |   13 
 src/intel/vulkan/anv_query.c   |   25 -
 src/intel/vulkan/anv_wsi.c |   23 -
 src/intel/vulkan/genX_blorp_exec.c |   11 
 src/intel/vulkan/genX_cmd_buffer.c |   30 +
 src/loader/loader_dri3_helper.c|   23 +
 src/loader/loader_dri3_helper.h|2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp   |   29 -
 src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp |5 
 src/mesa/drivers/dri/i965/brw_sampler_state.c  |   37 +-
 src/mesa/drivers/dri/i965/brw_state.h  |1 
 src/mesa/drivers/dri/i965/genX_blorp_exec.c|8 
 src/mesa/main/api_validate.c

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk |2 
 VERSION   |2 
 configure.ac  |  124 +++--
 docs/relnotes/17.0.0.html |  213 +-
 src/amd/common/ac_nir_to_llvm.c   |   11 
 src/amd/vulkan/radv_image.c   |3 
 src/compiler/glsl/builtin_functions.cpp   |   18 
 src/gallium/auxiliary/tgsi/tgsi_dump.c|   24 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   51 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.h|5 
 src/gallium/drivers/radeon/r600_buffer_common.c   |   17 
 src/gallium/drivers/radeonsi/si_state.h   |2 
 src/gallium/drivers/swr/rasterizer/core/clip.h|   39 -
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c |   17 
 src/glx/dri3_glx.c|   10 
 src/glx/glxcmds.c |   18 
 src/intel/vulkan/Makefile.am  |8 
 src/intel/vulkan/anv_blorp.c  |   10 
 src/intel/vulkan/anv_pass.c   |1 
 src/mesa/drivers/dri/common/dri_util.c|   12 
 src/mesa/drivers/dri/i965/brw_state.h |7 
 src/mesa/drivers/dri/i965/brw_state_upload.c  |3 
 src/mesa/drivers/dri/i965/gen6_clip_state.c   |   57 --
 src/mesa/drivers/dri/i965/gen6_sf_state.c |   15 
 src/mesa/drivers/dri/i965/gen6_viewport_state.c   |  150 ---
 src/mesa/drivers/dri/i965/gen7_sf_state.c |   12 
 src/mesa/drivers/dri/i965/gen7_viewport_state.c   |   39 -
 src/mesa/drivers/dri/i965/gen8_viewport_state.c   |   48 --
 src/mesa/state_tracker/st_extensions.c|2 
 src/mesa/vbo/vbo_save_api.c   |7 
 src/util/disk_cache.c |   33 +
 31 files changed, 581 insertions(+), 379 deletions(-)

New commits:
commit 683462e680326ee0cd7a794f018178b7b5573c4f
Author: Emil Velikov 
Date:   Mon Feb 13 11:53:28 2017 +

docs: Update 17.0.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.0.0.html b/docs/relnotes/17.0.0.html
index 71fb4c3..aed746f 100644
--- a/docs/relnotes/17.0.0.html
+++ b/docs/relnotes/17.0.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 17.0.0 Release Notes / TBD
+Mesa 17.0.0 Release Notes / February 13, 2017
 
 
 Mesa 17.0.0 is a new development release.
@@ -62,13 +62,222 @@ Note: some of the new features are only available with 
certain drivers.
 
 
 
+https://bugs.freedesktop.org/show_bug.cgi?id=70623;>Bug 70623 
- libglx.so: undefined symbol: _glapi_tls_Context
+
+https://bugs.freedesktop.org/show_bug.cgi?id=72902;>Bug 72902 
- [IVB/HSW/BDW] DOTA2 segfaults unless Mesa is configured with (non-default) 
--enable-glx-tls
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73778;>Bug 73778 
- _glapi_tls_Dispatch undefined
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77662;>Bug 77662 
- Fail to render to different faces of depth-stencil cube map
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89043;>Bug 89043 
- undefined symbol: _glapi_tls_Dispatch
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91281;>Bug 91281 
- Tonga VCE 2160p encode fails with  BO to small for addr
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92234;>Bug 92234 
- [BDW] GPU hang in Shogun2
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92634;>Bug 92634 
- gallium's vl_mpeg12_decoder does not work with st/va
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92760;>Bug 92760 
- Add FP64 support to the i965 shader backends
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92925;>Bug 92925 
- Incorrect GEN for ASTC in Surface Format Table
+
+https://bugs.freedesktop.org/show_bug.cgi?id=93551;>Bug 93551 
- Divinity: Original Sin Enhanced Edition(Native) crash on start
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94512;>Bug 94512 
- X segfaults with glx-tls enabled in a x32 environment
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94900;>Bug 94900 
- HD6950 GPU lockup loop with various steam games (octodad[always], saints row 
4[always], dead island[always], grid autosport[sometimes])
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94904;>Bug 94904 
- [vulkan, BSW] dEQP-VK.api.object_management.multithreaded_per_thread_device 
intermittent crash
+
+https://bugs.freedesktop.org/show_bug.cgi?id=95460;>Bug 95460 
- Please add more drivers (freedreno, virgl) to features.txt status 
document
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96959;>Bug 96959 
- nop.sat generated by pow 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 Android.common.mk  |   14 +
 VERSION|2 
 configure.ac   |   49 ---
 src/amd/Android.common.mk  |2 
 src/amd/common/ac_nir_to_llvm.c|   46 +
 src/amd/vulkan/Makefile.am |4 -
 src/amd/vulkan/radv_cmd_buffer.c   |4 +
 src/compiler/glsl/link_uniforms.cpp|2 
 src/compiler/spirv/spirv_to_nir.c  |   54 +++--
 src/compiler/spirv/vtn_variables.c |6 ++
 src/egl/Makefile.am|2 
 src/gallium/Android.common.mk  |2 
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c |1 
 src/gallium/auxiliary/tgsi/tgsi_exec.c |   14 +
 src/gallium/drivers/etnaviv/etnaviv_compiler.c |   39 ++-
 src/gallium/drivers/etnaviv/etnaviv_emit.c |   17 ++
 src/gallium/drivers/etnaviv/etnaviv_internal.h |   19 +++
 src/gallium/drivers/etnaviv/etnaviv_resource.c |5 +
 src/gallium/drivers/etnaviv/etnaviv_screen.c   |9 ++-
 src/gallium/drivers/etnaviv/etnaviv_state.c|   38 +++---
 src/gallium/drivers/freedreno/Makefile.am  |1 
 src/gallium/drivers/r600/r600_shader.c |2 
 src/gallium/drivers/radeonsi/si_descriptors.c  |   11 ++--
 src/gallium/drivers/radeonsi/si_state.c|6 +-
 src/gallium/state_trackers/clover/Makefile.am  |2 
 src/gallium/state_trackers/dri/Makefile.am |2 
 src/gallium/state_trackers/va/picture.c|   11 +++-
 src/gallium/state_trackers/va/va_private.h |1 
 src/gallium/state_trackers/vdpau/output.c  |7 ++
 src/gallium/state_trackers/vdpau/presentation.c|6 +-
 src/gallium/state_trackers/vdpau/vdpau_private.h   |1 
 src/gallium/targets/d3dadapter9/Makefile.am|2 
 src/glx/Makefile.am|4 -
 src/glx/apple/Makefile.am  |4 -
 src/glx/windows/Makefile.am|2 
 src/intel/blorp/blorp_clear.c  |   23 
 src/intel/isl/isl_format.c |5 +
 src/intel/vulkan/anv_cmd_buffer.c  |5 +
 src/intel/vulkan/anv_descriptor_set.c  |8 +--
 src/intel/vulkan/anv_nir_lower_input_attachments.c |5 -
 src/intel/vulkan/genX_cmd_buffer.c |   19 +++
 src/loader/Makefile.am |2 
 src/mapi/Makefile.am   |4 -
 src/mesa/drivers/dri/i915/Makefile.am  |2 
 src/mesa/drivers/dri/i965/Makefile.am  |7 +-
 src/mesa/drivers/dri/i965/brw_blorp.c  |2 
 src/mesa/drivers/dri/i965/brw_context.c|3 +
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp |2 
 src/mesa/drivers/dri/i965/brw_program.c|   43 
 src/mesa/drivers/dri/i965/gen8_depth_state.c   |   12 
 src/mesa/drivers/dri/i965/genX_blorp_exec.c|4 +
 src/mesa/drivers/dri/i965/intel_blit.c |   24 +++--
 src/mesa/drivers/dri/i965/intel_blit.h |4 -
 src/mesa/drivers/dri/i965/intel_screen.c   |1 
 src/mesa/drivers/dri/r200/Makefile.am  |2 
 src/mesa/drivers/dri/radeon/Makefile.am|2 
 src/mesa/drivers/dri/swrast/Makefile.am|2 
 src/mesa/drivers/osmesa/Makefile.am|2 
 src/mesa/main/extensions_table.h   |2 
 src/mesa/main/shaderapi.c  |4 -
 src/mesa/main/tests/Makefile.am|2 
 src/mesa/state_tracker/st_context.c|   13 ++---
 src/vulkan/wsi/wsi_common_wayland.c|   27 ++
 src/vulkan/wsi/wsi_common_x11.c|3 -
 64 files changed, 450 insertions(+), 175 deletions(-)

New commits:
commit 07571cd8ccf8c19fe79e16055208059fe729d298
Author: Emil Velikov 
Date:   Mon Feb 6 13:18:13 2017 +

Update version to 17.0.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 032c50c..0b34163 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.0-rc2
+17.0.0-rc3

commit 2fc362f14711981e98c920f2f278ad91bad89982
Author: Lucas Stach 
Date:   Mon Nov 21 11:54:25 2016 +0100

etnaviv: force vertex buffers through the MMU

This fixes a vertex data corruption issue if some of the vertex streams
go through the MMU and some don't.

Signed-off-by: Lucas Stach 
Tested-by: Philipp Zabel 
Acked-by: Christian Gmeiner 
(cherry picked from commit 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION |2 
 src/amd/vulkan/Makefile.am  |8 -
 src/amd/vulkan/radv_device.c|3 
 src/compiler/glsl/ir_optimization.h |4 
 src/compiler/glsl/lower_instructions.cpp|   19 +-
 src/compiler/nir/nir_search.c   |   48 ++
 src/compiler/spirv/vtn_variables.c  |3 
 src/gallium/auxiliary/gallivm/lp_bld_gather.c   |2 
 src/gallium/auxiliary/hud/hud_cpufreq.c |1 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h   |2 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h   |2 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h   |2 
 src/gallium/drivers/freedreno/a5xx/a5xx.xml.h   |   39 +++-
 src/gallium/drivers/freedreno/a5xx/fd5_draw.c   |   53 +++---
 src/gallium/drivers/freedreno/a5xx/fd5_emit.c   |4 
 src/gallium/drivers/freedreno/a5xx/fd5_gmem.c   |3 
 src/gallium/drivers/freedreno/a5xx/fd5_program.c|   18 +-
 src/gallium/drivers/freedreno/a5xx/fd5_rasterizer.c |   10 -
 src/gallium/drivers/freedreno/adreno_common.xml.h   |2 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h  |2 
 src/gallium/drivers/r600/r600_shader.c  |  157 +++-
 src/gallium/drivers/radeonsi/si_descriptors.c   |   19 +-
 src/gallium/drivers/radeonsi/si_state.c |   22 ++
 src/gallium/drivers/radeonsi/si_state_draw.c|3 
 src/gallium/drivers/swr/rasterizer/core/threads.cpp |9 +
 src/gallium/drivers/swr/swr_query.cpp   |7 
 src/gallium/drivers/swr/swr_query.h |2 
 src/intel/blorp/blorp_blit.c|   82 ++
 src/intel/vulkan/anv_image.c|7 
 src/mesa/drivers/dri/i965/brw_blorp.c   |   22 ++
 src/mesa/drivers/dri/i965/brw_clear.c   |   56 +--
 src/mesa/drivers/dri/i965/gen8_depth_state.c|   16 ++
 src/mesa/drivers/dri/i965/genX_blorp_exec.c |   11 -
 src/mesa/main/attrib.c  |3 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |9 -
 src/vulkan/wsi/wsi_common_x11.c |6 
 36 files changed, 482 insertions(+), 176 deletions(-)

New commits:
commit d283ec0a7b61bc33d970f5cb4c2bfbd63d255c2c
Author: Emil Velikov 
Date:   Wed Jan 25 13:24:27 2017 +

Update version to 17.0.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 964d0ff..032c50c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.0-rc1
+17.0.0-rc2

commit 9577977266068b1b3666e0265bd0d6dcb1563572
Author: Topi Pohjolainen 
Date:   Tue Jan 17 12:00:37 2017 +0200

i965/blorp: Make post draw flush more explicit

Blits do not need any special treatment as the target buffer
object is added to render cache just as one does for normal draw.
Color clears and resolves in turn require explicit "end of pipe
synchronization". It is not clear what this means exactly but the
assumption is that render cache flush with command stream stall
should be sufficient.

Signed-off-by: Topi Pohjolainen 
Reviewed-by: Kenneth Graunke 
Reviewed-by: Jason Ekstrand 
(cherry picked from commit 180653c357d19ca88f7895f59874a58fac99cc53)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c 
b/src/mesa/drivers/dri/i965/brw_blorp.c
index 8d58616..d79f529 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -908,6 +908,17 @@ do_single_blorp_clear(struct brw_context *brw, struct 
gl_framebuffer *fb,
   blorp_batch_finish();
}
 
+   /*
+* Ivybrigde PRM Vol 2, Part 1, "11.7 MCS Buffer for Render Target(s)":
+*
+*  Any transition from any value in {Clear, Render, Resolve} to a
+*  different value in {Clear, Render, Resolve} requires end of pipe
+*  synchronization.
+*/
+   brw_emit_pipe_control_flush(brw,
+   PIPE_CONTROL_RENDER_TARGET_FLUSH |
+   PIPE_CONTROL_CS_STALL);
+
return true;
 }
 
@@ -975,6 +986,17 @@ brw_blorp_resolve_color(struct brw_context *brw, struct 
intel_mipmap_tree *mt,
  brw_blorp_to_isl_format(brw, format, true),
  resolve_op);
blorp_batch_finish();
+
+   /*
+* Ivybrigde PRM Vol 2, Part 1, "11.7 MCS Buffer for Render Target(s)":
+*
+*  Any transition from any value in {Clear, Render, Resolve} to a
+*  different value in {Clear, Render, Resolve} requires end of pipe
+*  synchronization.
+*/
+   brw_emit_pipe_control_flush(brw,
+   PIPE_CONTROL_RENDER_TARGET_FLUSH |
+   PIPE_CONTROL_CS_STALL);
 }
 
 static void
diff 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

Rebased ref, commits from common ancestor:
commit 9cb066601c5cda082333ef8bbe74f9489790ed5d
Author: Emil Velikov 
Date:   Wed Jan 18 20:12:04 2017 +

Update version to 17.0.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 19547f8..964d0ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.0-devel
+17.0.0-rc1

commit 45297f7e4abe152c82f43216eb473f5248fd18cd
Author: Emil Velikov 
Date:   Wed Jan 18 19:48:37 2017 +

utils: really remove the __END_DECLS macro

Fixes: d1efa09d342 "util: import sha1 implementation from OpenBSD"
Signed-off-by: Emil Velikov 
(cherry picked from commit ea8b2624c8da1061e93124a760cae2ffb5f027ad)

diff --git a/src/util/sha1/sha1.h b/src/util/sha1/sha1.h
index de07e1a..243481a 100644
--- a/src/util/sha1/sha1.h
+++ b/src/util/sha1/sha1.h
@@ -31,7 +31,6 @@ void SHA1Pad(SHA1_CTX *);
 void SHA1Transform(uint32_t [5], const uint8_t [SHA1_BLOCK_LENGTH]);
 void SHA1Update(SHA1_CTX *, const uint8_t *, size_t);
 void SHA1Final(uint8_t [SHA1_DIGEST_LENGTH], SHA1_CTX *);
-__END_DECLS
 
 #define HTONDIGEST(x) do {  \
 x[0] = htonl(x[0]); \

commit acc78377990ba986060214466d44ea364529c363
Author: Emil Velikov 
Date:   Wed Jan 18 19:40:31 2017 +

utils: build sha1/disk cache only with Android/Autoconf

Earlier commit imported a SHA1 implementation and relaxed the SHA1 and
disk cache handling, broking the Windows builds.

Restrict things for now until we get to a proper fix.

Fixes: d1efa09d342 "util: import sha1 implementation from OpenBSD"
Signed-off-by: Emil Velikov 
(cherry picked from commit 9f8dc3bf03ec825bae7041858dda6ca2e9a34363)

diff --git a/Android.common.mk b/Android.common.mk
index ed5118a..a75d4e7 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -43,6 +43,7 @@ LOCAL_CFLAGS += \

-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
+   -DENABLE_SHADER_CACHE \
-D__STDC_LIMIT_MACROS \
-DHAVE___BUILTIN_EXPECT \
-DHAVE___BUILTIN_FFS \
diff --git a/configure.ac b/configure.ac
index 6b07b2d..de8af87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1766,6 +1766,7 @@ if test -n "$with_vulkan_drivers"; then
 fi
 
 
+DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
 AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
 AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_glx" = xxlib -o \
   "x$enable_osmesa" = xyes -o \
diff --git a/src/compiler/glsl/tests/cache_test.c 
b/src/compiler/glsl/tests/cache_test.c
index f53ef0d..0ef05aa 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -37,6 +37,8 @@
 
 bool error = false;
 
+#ifdef ENABLE_SHADER_CACHE
+
 static void
 expect_equal(uint64_t actual, uint64_t expected, const char *test)
 {
@@ -378,10 +380,12 @@ test_put_key_and_get_key(void)
 
disk_cache_destroy(cache);
 }
+#endif /* ENABLE_SHADER_CACHE */
 
 int
 main(void)
 {
+#ifdef ENABLE_SHADER_CACHE
int err;
 
test_disk_cache_create();
@@ -392,6 +396,7 @@ main(void)
 
err = rmrf_local(CACHE_TEST_TMP);
expect_equal(err, 0, "Removing " CACHE_TEST_TMP " again");
+#endif /* ENABLE_SHADER_CACHE */
 
return error ? 1 : 0;
 }
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 96a4ce0..4c67f95 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1612,6 +1612,7 @@ _mesa_LinkProgram(GLuint programObj)
"glLinkProgram"));
 }
 
+#ifdef ENABLE_SHADER_CACHE
 /**
  * Generate a SHA-1 hash value string for given source string.
  */
@@ -1723,6 +1724,8 @@ read_shader(const gl_shader_stage stage, const char 
*source)
return buffer;
 }
 
+#endif /* ENABLE_SHADER_CACHE */
+
 /**
  * Called via glShaderSource() and glShaderSourceARB() API functions.
  * Basically, concatenate the source code strings into one long string
@@ -1795,6 +1798,7 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
source[totalLength - 1] = '\0';
source[totalLength - 2] = '\0';
 
+#ifdef ENABLE_SHADER_CACHE
/* Dump original shader source to MESA_SHADER_DUMP_PATH and replace
 * if corresponding entry found from MESA_SHADER_READ_PATH.
 */
@@ -1805,6 +1809,7 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
   free(source);
   source = replacement;
}
+#endif /* ENABLE_SHADER_CACHE */
 
shader_source(sh, source);
 
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 76bdfe8..6de608c 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -21,6 +21,8 @@
  * IN THE SOFTWARE.
  */
 
+#ifdef ENABLE_SHADER_CACHE
+
 #include 
 #include 
 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 Android.common.mk |2 
 VERSION   |2 
 docs/relnotes/13.0.0.html |3 
 docs/relnotes/13.0.1.html |  187 ++
 src/amd/addrlib/addrtypes.h   |6 
 src/amd/common/ac_nir_to_llvm.c   |   29 +
 src/amd/vulkan/.gitignore |1 
 src/amd/vulkan/Makefile.am|   11 
 src/amd/vulkan/radeon_icd.json|7 
 src/amd/vulkan/radeon_icd.json.in |7 
 src/amd/vulkan/radv_device.c  |   44 ++
 src/amd/vulkan/radv_pipeline.c|   80 +++-
 src/compiler/Makefile.sources |1 
 src/compiler/glsl/linker.cpp  |   78 ++--
 src/compiler/glsl/lower_ubo_reference.cpp |   10 
 src/compiler/glsl/standalone.cpp  |2 
 src/compiler/glsl/standalone_scaffolding.cpp  |   10 
 src/compiler/glsl/standalone_scaffolding.h|3 
 src/compiler/nir/nir.h|2 
 src/compiler/nir/nir_lower_wpos_ytransform.c  |   24 +
 src/compiler/nir/nir_opt_conditional_discard.c|  125 +++
 src/egl/drivers/dri2/egl_dri2.h   |2 
 src/egl/main/eglapi.c |4 
 src/egl/main/egldefines.h |5 
 src/gallium/auxiliary/hud/hud_cpufreq.c   |   26 -
 src/gallium/auxiliary/hud/hud_diskstat.c  |   31 -
 src/gallium/auxiliary/hud/hud_nic.c   |   26 -
 src/gallium/auxiliary/hud/hud_sensors_temp.c  |   28 -
 src/gallium/drivers/radeonsi/si_blit.c|4 
 src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c |   37 +-
 src/gallium/drivers/vc4/vc4_program.c |2 
 src/gallium/state_trackers/vdpau/output.c |2 
 src/glx/g_glxglvnddispatchfuncs.c |  254 +++---
 src/glx/g_glxglvnddispatchindices.h   |   36 +-
 src/glx/glxcmds.c |4 
 src/glx/glxglvnd.c|3 
 src/glx/windows/Makefile.am   |3 
 src/intel/blorp/blorp.c   |   28 -
 src/intel/blorp/blorp.h   |5 
 src/intel/blorp/blorp_blit.c  |4 
 src/intel/blorp/blorp_clear.c |4 
 src/intel/blorp/blorp_genX_exec.h |   36 +-
 src/intel/blorp/blorp_priv.h  |   31 -
 src/intel/common/gen_device_info.c|   33 +
 src/intel/vulkan/anv_allocator.c  |  118 ++
 src/intel/vulkan/anv_batch_chain.c|  387 +++---
 src/intel/vulkan/anv_blorp.c  |9 
 src/intel/vulkan/anv_cmd_buffer.c |2 
 src/intel/vulkan/anv_device.c |  106 +++---
 src/intel/vulkan/anv_intel.c  |   11 
 src/intel/vulkan/anv_pipeline.c   |   20 -
 src/intel/vulkan/anv_pipeline_cache.c |   79 ++--
 src/intel/vulkan/anv_private.h|   77 ++--
 src/intel/vulkan/genX_cmd_buffer.c|   33 -
 src/mesa/drivers/dri/i965/brw_blorp.c |3 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |6 
 src/mesa/main/shaderobj.c |   23 -
 src/mesa/main/shaderobj.h |3 
 src/mesa/program/ir_to_mesa.cpp   |2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   10 
 src/mesa/state_tracker/st_sampler_view.c  |   15 
 src/mesa/state_tracker/st_texture.h   |9 
 src/mesa/state_tracker/st_vdpau.c |   20 -
 src/vulkan/wsi/wsi_common_x11.c   |6 
 64 files changed, 1421 insertions(+), 760 deletions(-)

New commits:
commit f2f487ebbb808010528edd69000694bfe525f87b
Author: Emil Velikov 
Date:   Mon Nov 14 10:58:11 2016 +

docs: add release notes for 13.0.1

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/13.0.1.html b/docs/relnotes/13.0.1.html
new file mode 100644
index 000..d317adb
--- /dev/null
+++ b/docs/relnotes/13.0.1.html
@@ -0,0 +1,187 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 13.0.1 Release Notes / November 14, 2016
+
+
+Mesa 13.0.1 is a bug fix release which fixes bugs found since the 13.0.0 
release.
+
+
+Mesa 13.0.1 implements the OpenGL 4.4 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.4.  OpenGL
+4.4 is only available if requested at context creation
+because compatibility 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 Makefile.am   |1 
 VERSION   |2 
 src/amd/common/ac_nir_to_llvm.c   |2 
 src/amd/vulkan/radv_cmd_buffer.c  |3 
 src/egl/drivers/dri2/platform_wayland.c   |   15 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |  147 --
 src/gallium/drivers/nouveau/nv50/nv50_program.c   |3 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c   |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|   87 
 src/gallium/drivers/radeonsi/si_shader.c  |2 
 src/intel/vulkan/.gitignore   |1 
 src/intel/vulkan/Makefile.am  |   11 -
 src/intel/vulkan/intel_icd.json   |7 
 src/intel/vulkan/intel_icd.json.in|7 
 src/mapi/Makefile.am  |3 
 src/mapi/glapi/gen/gl_API.xml |   30 +-
 src/mapi/glapi/gen/static_data.py |   12 +
 src/mesa/state_tracker/st_draw.c  |   15 +
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   35 +++
 src/vulkan/wsi/wsi_common_wayland.c   |4 
 20 files changed, 261 insertions(+), 133 deletions(-)

New commits:
commit f623a8be3edc898dd13040cd06f91763b5973e48
Author: Emil Velikov 
Date:   Mon Oct 24 12:09:15 2016 +0100

Update version to 13.0.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 0ee82ac..4bb1cb3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.0-rc1
+13.0.0-rc2

commit af81cdfec045f9e175edd5b5e8fcaa9e91f0dd38
Author: Jonathan Gray 
Date:   Sat Oct 22 18:19:53 2016 +1100

mapi: automake: set VISIBILITY_CFLAGS for shared glapi

shared glapi was previously built without setting CFLAGS for
AM_CFLAGS and VISIBILITY_CFLAGS.

This resulted in symbols being exported that shouldn't be.

The x86 and sparc assembly versions of the dispatch table partially
mitigated this by using .hidden.  Otherwise shared_dispatch_stub_*
were being exported.

Signed-off-by: Jonathan Gray 
Cc: "11.2 12.0 13.0" 
Reviewed-by: Emil Velikov 
Reviewed-by: Eric Engestrom 

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 46afe3b..5013e9a 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -64,6 +64,9 @@ BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
 
 lib_LTLIBRARIES += shared-glapi/libglapi.la
 shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) 
shared-glapi/glapi_mapi_tmp.h
+shared_glapi_libglapi_la_CFLAGS = \
+   $(AM_CFLAGS) \
+   $(VISIBILITY_CFLAGS)
 shared_glapi_libglapi_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DMAPI_MODE_GLAPI \

commit 990f395e007c3204639daa34efc3049f350ee819
Author: Emil Velikov 
Date:   Mon Oct 24 11:27:44 2016 +0100

anv: automake: cleanup the generated json file during make clean

Signed-off-by: Emil Velikov 
(cherry picked from commit 8df581520a823564be0ab5af7dbb7d501b1c9670)

Conflicts:
src/intel/vulkan/Makefile.am

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 7bf68a0..4a7bb18 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -147,7 +147,7 @@ anv_timestamp.h:
$(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@
 
 BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES) dev_icd.json
+CLEANFILES = $(BUILT_SOURCES) dev_icd.json intel_icd.@host_cpu@.json
 EXTRA_DIST = \
$(top_srcdir)/include/vulkan/vk_icd.h \
anv_entrypoints_gen.py \

commit 19e8270fe0333e1087653c4c1a46ac5052f58670
Author: Stencel, Joanna 
Date:   Mon Oct 24 09:48:11 2016 +0100

egl/wayland: add missing destroy_window callback

The original patch by Joanna added the function pointer and callback yet
things got only partially applied - the infra was added, but the
implementation was missing.

Cc: "12.0 13.0" 
Fixes: 690ead4a135 ("egl/wayland-egl: Fix for segfault in
dri2_wl_destroy_surface.")
Signed-off-by: Emil Velikov 

(cherry picked from commit 2e0ab61e29c4b44d349ab433c899b691a9b12f68)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index ccab192..789e035 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -118,6 +118,13 @@ resize_callback(struct wl_egl_window *wl_win, void 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

Rebased ref, commits from common ancestor:
commit e45c4586c275b6d47e1c51cb568db644c7c55f61
Author: Emil Velikov 
Date:   Wed Oct 19 18:40:40 2016 +0100

Update version to 13.0.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 9637d43..0ee82ac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.0-devel
+13.0.0-rc1

commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04
Author: Emil Velikov 
Date:   Wed Oct 19 17:36:17 2016 +0100

Revert Use absolute path in intel_icd.json and related patches.

This commit effectively reverts the following commits:

This reverts commit 0b6837a643bbbf3c57c5cc5030279fb4389b23b7.
This reverts commit 05f36435ef117e48f457b44877d04dd6249b3bb7.
This reverts commit a2ae67aa47df6dd41802462105dac7ce5ab676a2.

While the feature introduced is convinient for development it is not as
useful for distributions. Furthermore it even breaks things as one
wishes to have both 32 and 64 bit package installed on the same system.

Keep the functionality in development branch(es) and drop it from
distribution packages to avoid confusion and misuse.

Signed-off-by: Emil Velikov 

diff --git a/configure.ac b/configure.ac
index 7e63bfa..d215b63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1667,13 +1667,6 @@ AC_ARG_WITH([vulkan-icddir],
 [VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d'])
 AC_SUBST([VULKAN_ICD_INSTALL_DIR])
 
-AC_ARG_ENABLE([vulkan-icd-full-driver-path],
-   [AS_HELP_STRING([--disable-vulkan-icd-full-driver-path],
-   [create Vulkan ICD files with just a .so name and no 
path])],
-   [vulkan_icd_driver_path="$enableval"],
-   [vulkan_icd_driver_path="yes"])
-AM_CONDITIONAL(VULKAN_ICD_DRIVER_PATH, test "x$vulkan_icd_driver_path" = xyes)
-
 if test -n "$with_vulkan_drivers"; then
 VULKAN_DRIVERS=`IFS=', '; echo $with_vulkan_drivers`
 for driver in $VULKAN_DRIVERS; do
diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore
index a099ff6..bde5cd8 100644
--- a/src/intel/vulkan/.gitignore
+++ b/src/intel/vulkan/.gitignore
@@ -3,4 +3,3 @@
 /anv_entrypoints.h
 /anv_timestamp.h
 /dev_icd.json
-/intel_icd.json
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 5d2b3a5..6e17188 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -147,12 +147,11 @@ anv_timestamp.h:
$(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@
 
 BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES) dev_icd.json intel_icd.json
+CLEANFILES = $(BUILT_SOURCES) dev_icd.json
 EXTRA_DIST = \
$(top_srcdir)/include/vulkan/vk_icd.h \
anv_entrypoints_gen.py \
dev_icd.json.in \
-   intel_icd.json.in \
intel_icd.json
 
 libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS)
@@ -177,17 +176,6 @@ dev_icd.json : dev_icd.json.in
-e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
< $(srcdir)/dev_icd.json.in > $@
 
-if VULKAN_ICD_DRIVER_PATH
-ICD_DRIVER_PATH="${libdir}/libvulkan_intel.so"
-else
-ICD_DRIVER_PATH="libvulkan_intel.so"
-endif
-
-intel_icd.json : intel_icd.json.in
-   $(AM_V_GEN) $(SED) \
-   -e "s#@ICD_DRIVER_PATH@#${ICD_DRIVER_PATH}#" \
-   < $(srcdir)/intel_icd.json.in > $@
-
 # Libvulkan with dummy gem. Used for unit tests.
 libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES)
 libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS)
diff --git a/src/intel/vulkan/intel_icd.json b/src/intel/vulkan/intel_icd.json
new file mode 100644
index 000..277c14e
--- /dev/null
+++ b/src/intel/vulkan/intel_icd.json
@@ -0,0 +1,7 @@
+{
+"file_format_version": "1.0.0",
+"ICD": {
+"library_path": "libvulkan_intel.so",
+"abi_versions": "1.0.3"
+}
+}
diff --git a/src/intel/vulkan/intel_icd.json.in 
b/src/intel/vulkan/intel_icd.json.in
deleted file mode 100644
index 4f50866..000
--- a/src/intel/vulkan/intel_icd.json.in
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"file_format_version": "1.0.0",
-"ICD": {
-"library_path": "@ICD_DRIVER_PATH@",
-"abi_versions": "1.0.3"
-}
-}

commit 3ef8d4288aa4e5711f4445f1cacdcf5f65f51ddf
Author: Emil Velikov 
Date:   Wed Oct 19 17:33:38 2016 +0100

docs: rename release notes to 13.0.0

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
deleted file mode 100644
index c7e4d01..000
--- a/docs/relnotes/12.1.0.html
+++ /dev/null
@@ -1,85 +0,0 @@
-http://www.w3.org/TR/html4/loose.dtd;>
-
-
-  
-  Mesa Release Notes
-  
-
-
-
-
-  The Mesa 3D Graphics Library
-
-
-
-
-
-Mesa 12.1.0 Release Notes / TBD
-
-
-Mesa 12.1.0 is a new development release.
-People who are concerned with stability and reliability should stick
-with a 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 bin/bugzilla_mesa.sh  |2 
 configure.ac  |5 
 docs/relnotes/12.0.0.html |  254 ++
 docs/relnotes/12.0.1.html |   66 +
 include/c99_compat.h  |4 
 src/Makefile.am   |   13 
 src/compiler/glsl/ast_to_hir.cpp  |8 
 src/compiler/glsl/glsl_parser_extras.cpp  |1 
 src/compiler/glsl/glsl_parser_extras.h|1 
 src/compiler/glsl/linker.cpp  |1 
 src/compiler/glsl/lower_const_arrays_to_uniforms.cpp  |   18 
 src/compiler/glsl/opt_array_splitting.cpp |   55 +
 src/compiler/glsl/opt_constant_propagation.cpp|4 
 src/compiler/glsl/opt_dead_builtin_varyings.cpp   |   10 
 src/compiler/spirv/vtn_variables.c|4 
 src/gallium/auxiliary/translate/translate_sse.c   |   14 
 src/gallium/drivers/freedreno/freedreno_context.h |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp|   20 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |6 
 src/gallium/drivers/nouveau/nv50/nv50_push.c  |   16 
 src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c  |   17 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c |   16 
 src/gallium/drivers/radeon/r600_cs.h  |   22 
 src/gallium/drivers/radeon/radeon_uvd.c   |  109 ++
 src/gallium/drivers/radeon/radeon_winsys.h|1 
 src/gallium/drivers/radeonsi/si_compute.c |   18 
 src/gallium/drivers/radeonsi/si_hw_context.c  |1 
 src/gallium/drivers/radeonsi/si_pipe.h|1 
 src/gallium/drivers/radeonsi/si_state.c   |8 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   72 +
 src/gallium/drivers/radeonsi/sid.h|6 
 src/gallium/drivers/svga/svga_pipe_query.c|   16 
 src/gallium/drivers/svga/svga_screen.c|2 
 src/gallium/drivers/svga/svga_winsys.h|3 
 src/gallium/drivers/swr/Makefile.am   |   45 +
 src/gallium/drivers/swr/swr_shader.cpp|   10 
 src/gallium/drivers/swr/swr_state.cpp |7 
 src/gallium/drivers/virgl/virgl_screen.c  |7 
 src/gallium/include/pipe/p_state.h|   12 
 src/gallium/include/state_tracker/st_api.h|1 
 src/gallium/state_trackers/clover/api/device.cpp  |5 
 src/gallium/state_trackers/clover/api/platform.cpp|5 
 src/gallium/state_trackers/dri/dri_screen.c   |2 
 src/gallium/targets/osmesa/osmesa.def |1 
 src/gallium/targets/osmesa/osmesa.mingw.def   |1 
 src/gallium/targets/osmesa/osmesa.sym |1 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |   11 
 src/gallium/winsys/svga/drm/vmw_screen_ioctl.c|   11 
 src/intel/genxml/gen6.xml |8 
 src/intel/genxml/gen7.xml |   16 
 src/intel/genxml/gen75.xml|   16 
 src/intel/genxml/gen8.xml |   17 
 src/intel/genxml/gen9.xml |   17 
 src/intel/isl/isl_format_layout.csv   |2 
 src/intel/isl/isl_surface_state.c |  394 --
 src/intel/vulkan/Makefile.am  |6 
 src/intel/vulkan/Makefile.sources |3 
 src/intel/vulkan/anv_allocator.c  |   76 +
 src/intel/vulkan/anv_cmd_buffer.c |   48 +
 src/intel/vulkan/anv_device.c |8 
 src/intel/vulkan/anv_image.c  |3 
 src/intel/vulkan/anv_pipeline.c   |   20 
 src/intel/vulkan/anv_private.h|   21 
 src/intel/vulkan/anv_wsi_wayland.c|   10 
 src/intel/vulkan/anv_wsi_x11.c|3 
 src/intel/vulkan/gen7_cmd_buffer.c|   91 --
 src/intel/vulkan/gen7_pipeline.c  |   24 
 src/intel/vulkan/gen8_pipeline.c  |   21 
 src/intel/vulkan/genX_cmd_buffer.c|   66 +
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 src/compiler/Makefile.sources |1 
 src/compiler/glsl/ast_to_hir.cpp  |   17 
 src/compiler/glsl/builtin_variables.cpp   |   13 
 src/compiler/glsl/linker.cpp  |   20 -
 src/compiler/nir/nir.h|2 
 src/compiler/nir/nir_lower_alu_to_scalar.c|2 
 src/compiler/nir/nir_opt_algebraic.py |2 
 src/compiler/nir/nir_propagate_invariant.c|  196 ++
 src/gallium/auxiliary/gallivm/lp_bld_arit.c   |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   34 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h   |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |4 
 src/gallium/drivers/radeonsi/si_pm4.h |2 
 src/gallium/drivers/radeonsi/si_state.c   |   13 
 src/intel/vulkan/anv_cmd_buffer.c |2 
 src/intel/vulkan/anv_device.c |2 
 src/intel/vulkan/anv_meta_clear.c |1 
 src/intel/vulkan/anv_pipeline.c   |5 
 src/intel/vulkan/anv_private.h|4 
 src/intel/vulkan/gen7_pipeline.c  |1 
 src/intel/vulkan/gen8_cmd_buffer.c|   41 +-
 src/intel/vulkan/gen8_pipeline.c  |6 
 src/intel/vulkan/genX_cmd_buffer.c|   16 
 src/mesa/drivers/dri/i965/brw_context.c   |2 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |5 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   53 ++
 src/mesa/drivers/dri/i965/brw_tcs.c   |6 
 src/mesa/main/image.c |8 
 src/mesa/main/mtypes.h|2 
 src/mesa/main/pipelineobj.c   |   17 
 src/mesa/program/prog_statevars.c |   19 
 src/mesa/program/prog_statevars.h |2 
 src/mesa/state_tracker/st_cb_compute.c|3 
 src/mesa/state_tracker/st_cb_copyimage.c  |3 
 src/mesa/state_tracker/st_cb_texture.c|9 
 src/mesa/state_tracker/st_gen_mipmap.c|3 
 37 files changed, 453 insertions(+), 76 deletions(-)

New commits:
commit 5e0b11cb6dbeab7ca6a1ba2edca56701cdfde96c
Author: Emil Velikov 
Date:   Tue Jun 21 13:32:04 2016 +0100

Update version to 12.0.0-rc4

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 6ef7d92..076ead7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.0-rc3
+12.0.0-rc4

commit 6306930c3f0cd790e9d8995468559453b6c75b2c
Author: Nicolai Hähnle 
Date:   Fri Jun 10 15:59:58 2016 +0200

st/mesa: flush bitmap cache before CopyImageSubData

Found by inspection.

Cc: 11.2 12.0 
Reviewed-by: Marek Olšák 
(cherry picked from commit f9ddd52317caf14a21ec7c040fd4bb944f9842e4)

diff --git a/src/mesa/state_tracker/st_cb_copyimage.c 
b/src/mesa/state_tracker/st_cb_copyimage.c
index 617e470..8afb861 100644
--- a/src/mesa/state_tracker/st_cb_copyimage.c
+++ b/src/mesa/state_tracker/st_cb_copyimage.c
@@ -23,6 +23,7 @@
  */
 
 #include "state_tracker/st_context.h"
+#include "state_tracker/st_cb_bitmap.h"
 #include "state_tracker/st_cb_copyimage.h"
 #include "state_tracker/st_cb_fbo.h"
 #include "state_tracker/st_texture.h"
@@ -547,6 +548,8 @@ st_CopyImageSubData(struct gl_context *ctx,
struct pipe_box box;
int src_level, dst_level;
 
+   st_flush_bitmap_cache(st);
+
if (src_image) {
   struct st_texture_image *src = st_texture_image(src_image);
   src_res = src->pt;

commit 76377387c2d44d0fbae21763386ac86ffb54c635
Author: Nicolai Hähnle 
Date:   Thu Jun 9 12:22:31 2016 +0200

st/mesa: flush bitmap cache before texture functions

As far as I can tell, a sequence of glBitmap followed by texture functions
that refer to a texture bound as the framebuffer is well within what should
be allowed.

Found by inspection.

Cc: 11.2 12.0 
Reviewed-by: Marek Olšák 
(cherry picked from commit e7fff3cfe156e13198107e5e76a77fb79ed02173)

diff --git a/src/mesa/state_tracker/st_cb_texture.c 
b/src/mesa/state_tracker/st_cb_texture.c
index cfe9c4b..cf1c351 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Makefile.am   |2 
 VERSION   |2 
 bin/.cherry-ignore|2 
 configure.ac  |3 
 include/GL/glcorearb.h|  108 +++--
 include/GL/glext.h|   87 +++-
 src/Makefile.am   |2 
 src/compiler/Makefile.sources |2 
 src/compiler/glsl/ast.h   |3 
 src/compiler/glsl/ast_function.cpp|4 
 src/compiler/glsl/ast_to_hir.cpp  |   16 
 src/compiler/glsl/ast_type.cpp|   17 
 src/compiler/glsl/glsl_parser_extras.cpp  |2 
 src/compiler/glsl/link_varyings.cpp   |   23 -
 src/compiler/nir/nir_lower_indirect_derefs.c  |2 
 src/compiler/spirv/spirv_info.c   |  150 +++
 src/compiler/spirv/spirv_info.h   |   27 +
 src/compiler/spirv/spirv_to_nir.c |  123 +
 src/compiler/spirv/vtn_private.h  |3 
 src/compiler/spirv/vtn_variables.c|   16 
 src/gallium/auxiliary/Makefile.am |7 
 src/gallium/auxiliary/Makefile.sources|4 
 src/gallium/auxiliary/tgsi/tgsi_scan.c|   30 +
 src/gallium/auxiliary/tgsi/tgsi_scan.h|1 
 src/gallium/auxiliary/util/u_blit.c   |8 
 src/gallium/auxiliary/vl/vl_winsys_dri3.c |   11 
 src/gallium/drivers/nouveau/codegen/nv50_ir.cpp   |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |7 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   22 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_target.h  |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp   |4 
 src/gallium/drivers/nouveau/nv50/nv50_formats.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_compute.c   |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |   25 -
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h   |1 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |   71 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c|3 
 src/gallium/drivers/nouveau/nvc0/nvc0_tex.c   |   31 +
 src/gallium/drivers/nouveau/nvc0/nve4_compute.c   |8 
 src/gallium/drivers/r600/r600_hw_context.c|   19 
 src/gallium/drivers/radeon/r600_texture.c |5 
 src/gallium/drivers/radeon/radeon_winsys.h|1 
 src/gallium/drivers/radeonsi/si_descriptors.c |   40 +
 src/gallium/drivers/radeonsi/si_hw_context.c  |3 
 src/gallium/drivers/radeonsi/si_state.h   |1 
 src/gallium/drivers/swr/Makefile.am   |1 
 src/gallium/drivers/swr/Makefile.sources  |   10 
 src/gallium/state_trackers/clover/Makefile.am |1 
 src/gallium/state_trackers/clover/api/device.cpp  |4 
 src/gallium/state_trackers/clover/api/platform.cpp|4 
 src/gallium/state_trackers/osmesa/osmesa.c|1 
 src/gallium/targets/va/Makefile.am|   14 
 src/gallium/winsys/amdgpu/drm/amdgpu_surface.c|1 
 src/gallium/winsys/virgl/drm/virgl_drm_winsys.c   |2 
 src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c   |2 
 src/glx/glxcmds.c |   23 +
 src/intel/genxml/gen6.xml |4 
 src/intel/genxml/gen7.xml |4 
 src/intel/genxml/gen75.xml|4 
 src/intel/isl/Android.mk  |6 
 src/intel/isl/Makefile.am |   12 
 src/intel/isl/gen_format_layout.py|  207 ++
 src/intel/isl/isl_format_layout_gen.bash  |  129 --
 src/intel/vulkan/Makefile.am  |2 
 src/intel/vulkan/anv_cmd_buffer.c |   11 
 src/intel/vulkan/anv_descriptor_set.c |   19 
 src/intel/vulkan/anv_device.c |2 
 src/intel/vulkan/anv_entrypoints_gen.py

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.mk|2 
 VERSION   |2 
 configure.ac  |8 
 docs/envvars.html |1 
 src/Makefile.am   |   26 
 src/compiler/Android.glsl.mk  |5 
 src/compiler/glsl/ast_to_hir.cpp  |   23 
 src/compiler/glsl/builtin_variables.cpp   |   31 -
 src/compiler/glsl/glsl_parser_extras.cpp  |4 
 src/compiler/glsl/ir.cpp  |   23 
 src/compiler/glsl/ir.h|6 
 src/compiler/glsl/link_uniform_initializers.cpp   |2 
 src/compiler/glsl/link_varyings.cpp   |   55 +-
 src/compiler/glsl/linker.cpp  |8 
 src/compiler/glsl/lower_distance.cpp  |1 
 src/compiler/nir/nir.c|4 
 src/compiler/nir/nir.h|2 
 src/compiler/nir/nir_gather_info.c|1 
 src/compiler/nir/nir_intrinsics.h |2 
 src/compiler/nir/nir_lower_system_values.c|   16 
 src/compiler/nir/nir_validate.c   |4 
 src/egl/drivers/dri2/platform_android.c   |   15 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp  |6 
 src/gallium/drivers/radeon/radeon_video.c |2 
 src/gallium/drivers/radeonsi/si_state.c   |5 
 src/intel/genxml/Android.mk   |   82 +++
 src/intel/genxml/Makefile.am  |4 
 src/intel/genxml/gen_pack_header.py   |   20 
 src/intel/isl/Android.mk  |  155 +
 src/intel/isl/Makefile.am |2 
 src/intel/isl/Makefile.sources|1 
 src/intel/vulkan/anv_cmd_buffer.c |   52 -
 src/intel/vulkan/anv_entrypoints_gen.py   |   28 +
 src/intel/vulkan/anv_pipeline.c   |4 
 src/intel/vulkan/anv_private.h|1 
 src/intel/vulkan/gen7_cmd_buffer.c|   15 
 src/intel/vulkan/gen8_cmd_buffer.c|   13 
 src/intel/vulkan/genX_cmd_buffer.c|4 
 src/intel/vulkan/genX_pipeline.c  |   12 
 src/mesa/drivers/dri/i965/Android.mk  |3 
 src/mesa/drivers/dri/i965/Makefile.sources|1 
 src/mesa/drivers/dri/i965/brw_compiler.h  |   22 
 src/mesa/drivers/dri/i965/brw_context.c   |   38 +
 src/mesa/drivers/dri/i965/brw_cs.c|3 
 src/mesa/drivers/dri/i965/brw_defines.h   |3 
 src/mesa/drivers/dri/i965/brw_eu_emit.c   |6 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |  379 +++---
 src/mesa/drivers/dri/i965/brw_fs.h|1 
 src/mesa/drivers/dri/i965/brw_fs_builder.h|   10 
 src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp|7 
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp |9 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   27 
 src/mesa/drivers/dri/i965/brw_ir_fs.h |   20 
 src/mesa/drivers/dri/i965/brw_nir.h   |2 
 src/mesa/drivers/dri/i965/brw_nir_intrinsics.c|  179 ++
 src/mesa/drivers/dri/i965/brw_tcs.c   |   19 
 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp |3 
 src/mesa/drivers/dri/i965/gen7_cs_state.c |  121 ++--
 src/mesa/drivers/dri/i965/gen7_sol_state.c|   10 
 src/mesa/drivers/dri/i965/gen8_surface_state.c|   13 
 src/mesa/drivers/dri/i965/intel_debug.c   |1 
 src/mesa/drivers/dri/i965/intel_debug.h   |1 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |2 
 src/mesa/main/bufferobj.c |2 
 src/mesa/main/fbobject.c  |3 
 src/mesa/main/mtypes.h|3 
 src/mesa/main/samplerobj.c|   37 -
 src/mesa/main/shader_query.cpp|2 
 src/mesa/main/shaderobj.c |2 
 src/mesa/state_tracker/st_extensions.c|1 
 71 files changed, 1095 insertions(+), 486 deletions(-)

New commits:
commit a7649abe9fc19671493957a8ffbbf6053c77cab4
Author: Emil Velikov 
Date:   Mon Jun 6 16:42:59 2016 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 9a56e7d25becff637e5dfcadac9b6490f1ba4001
Author: Emil Velikov 
Date:   Mon May 30 18:51:53 2016 +0100

Update version to 12.0.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 677ed99..cbc76f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.0-devel
+12.0.0-rc1

commit 7ad2cb6f08bf318219ceb02d297f794db9221efa
Author: Emil Velikov 
Date:   Mon May 30 18:50:17 2016 +0100

docs: rename release notes to 12.0.0

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.3.0.html b/docs/relnotes/11.3.0.html
deleted file mode 100644
index a19f284..000
--- a/docs/relnotes/11.3.0.html
+++ /dev/null
@@ -1,89 +0,0 @@
-http://www.w3.org/TR/html4/loose.dtd;>
-
-
-  
-  Mesa Release Notes
-  
-
-
-
-
-  The Mesa 3D Graphics Library
-
-
-
-
-
-Mesa 11.3.0 Release Notes / TBD
-
-
-Mesa 11.3.0 is a new development release.
-People who are concerned with stability and reliability should stick
-with a previous release or wait for Mesa 11.3.1.
-
-
-Mesa 11.3.0 implements the OpenGL 4.3 API, but the version reported by
-glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 4.3.  OpenGL
-4.3 is only available if requested at context creation
-because compatibility contexts are not supported.
-
-
-
-SHA256 checksums
-
-TBD.
-
-
-
-New features
-
-
-Note: some of the new features are only available with certain drivers.
-
-
-
-OpenGL 4.3 on nvc0, radeonsi, i965 (Gen8+)
-OpenGL ES 3.1 on nvc0, radeonsi
-GL_ARB_ES3_1_compatibility on nvc0, radeonsi
-GL_ARB_compute_shader on nvc0, radeonsi, softpipe
-GL_ARB_cull_distance on i965/gen6+, nv50, nvc0, llvmpipe, softpipe
-GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi, softpipe
-GL_ARB_internalformat_query2 on all drivers
-GL_ARB_query_buffer_object on i965/hsw+
-GL_ARB_robust_buffer_access_behavior on i965, nvc0, radeonsi
-GL_ARB_shader_atomic_counters on radeonsi, softpipe
-GL_ARB_shader_atomic_counter_ops on nvc0, radeonsi, softpipe
-GL_ARB_shader_image_load_store on nvc0, radeonsi, softpipe
-GL_ARB_shader_image_size on nvc0, radeonsi, softpipe
-GL_ARB_shader_storage_buffer_objects on radeonsi, softpipe
-GL_ATI_fragment_shader on all Gallium drivers
-GL_EXT_base_instance on all drivers that support GL_ARB_base_instance
-GL_EXT_clip_cull_distance on all drivers that support 
GL_ARB_cull_distance
-GL_KHR_robustness on i965
-GL_OES_copy_image on i965 (Baytrail and Gen8+)
-GL_OES_draw_buffers_indexed and GL_EXT_draw_buffers_indexed on all drivers 
that support GL_ARB_draw_buffers_blend
-GL_OES_gpu_shader5 and GL_EXT_gpu_shader5 on all drivers that support 
GL_ARB_gpu_shader5
-GL_OES_sample_shading on i965, nvc0, r600, radeonsi
-GL_OES_sample_variables on i965, nvc0, r600, radeonsi
-GL_OES_shader_image_atomic on all drivers that support 
GL_ARB_shader_image_load_store
-GL_OES_shader_io_blocks on i965, nvc0, radeonsi
-GL_OES_shader_multisample_interpolation on i965, nvc0, r600, radeonsi
-GL_OES_texture_border_clamp and GL_EXT_texture_border_clamp on all drivers 
that support GL_ARB_texture_border_clamp
-GL_OES_texture_buffer and GL_EXT_texture_buffer on i965, nvc0, 
radeonsi
-EGL_KHR_reusable_sync on all drivers
-GL_ARB_stencil_texture8 and GL_OES_stencil_texture8 on i965/gen8+
-
-
-Bug fixes
-
-TBD.
-
-Changes
-
-TBD.
-
-
-
-
diff --git a/docs/relnotes/12.0.0.html b/docs/relnotes/12.0.0.html
new file mode 100644
index 000..25b9b68
--- /dev/null
+++ b/docs/relnotes/12.0.0.html
@@ -0,0 +1,89 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 12.0.0 Release Notes / TBD
+
+
+Mesa 12.0.0 is a new development release.
+People who are concerned with stability and reliability should stick
+with a previous release or wait for Mesa 12.0.1.
+
+
+Mesa 12.0.0 implements the OpenGL 4.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.3.  OpenGL
+4.3 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD.
+
+
+
+New features
+
+
+Note: some of the new features are only available with certain drivers.
+
+
+
+OpenGL 4.3 on nvc0, radeonsi, i965 (Gen8+)
+OpenGL ES 3.1 on nvc0, radeonsi
+GL_ARB_ES3_1_compatibility on nvc0, radeonsi
+GL_ARB_compute_shader on nvc0, radeonsi, softpipe
+GL_ARB_cull_distance on i965/gen6+, nv50, nvc0, llvmpipe, softpipe
+GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi, softpipe
+GL_ARB_internalformat_query2 on all drivers
+GL_ARB_query_buffer_object 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |4 
 docs/relnotes/11.2.0.html |3 
 docs/relnotes/11.2.1.html |  118 
 include/D3D9/d3d9types.h  |   16 -
 src/compiler/glsl/glsl_lexer.ll   |2 
 src/compiler/glsl/lower_variable_index_to_cond_assign.cpp |   20 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |2 
 src/gallium/drivers/radeonsi/si_state.c   |2 
 src/gallium/state_trackers/va/context.c   |4 
 src/gallium/state_trackers/va/image.c |4 
 src/mesa/drivers/dri/common/drirc |8 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |   10 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|   14 
 src/mesa/drivers/dri/i965/gen7_blorp.cpp  |5 
 src/mesa/drivers/dri/i965/intel_tiled_memcpy.c|  198 ++
 src/mesa/state_tracker/st_cb_drawpixels.c |   23 +
 src/mesa/state_tracker/st_cb_fbo.c|2 
 18 files changed, 309 insertions(+), 128 deletions(-)

New commits:
commit 21e6440e82808364a6c2cc38ea92651c99b69aad
Author: Emil Velikov 
Date:   Sun Apr 17 16:03:34 2016 +0100

docs: add release notes for 11.2.1

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.2.1.html b/docs/relnotes/11.2.1.html
new file mode 100644
index 000..3100ebb
--- /dev/null
+++ b/docs/relnotes/11.2.1.html
@@ -0,0 +1,118 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 11.2.1 Release Notes / April 17, 2016
+
+
+Mesa 11.2.1 is a bug fix release which fixes bugs found since the 11.2.0 
release.
+
+
+Mesa 11.2.1 implements the OpenGL 4.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.1.  OpenGL
+4.1 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+Bug fixes
+
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=93962;>Bug 93962 
- [HSW, regression, bisected, CTS] ES2-CTS.gtf.GL2FixedTests.scissor.scissor - 
segfault/asserts
+
+
+
+
+Changes
+
+Brian Paul (2):
+
+  st/mesa: fix glReadBuffer() assertion failure
+  st/mesa: fix memleak in glDrawPixels cache code
+
+
+Christian Schmidbauer (1):
+
+  st/nine: specify WINAPI only for i386 and amd64
+
+
+Emil Velikov (3):
+
+  docs: add sha256 checksums for 11.2.0
+  configure.ac: update the path of the generated files
+  Update version to 11.2.1
+
+
+Ilia Mirkin (1):
+
+  glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310
+
+
+Iurie Salomov (1):
+
+  va: check null context in vlVaDestroyContext
+
+
+Jason Ekstrand (2):
+
+  i965/tiled_memcopy: Add aligned mem_copy parameters to the [de]tiling 
functions
+  i965/tiled_memcpy: Rework the RGBA - BGRA mem_copy functions
+
+
+Kenneth Graunke (3):
+
+  i965: Fix textureSize() depth value for 1 layer surfaces on Gen4-6.
+  i965: Use brw-urb.min_vs_urb_entries instead of 32 for BLORP.
+  glsl: Lower variable indexing of system value arrays 
unconditionally.
+
+
+Marek Olšák (1):
+
+  drirc: add a workaround for blackness in Warsow
+
+
+Nicolai Hähnle (1):
+
+  radeonsi: fix bounds check in si_create_vertex_elements
+
+
+Samuel Pitoiset (1):
+
+  nv50/ir: do not try to attach JOIN ops to ATOM
+
+
+Thomas Hindoe Paaboel Andersen (1):
+
+  st/va: avoid dereference after free in vlVaDestroyImage
+
+
+
+
+
+

commit 696614cbff849dc3644a35307d3f82ea1ec66266
Author: Emil Velikov 
Date:   Sun Apr 17 14:51:55 2016 +0100

Update version to 11.2.1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index b85c6c7..dc170a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.0
+11.2.1

commit 106c1facae8f8e2e27d670397d1276958f0143c4
Author: Iurie Salomov 
Date:   Tue Apr 12 23:24:30 2016 +0100

va: check null context in vlVaDestroyContext

Signed-off-by: Iurie Salomov 
Reviewed-by: Julien Isorce 
(cherry picked from commit 047e3264f67bc54365be7b0e163b6910a9e9de3a)
Nominated-by: Emil Velikov 

diff --git a/src/gallium/state_trackers/va/context.c 
b/src/gallium/state_trackers/va/context.c
index b25c381..25d587a 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -283,6 +283,10 @@ 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 docs/relnotes/11.2.0.html  |  214 
+-
 src/egl/drivers/dri2/platform_android.c|4 
 src/egl/main/eglapi.c  |2 
 src/egl/main/eglconfig.c   |   12 
 src/egl/main/eglconfig.h   |4 
 src/egl/main/egldisplay.h  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp  |   12 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |   18 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp  |   37 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp  |   35 -
 src/gallium/drivers/radeonsi/si_shader.c   |3 
 src/mesa/Android.libmesa_dricore.mk|7 
 src/mesa/Android.libmesa_sse41.mk  |   44 ++
 src/mesa/Android.libmesa_st_mesa.mk|4 
 src/mesa/Android.mk|1 
 src/mesa/Makefile.sources  |4 
 17 files changed, 310 insertions(+), 95 deletions(-)

New commits:
commit ff9ddb9eb1b3b25f40e71a95bb48421abfcb11d9
Author: Emil Velikov 
Date:   Mon Apr 4 11:39:34 2016 +0100

docs: Update 11.2.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.2.0.html b/docs/relnotes/11.2.0.html
index baedb4c..f605389 100644
--- a/docs/relnotes/11.2.0.html
+++ b/docs/relnotes/11.2.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 11.2.0 Release Notes / TBD
+Mesa 11.2.0 Release Notes / 4 April 2016
 
 
 Mesa 11.2.0 is a new development release.
@@ -70,7 +70,217 @@ Note: some of the new features are only available with 
certain drivers.
 
 Bug fixes
 
-TBD.
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=27512;>Bug 27512 
- Illegal instruction _mesa_x86_64_transform_points4_general
+
+https://bugs.freedesktop.org/show_bug.cgi?id=75165;>Bug 75165 
- compute.c:464:49: error: function definition is not allowed here
+
+https://bugs.freedesktop.org/show_bug.cgi?id=79783;>Bug 79783 
- Distorted output in obs-studio where other vendors work
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89330;>Bug 89330 
- piglit glsl-1.50 invariant-qualifier-in-out-block-01 regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89969;>Bug 89969 
- nouveau: add support for chunk decoding in order to support vaapi (st/va)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90348;>Bug 90348 
- Spilling failure of b96 merged value
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91526;>Bug 91526 
- World of Warcraft (on Wine) has UI corruption with nouveau
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91596;>Bug 91596 
- EGL_KHR_gl_colorspace (v2) causes problem with Android-x86 GUI
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91806;>Bug 91806 
- configure does not test whether assembler supports sse4.1
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91927;>Bug 91927 
- [SKL] [regression] piglit compressed textures tests fail  with kernel 
upgrade
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92193;>Bug 92193 
- [SKL] 
ES2-CTS.gtf.GL2ExtensionTests.compressed_astc_texture.compressed_astc_texture 
fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92229;>Bug 92229 
- [APITRACE] SOMA have serious graphical errors
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92233;>Bug 92233 
- Unigine Heaven 4.0 silhuette run
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92363;>Bug 92363 
- [BSW/BDW] ogles1conform Gets test fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92438;>Bug 92438 
- Segfault in pushbuf_kref when running the android emulator (qemu) on nv50
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92589;>Bug 92589 
- [BDW BSW SKL CTS] ES31-CTS.texture_gather.* GPU_HANG
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92595;>Bug 92595 
- [HSW,BDW,SKL][GLES 3.1 CTS] Big difference in the results for the 
ES31-CTS.shader_bitfield_operation.* tests
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92609;>Bug 92609 
- [BDW, BSW] piglit sampling-2d-array-as-2d-layer fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92687;>Bug 92687 
- Add support for ARB_internalformat_query2
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92706;>Bug 92706 
- glBlitFramebuffer refuses to blit RGBA to RGB with MSAA
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92709;>Bug 92709 
- LLVM triggered Diagnostic Handler: unsupported call to function ldexpf 
in main when starting race in stuntrally
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92743;>Bug 92743 
- Centroid shouldn't have to match between the FS and the VS
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92759;>Bug 92759 
- [Regression, bisected] Visuals without alpha bits are not sRGB-capable
+

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 src/compiler/glsl/linker.cpp   |7 
 src/egl/drivers/dri2/platform_x11.c|3 
 src/egl/main/eglconfig.c   |1 
 src/egl/main/egldefines.h  |7 
 src/egl/main/eglsurface.c  |6 
 src/gallium/auxiliary/draw/draw_pipe_stipple.c |   30 +--
 src/gallium/auxiliary/tgsi/tgsi_text.c |4 
 src/gallium/drivers/llvmpipe/lp_rast.h |6 
 src/gallium/drivers/llvmpipe/lp_setup_tri.c|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp  |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp  |   12 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |   18 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp  |   35 +++
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp  |   57 +-
 src/gallium/drivers/nouveau/nv50/nv50_shader_state.c   |2 
 src/gallium/drivers/nouveau/nv50/nv50_state.c  |4 
 src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c   |1 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c  |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c|   19 +-
 src/gallium/drivers/r600/r600_state_common.c   |   24 +-
 src/gallium/drivers/r600/sb/sb_expr.cpp|8 
 src/gallium/drivers/radeon/r600_buffer_common.c|6 
 src/gallium/drivers/radeon/r600_texture.c  |   10 -
 src/gallium/drivers/radeon/radeon_video.c  |3 
 src/gallium/drivers/radeonsi/si_descriptors.c  |1 
 src/gallium/drivers/softpipe/sp_tex_sample.c   |9 -
 src/gallium/state_trackers/clover/core/kernel.cpp  |2 
 src/gallium/state_trackers/omx/vid_dec.c   |   21 +-
 src/gallium/state_trackers/omx/vid_dec.h   |7 
 src/gallium/state_trackers/omx/vid_dec_h264.c  |   26 ++
 src/gallium/state_trackers/omx/vid_dec_mpeg12.c|6 
 src/gallium/state_trackers/omx/vid_enc.c   |   44 ++--
 src/gallium/winsys/svga/drm/vmw_screen_ioctl.c |3 
 src/gallium/winsys/svga/drm/vmw_surface.c  |2 
 src/mesa/drivers/dri/i965/brw_fs.cpp   |   20 ++
 src/mesa/drivers/dri/i965/brw_fs.h |1 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   |   12 +
 src/mesa/drivers/dri/i965/brw_pipe_control.c   |2 
 src/mesa/drivers/dri/i965/brw_reg.h|   16 +
 src/mesa/drivers/dri/i965/brw_vec4.cpp |1 
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp |4 
 src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp |   16 +
 src/mesa/drivers/dri/i965/brw_vec4_tes.cpp |   90 
++
 src/mesa/drivers/dri/i965/intel_copy_image.c   |6 
 src/mesa/drivers/dri/i965/intel_fbo.c  |   23 ++
 src/mesa/drivers/dri/i965/intel_tex_image.c|2 
 src/mesa/state_tracker/st_cb_fbo.c |   22 +-
 src/mesa/state_tracker/st_cb_texture.c |5 
 src/mesa/swrast/s_context.c|5 
 50 files changed, 459 insertions(+), 164 deletions(-)

New commits:
commit bcb7e8b084f334e101d3a95c8f1d78bc77d653c2
Author: Emil Velikov 
Date:   Wed Mar 30 00:10:07 2016 +0100

Update version to 11.2.0-rc4

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 1568ccd..0cdc786 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.0-rc3
+11.2.0-rc4

commit 0efb7fb803f49b358a7976eba2d8b9f4956ab052
Author: Kenneth Graunke 
Date:   Fri Mar 25 15:33:35 2016 -0700

i965: Fix brw_render_cache_set_check_flush's PIPE_CONTROLs.

Our driver uses the brw_render_cache mechanism to track buffers we've
rendered to and are about to sample from.

Previously, we did a single PIPE_CONTROL with the following bits set:
- Render Target Flush
- Depth Cache Flush
- Texture Cache Invalidate
- VF Cache Invalidate
- Instruction Cache Invalidate
- CS Stall

This combined both "top of pipe" invalidations and "bottom of pipe"
flushes, which isn't how the hardware is intended to be programmed.

The "top of pipe" invalidations may happen right away, without any
guarantees that rendering using those caches has completed.  That
rendering may continue altering the caches.  The "bottom 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk |4 +
 Android.mk|6 +-
 Makefile.am   |7 +-
 VERSION   |2 
 bin/get-extra-pick-list.sh|   35 
 include/pci_ids/virtio_gpu_pci_ids.h  |1 
 install-gallium-links.mk  |   15 -
 src/compiler/Android.gen.mk   |4 +
 src/compiler/glsl/Android.gen.mk  |4 +
 src/compiler/glsl/Android.mk  |3 -
 src/compiler/glsl/ir.h|1 
 src/compiler/glsl/linker.cpp  |1 
 src/egl/Android.mk|6 +-
 src/egl/drivers/dri2/platform_wayland.c   |   39 --
 src/gallium/auxiliary/Android.mk  |6 +-
 src/gallium/auxiliary/tgsi/tgsi_scan.c|   10 +++
 src/gallium/drivers/freedreno/Android.mk  |8 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |7 ++
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/r300/Android.mk   |1 
 src/gallium/drivers/r600/evergreen_state.c|   13 
 src/gallium/drivers/r600/r600_isa.h   |   16 ++---
 src/gallium/drivers/r600/r600_state.c |6 --
 src/gallium/drivers/r600/r600_state_common.c  |7 ++
 src/gallium/drivers/radeon/r600_pipe_common.h |2 
 src/gallium/drivers/radeon/r600_texture.c |9 ++-
 src/gallium/drivers/radeonsi/si_state.c   |6 --
 src/gallium/drivers/vc4/Android.mk|6 +-
 src/gallium/drivers/virgl/virgl_encode.c  |4 +
 src/gallium/drivers/virgl/virgl_protocol.h|2 
 src/gallium/state_trackers/clover/Makefile.am |1 
 src/gallium/state_trackers/nine/Makefile.sources  |1 
 src/gallium/state_trackers/nine/buffer9.c |   26 ++---
 src/gallium/state_trackers/nine/nine_shader.c |   38 +++--
 src/gallium/targets/dri/Android.mk|5 +
 src/gallium/targets/opencl/Makefile.am|3 -
 src/mesa/Android.libmesa_dricore.mk   |1 
 src/mesa/Android.libmesa_glsl_utils.mk|2 
 src/mesa/Android.libmesa_st_mesa.mk   |1 
 src/mesa/Android.mesa_gen_matypes.mk  |3 -
 src/mesa/drivers/dri/Android.mk   |5 -
 src/mesa/drivers/dri/common/Android.mk|   22 ---
 src/mesa/drivers/dri/i915/Android.mk  |5 +
 src/mesa/drivers/dri/i965/Android.mk  |5 +
 src/mesa/drivers/dri/i965/brw_fs_cse.cpp  |2 
 src/mesa/main/debug_output.c  |   20 ++-
 src/mesa/main/fbobject.c  |1 
 src/mesa/main/get.c   |2 
 src/mesa/main/get_hash_params.py  |3 +
 src/mesa/main/readpix.c   |2 
 src/mesa/main/shaderobj.c |2 
 src/mesa/program/Android.mk   |5 +
 src/mesa/state_tracker/st_cb_fbo.c|   13 +++-
 54 files changed, 273 insertions(+), 130 deletions(-)

New commits:
commit 9f21fdd8e697a1a0868f4ec4573235325294b7b3
Author: Emil Velikov 
Date:   Mon Mar 7 09:19:12 2016 +

Update version to 11.2.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index b7ce1a2..1568ccd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.0-rc2
+11.2.0-rc3

commit 3d32af2d59a486761fdb030cbccdf6e8308ff83f
Author: Kenneth Graunke 
Date:   Thu Mar 3 00:43:15 2016 -0800

mesa: Allow Get*() of several forgotten IsEnabled() pnames.

From section 6.2 ("State Tables") of the GL 2.1 specification
(the text also appears in the GL 3.0 and ES 3.1 specifications):
"However, state variables for which IsEnabled is listed as the query
 command can also be obtained using GetBooleanv, GetIntegerv, GetFloatv,
 and GetDoublev."

GL_DEBUG_OUTPUT, GL_DEBUG_OUTPUT_SYNCHRONOUS, and GL_FRAGMENT_SHADER_ATI
were missing from the glGet*() functions.  All other IsEnabled() pnames
look to be present, as far as I can tell.

Fixes 8 dEQP-GLES31.functional.debug.state_query subtests:

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 .dir-locals.el|1 
 Android.common.mk |   12 
 Makefile.am   |1 
 VERSION   |2 
 appveyor.yml  |   11 
 configure.ac  |   15 
 docs/GL3.txt  |   12 
 docs/envvars.html |   30 
 docs/index.html   |6 
 docs/install.html |3 
 docs/relnotes.html|1 
 docs/relnotes/11.1.2.html |  182 
 docs/relnotes/11.2.0.html |8 
 include/D3D9/d3d9types.h  |1 
 include/c99/inttypes.h|  305 
 include/c99/stdbool.h |   46 
 include/c99/stdint.h  |  247 
 include/c99_compat.h  |8 
 include/c99_math.h|   49 
 include/d3dadapter/present.h  |3 
 include/pci_ids/i965_pci_ids.h|   18 
 scons/gallium.py  |   16 
 src/compiler/.gitignore   |1 
 src/compiler/Makefile.am  |2 
 src/compiler/builtin_type_macros.h|1 
 src/compiler/glsl/.gitignore  |1 
 src/compiler/glsl/ast.h   |   12 
 src/compiler/glsl/ast_function.cpp|  166 
 src/compiler/glsl/ast_to_hir.cpp  |  191 
 src/compiler/glsl/ast_type.cpp|   13 
 src/compiler/glsl/builtin_functions.cpp   |4 
 src/compiler/glsl/builtin_variables.cpp   |   15 
 src/compiler/glsl/glcpp/glcpp-parse.y |3 
 src/compiler/glsl/glsl_lexer.ll   |4 
 src/compiler/glsl/glsl_parser_extras.cpp  |  115 
 src/compiler/glsl/glsl_parser_extras.h|   12 
 src/compiler/glsl/ir.cpp  |   17 
 src/compiler/glsl/ir.h|   19 
 src/compiler/glsl/ir_clone.cpp|1 
 src/compiler/glsl/link_uniform_initializers.cpp   |1 
 src/compiler/glsl/link_uniforms.cpp   |  164 
 src/compiler/glsl/link_varyings.cpp   |   54 
 src/compiler/glsl/linker.cpp  |  411 -
 src/compiler/glsl/linker.h|   17 
 src/compiler/glsl/lower_discard_flow.cpp  |4 
 src/compiler/glsl/main.cpp|   17 
 src/compiler/glsl/opt_tree_grafting.cpp   |   11 
 src/compiler/glsl/program.h   |5 
 src/compiler/glsl/tests/sampler_types_test.cpp|2 
 src/compiler/glsl/tests/uniform_initializer_utils.cpp |3 
 src/compiler/glsl/tests/varyings_test.cpp |   78 
 src/compiler/glsl_types.cpp   |  204 
 src/compiler/glsl_types.h |   38 
 src/compiler/nir/glsl_to_nir.cpp  |   37 
 src/compiler/nir/nir.c|   24 
 src/compiler/nir/nir.h|  130 
 src/compiler/nir/nir_algebraic.py |9 
 src/compiler/nir/nir_builder.h|2 
 src/compiler/nir/nir_clone.c  |8 
 src/compiler/nir/nir_instr_set.c  |   18 
 src/compiler/nir/nir_intrinsics.c |   10 
 src/compiler/nir/nir_intrinsics.h |  177 
 src/compiler/nir/nir_lower_atomics.c  |4 
 src/compiler/nir/nir_lower_clip.c |8 
 src/compiler/nir/nir_lower_gs_intrinsics.c|4 
 src/compiler/nir/nir_lower_io.c   |   12 
 src/compiler/nir/nir_lower_locals_to_regs.c   |2 
 src/compiler/nir/nir_lower_samplers.c |   29 
 src/compiler/nir/nir_lower_tex.c  |6 
 src/compiler/nir/nir_lower_two_sided_color.c  |4 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit e7a27f70b91e202ad9afc3e67e1080572d4d4a0b
Author: Dave Airlie 
Date:   Tue Feb 2 17:54:43 2016 +1000

virgl: mark function as static

This is fallout from the previous changes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93961

Signed-off-by: Dave Airlie 

diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c 
b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
index a49a89e..ba00988 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
@@ -754,7 +754,7 @@ static void virgl_fence_reference(struct virgl_winsys *vws,
 }
 
 
-struct virgl_winsys *
+static struct virgl_winsys *
 virgl_drm_winsys_create(int drmFD)
 {
struct virgl_drm_winsys *qdws;

commit 7221b8aec648c0da3f7ce386e143e9fdbb36a0ce
Author: Roland Scheidegger 
Date:   Tue Feb 2 03:51:22 2016 +0100

gallivm: add PK2H/UP2H support

Add support for these opcodes, the conversion functions were already
there albeit need some new packing stuff.
Just like the tgsi version, piglit won't like it for all the same
reasons, so it's disabled (UP2H passes piglit arb_shader_language_packing
tests, albeit since PK2H won't due to those rounding differences I don't
know if that one works or not as the piglit test is rather difficult to
deal with).

Reviewed-by: Brian Paul 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c 
b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
index daa2043..d80c997 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
@@ -273,7 +273,7 @@ lp_build_uninterleave1(struct gallivm_state *gallivm,
unsigned i;
assert(num_elems <= LP_MAX_VECTOR_LENGTH);
 
-   for(i = 0; i < num_elems / 2; ++i)
+   for (i = 0; i < num_elems / 2; ++i)
   elems[i] = lp_build_const_int32(gallivm, 2*i + lo_hi);
 
shuffle = LLVMConstVector(elems, num_elems / 2);
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c 
b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
index f6b42ee..43af6b4 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
@@ -548,9 +548,10 @@ pk2h_fetch_args(
 }
 
 static void
-pk2h_emit(const struct lp_build_tgsi_action *action,
-  struct lp_build_tgsi_context *bld_base,
-  struct lp_build_emit_data *emit_data)
+pk2h_emit(
+   const struct lp_build_tgsi_action *action,
+   struct lp_build_tgsi_context *bld_base,
+   struct lp_build_emit_data *emit_data)
 {
struct gallivm_state *gallivm = bld_base->base.gallivm;
struct lp_type f16i_t;
@@ -575,9 +576,10 @@ static struct lp_build_tgsi_action pk2h_action = {
 /* TGSI_OPCODE_UP2H */
 
 static void
-up2h_emit(const struct lp_build_tgsi_action *action,
-  struct lp_build_tgsi_context *bld_base,
-  struct lp_build_emit_data *emit_data)
+up2h_emit(
+   const struct lp_build_tgsi_action *action,
+   struct lp_build_tgsi_context *bld_base,
+   struct lp_build_emit_data *emit_data)
 {
struct gallivm_state *gallivm = bld_base->base.gallivm;
LLVMBuilderRef builder = gallivm->builder;

commit 5171ec9ca92ce489e32c227ae3b4b6df621bbf40
Author: Roland Scheidegger 
Date:   Fri Jan 29 02:49:22 2016 +0100

gallivm: add PK2H/UP2H support

Add support for these opcodes, the conversion functions were already
there albeit need some new packing stuff.
Just like the tgsi version, piglit won't like it for all the same
reasons, so it's disabled (UP2H passes piglit arb_shader_language_packing
tests, albeit since PK2H won't due those rounding differences I don't
know if that one works or not as the piglit test is rather difficult to
deal with).

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_conv.c 
b/src/gallium/auxiliary/gallivm/lp_bld_conv.c
index 7854142..7cf0dee 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_conv.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_conv.c
@@ -130,6 +130,7 @@ lp_build_half_to_float(struct gallivm_state *gallivm,
  *
  * Convert float32 to half floats, preserving Infs and NaNs,
  * with rounding towards zero (trunc).
+ * XXX: For GL, would prefer rounding towards nearest(-even).
  */
 LLVMValueRef
 lp_build_float_to_half(struct gallivm_state *gallivm,
@@ -143,6 +144,15 @@ lp_build_float_to_half(struct gallivm_state *gallivm,
struct lp_type i16_type = lp_type_int_vec(16, 16 * length);
LLVMValueRef result;
 
+   /*
+* Note: Newer llvm versions (3.6 or so) support fptrunc to 16 bits
+* directly, without any (x86 or generic) intrinsics.
+* Albeit the rounding mode cannot be specified (and is undefined,
+* though in practice on x86 seems to do nearest-even but it may
+* be dependent on instruction set support), so is essentially
+* 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 bin/.cherry-ignore|5 
 configure.ac  |   19 
 docs/relnotes/11.1.0.html |3 
 docs/relnotes/11.1.1.html |  196 ++
 include/pci_ids/i965_pci_ids.h|   22 +
 src/gallium/auxiliary/tgsi/tgsi_scan.c|3 
 src/gallium/auxiliary/tgsi/tgsi_scan.h|1 
 src/gallium/auxiliary/util/u_helpers.c|8 
 src/gallium/drivers/freedreno/ir3/ir3_print.c |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |  129 ++
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h   |   10 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |6 
 src/gallium/drivers/nouveau/nv50/nv50_query_hw.c  |6 
 src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c   |3 
 src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c   |4 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|5 
 src/gallium/drivers/nouveau/nv50/nv50_state.c |7 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |2 
 src/gallium/drivers/nouveau/nv50/nv98_video_bsp.c |4 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c   |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c  |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c   |3 
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c   |4 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|1 
 src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c  |1 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_video_bsp.c |4 
 src/gallium/drivers/r600/evergreen_state.c|   11 
 src/gallium/drivers/r600/r600_shader.c|3 
 src/gallium/drivers/r600/r600_state.c |2 
 src/gallium/drivers/radeon/Makefile.am|5 
 src/gallium/drivers/radeon/cayman_msaa.c  |   12 
 src/gallium/drivers/radeon/r600_query.c   |6 
 src/gallium/drivers/radeon/r600d_common.h |2 
 src/gallium/drivers/radeon/radeon_llvm_emit.c |5 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   18 
 src/gallium/drivers/vc4/vc4_job.c |8 
 src/gallium/drivers/vc4/vc4_qpu_schedule.c|3 
 src/gallium/targets/opencl/Makefile.am|5 
 src/glsl/ir_set_program_inouts.cpp|   28 -
 src/glsl/link_varyings.cpp|   19 
 src/glsl/linker.cpp   |   13 
 src/glsl/nir/glsl_types.cpp   |   18 
 src/glsl/nir/glsl_types.h |   13 
 src/glsl/nir/nir.h|1 
 src/glsl/nir/nir_opt_algebraic.py |1 
 src/glx/dri3_glx.c|6 
 src/mesa/drivers/common/meta_generate_mipmap.c|   17 
 src/mesa/drivers/dri/common/drirc |8 
 src/mesa/drivers/dri/i965/brw_context.c   |6 
 src/mesa/drivers/dri/i965/brw_device_info.c   |   60 +++
 src/mesa/drivers/dri/i965/brw_shader.cpp  |1 
 src/mesa/drivers/dri/i965/brw_surface_formats.c   |5 
 src/mesa/main/atifragshader.c |2 
 src/mesa/main/shader_query.cpp|   11 
 src/mesa/main/varray.c|2 
 src/mesa/program/prog_parameter.c |   47 +-
 src/mesa/program/prog_parameter.h |4 
 src/mesa/state_tracker/st_atom.c  |2 
 src/mesa/state_tracker/st_cb_bitmap.c |6 
 src/mesa/state_tracker/st_cb_drawpixels.c |   14 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|6 
 src/mesa/state_tracker/st_program.c   |   17 
 src/mesa/state_tracker/st_program.h   |1 
 src/util/ralloc.c |1 
 69 files changed, 647 insertions(+), 227 deletions(-)

New commits:
commit 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 bin/.cherry-ignore|2 
 docs/envvars.html |6 
 docs/relnotes/11.1.0.html |  191 ++
 include/GLES2/gl2ext.h|  940 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|   15 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |2 
 src/gallium/drivers/r600/r600_shader.c|  153 +
 src/gallium/drivers/radeon/r600_pipe_common.c |4 
 src/gallium/drivers/radeon/r600_texture.c |4 
 src/gallium/drivers/radeonsi/si_debug.c   |2 
 src/gallium/drivers/radeonsi/si_shader.c  |   28 
 src/gallium/drivers/vc4/Makefile.sources  |1 
 src/gallium/drivers/vc4/kernel/vc4_packet.h   |   15 
 src/gallium/drivers/vc4/kernel/vc4_render_cl.c|  276 ++
 src/gallium/drivers/vc4/kernel/vc4_validate.c |   94 -
 src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c |   71 
 src/gallium/drivers/vc4/vc4_blit.c|   65 
 src/gallium/drivers/vc4/vc4_context.c |   25 
 src/gallium/drivers/vc4/vc4_context.h |   11 
 src/gallium/drivers/vc4/vc4_draw.c|   16 
 src/gallium/drivers/vc4/vc4_drm.h |   11 
 src/gallium/drivers/vc4/vc4_emit.c|   46 
 src/gallium/drivers/vc4/vc4_job.c |  105 -
 src/gallium/drivers/vc4/vc4_nir_lower_blend.c |  133 +
 src/gallium/drivers/vc4/vc4_nir_lower_io.c|   14 
 src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c|  172 +
 src/gallium/drivers/vc4/vc4_opt_algebraic.c   |8 
 src/gallium/drivers/vc4/vc4_program.c |  162 +
 src/gallium/drivers/vc4/vc4_qir.c |   13 
 src/gallium/drivers/vc4/vc4_qir.h |   34 
 src/gallium/drivers/vc4/vc4_qpu.h |   11 
 src/gallium/drivers/vc4/vc4_qpu_emit.c|   15 
 src/gallium/drivers/vc4/vc4_qpu_schedule.c|4 
 src/gallium/drivers/vc4/vc4_resource.c|  284 ++-
 src/gallium/drivers/vc4/vc4_resource.h|3 
 src/gallium/drivers/vc4/vc4_screen.c  |5 
 src/gallium/drivers/vc4/vc4_simulator_validate.h  |2 
 src/gallium/drivers/vc4/vc4_state.c   |   21 
 src/gallium/drivers/vc4/vc4_uniforms.c|   26 
 src/gallium/state_trackers/va/config.c|   10 
 src/glsl/ast_function.cpp |6 
 src/glsl/ast_to_hir.cpp   |8 
 src/glsl/glsl_parser.yy   |   20 
 src/glsl/glsl_parser_extras.h |5 
 src/glsl/hir_field_selection.cpp  |3 
 src/glsl/ir.cpp   |1 
 src/glsl/ir.h |7 
 src/glsl/link_varyings.cpp|   38 
 src/glsl/linker.cpp   |   74 
 src/glsl/lower_named_interface_blocks.cpp |1 
 src/glsl/opt_dead_code.cpp|   14 
 src/mesa/drivers/dri/i965/brw_context.c   |   18 
 src/mesa/drivers/dri/i965/brw_context.h   |9 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |   16 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   55 
 src/mesa/drivers/dri/i965/brw_gs_surface_state.c  |6 
 src/mesa/drivers/dri/i965/brw_meta_fast_clear.c   |3 
 src/mesa/drivers/dri/i965/brw_state.h |3 
 src/mesa/drivers/dri/i965/brw_vec4_generator.cpp  |   17 
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp|6 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|   13 
 src/mesa/drivers/dri/i965/brw_vs_surface_state.c  |   16 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   26 
 src/mesa/drivers/dri/i965/gen7_cs_state.c |2 
 src/mesa/main/pipelineobj.c   |   35 
 src/mesa/main/uniform_query.cpp   |4 
 68 files changed, 2951 insertions(+), 460 deletions(-)

New commits:
commit 5a616125acf0ac043d2d44b7a8e804739d55014e
Author: Emil Velikov 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 bin/.cherry-ignore|2 
 src/gallium/auxiliary/vl/vl_video_buffer.c|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |   40 +++
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp   |2 
 src/gallium/drivers/r600/r600_pipe.h  |2 
 src/gallium/drivers/r600/r600_shader.c|5 
 src/gallium/drivers/r600/r600_state.c |   29 ++
 src/gallium/drivers/r600/r600_state_common.c  |   18 +
 src/gallium/drivers/r600/r600d.h  |1 
 src/gallium/drivers/radeon/r600_pipe_common.c |3 
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |2 
 src/gallium/state_trackers/clover/core/platform.cpp   |3 
 src/gallium/targets/opencl/Makefile.am|2 
 src/glsl/glsl_parser_extras.cpp   |2 
 src/glsl/standalone_scaffolding.cpp   |2 
 src/glsl/standalone_scaffolding.h |2 
 src/mapi/glapi/gen/KHR_debug.xml  |   25 +-
 src/mesa/drivers/dri/i965/Makefile.am |3 
 src/mesa/drivers/dri/i965/brw_inst.h  |4 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |4 
 src/mesa/main/context.c   |3 
 src/mesa/main/errors.c|  110 ++
 src/mesa/main/errors.h|2 
 src/mesa/main/extensions_table.h  |2 
 src/mesa/main/get_hash_params.py  |4 
 src/mesa/main/mtypes.h|3 
 src/mesa/main/tests/dispatch_sanity.cpp   |5 
 src/mesa/main/version.c   |1 
 33 files changed, 213 insertions(+), 84 deletions(-)

New commits:
commit 20db46c227fad1ccc23287d3c008d0ca24b49d5a
Author: Emil Velikov 
Date:   Mon Dec 7 13:50:15 2015 +

Update version to 11.1.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 2fdb3a1..c575419 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.0-rc2
+11.1.0-rc3

commit b2a5efb56f612123fbaf9a10e63abf712e397807
Author: Michel Dänzer 
Date:   Thu Nov 19 11:30:21 2015 +0900

radeon/llvm: Use llvm.AMDIL.exp intrinsic again for now

llvm.exp2.f32 doesn't work in some cases yet.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92709

Reviewed-by: Nicolai Hähnle 
(cherry picked from commit d09463193608009fa42e046b1fc144435d3533f6)

diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c 
b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
index ac99e73..c94f109 100644
--- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
+++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
@@ -1539,7 +1539,7 @@ void radeon_llvm_context_init(struct radeon_llvm_context 
* ctx)
bld_base->op_actions[TGSI_OPCODE_ENDIF].emit = endif_emit;
bld_base->op_actions[TGSI_OPCODE_ENDLOOP].emit = endloop_emit;
bld_base->op_actions[TGSI_OPCODE_EX2].emit = build_tgsi_intrinsic_nomem;
-   bld_base->op_actions[TGSI_OPCODE_EX2].intr_name = "llvm.exp2.f32";
+   bld_base->op_actions[TGSI_OPCODE_EX2].intr_name = "llvm.AMDIL.exp.";
bld_base->op_actions[TGSI_OPCODE_FLR].emit = build_tgsi_intrinsic_nomem;
bld_base->op_actions[TGSI_OPCODE_FLR].intr_name = "llvm.floor.f32";
bld_base->op_actions[TGSI_OPCODE_FMA].emit = build_tgsi_intrinsic_nomem;

commit 38c645b60a49899e58edce4a2b47ed19b25c3b08
Author: Connor Abbott 
Date:   Mon Aug 3 14:38:12 2015 -0700

i965: fix 64-bit immediates in brw_inst(_set)_bits

If we tried to get/set something that was exactly 64 bits, we would
try to do (1 << 64) - 1 to calculate the mask which doesn't give us all
1's like we want.

v2 (Iago)
 - Replace ~0 by ~0ull
 - Removed unnecessary parenthesis

v3 (Kristian)
 - Avoid the conditional

Reviewed-by: Iago Toral Quiroga 
Reviewed-by: Matt Turner 
Reviewed-by: Kristian Høgsberg 
(cherry picked from commit b1a83b5d1b677faf650a41cd2c152b4d1cd18f84)

Squashed with commit

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

Rebased ref, commits from common ancestor:
commit aefd6769e87ba84b900db0daeaa814c83f2e6043
Author: Emil Velikov 
Date:   Sun Nov 29 23:25:51 2015 +

Update version to 11.1.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 8436a1b..2fdb3a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.0-rc1
+11.1.0-rc2

commit 82a363b851d897dacdbe53597652dc6bc613ecde
Author: Neil Roberts 
Date:   Wed Nov 4 15:52:06 2015 +0100

i965: Handle lum, intensity and missing components in the fast clear

It looks like the sampler hardware doesn't take into account the
surface format when sampling a cleared color after a fast clear has
been done. So for example if you clear a GL_RED surface to 1,1,1,1
then the sampling instructions will return 1,1,1,1 instead of 1,0,0,1.
This patch makes it override the color that is programmed in the
surface state in order to swizzle for luminance and intensity as well
as overriding the missing components.

Fixes the ext_framebuffer_multisample-fast-clear Piglit test.

v2: Handle luminance and intensity formats
Reviewed-by: Ben Widawsky 
(cherry picked from commit 2010de4015c96f241e81012b395cb4254091f0bb)

diff --git a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c 
b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
index 20adbd3..cd35035 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
@@ -394,13 +394,43 @@ set_fast_clear_color(struct brw_context *brw,
  struct intel_mipmap_tree *mt,
  const union gl_color_union *color)
 {
+   union gl_color_union override_color = *color;
+
+   /* The sampler doesn't look at the format of the surface when the fast
+* clear color is used so we need to implement luminance, intensity and
+* missing components manually.
+*/
+   switch (_mesa_get_format_base_format(mt->format)) {
+   case GL_INTENSITY:
+  override_color.ui[3] = override_color.ui[0];
+  /* flow through */
+   case GL_LUMINANCE:
+   case GL_LUMINANCE_ALPHA:
+  override_color.ui[1] = override_color.ui[0];
+  override_color.ui[2] = override_color.ui[0];
+  break;
+   default:
+  for (int i = 0; i < 3; i++) {
+ if (!_mesa_format_has_color_component(mt->format, i))
+override_color.ui[i] = 0;
+  }
+  break;
+   }
+
+   if (!_mesa_format_has_color_component(mt->format, 3)) {
+  if (_mesa_is_format_integer_color(mt->format))
+ override_color.ui[3] = 1;
+  else
+ override_color.f[3] = 1.0f;
+   }
+
if (brw->gen >= 9) {
-  mt->gen9_fast_clear_color = *color;
+  mt->gen9_fast_clear_color = override_color;
} else {
   mt->fast_clear_color_value = 0;
   for (int i = 0; i < 4; i++) {
  /* Testing for non-0 works for integer and float colors */
- if (color->f[i] != 0.0f) {
+ if (override_color.f[i] != 0.0f) {
  mt->fast_clear_color_value |=
 1 << (GEN7_SURFACE_CLEAR_COLOR_SHIFT + (3 - i));
  }

commit b3183c81c431382a029c0ea450209843a9d6a9ca
Author: Nanley Chery 
Date:   Wed Oct 28 14:50:58 2015 -0700

mesa/teximage: Fix S3TC regression due to ASTC interaction

A prior, literal reading of the ASTC spec led to the prohibition
of some compressed formats being used against the targets:
TEXTURE_CUBE_MAP_ARRAY and TEXTURE_3D. Since the spec does not specify
interactions with other extensions for specific compressed textures,
remove such interactions.

Fixes the following Piglit tests on Gen9:
piglit.spec.arb_direct_state_access.getcompressedtextureimage

piglit.spec.arb_get_texture_sub_image.arb_get_texture_sub_image-getcompressed
piglit.spec.arb_texture_cube_map_array.fbo-generatemipmap-cubemap array 
s3tc_dxt1
piglit.spec.ext_texture_compression_s3tc.getteximage-targets cube_array s3tc

v2. Don't interact with other specific compressed formats (Ian).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91927
Suggested-by: Neil Roberts 
Signed-off-by: Nanley Chery 
Reviewed-by: Ilia Mirkin 
(cherry picked from commit d1212abf505a468c9947a66dbf2d59acb4616e42)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 87c8939..37dbe26 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1333,21 +1333,6 @@ _mesa_target_can_be_compressed(const struct gl_context 
*ctx, GLenum target,
   break;
case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
case GL_TEXTURE_CUBE_MAP_ARRAY:
-  /* From section 3.8.6, page 146 of OpenGL ES 3.0 spec:
-   *
-   *"The ETC2/EAC texture compression algorithm supports only
-   * 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION  |2 
 docs/relnotes/11.0.2.html|3 
 docs/relnotes/11.0.3.html|  184 +++
 src/egl/drivers/dri2/egl_dri2.c  |   11 -
 src/egl/main/eglcontext.c|   49 -
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp|   37 +++
 src/gallium/auxiliary/gallivm/lp_bld_misc.h  |2 
 src/gallium/auxiliary/util/u_blitter.c   |6 
 src/gallium/drivers/nouveau/nouveau_buffer.c |   12 -
 src/gallium/drivers/nouveau/nouveau_fence.c  |8 
 src/gallium/drivers/nouveau/nouveau_fence.h  |3 
 src/gallium/drivers/nouveau/nv30/nv30_format.c   |   24 +-
 src/gallium/drivers/nouveau/nv30/nv30_miptree.c  |9 
 src/gallium/drivers/nouveau/nv30/nv30_vbo.c  |4 
 src/gallium/drivers/nouveau/nv50/nv50_miptree.c  |5 
 src/gallium/drivers/nouveau/nv50/nv50_transfer.c |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c |7 
 src/gallium/drivers/radeon/r600_buffer_common.c  |7 
 src/gallium/drivers/radeon/r600_pipe_common.c|3 
 src/gallium/drivers/radeon/r600_texture.c|5 
 src/gallium/drivers/radeon/radeon_llvm_emit.c|   27 +-
 src/gallium/drivers/radeon/radeon_vce_40_2_2.c   |3 
 src/gallium/drivers/radeonsi/si_descriptors.c|8 
 src/gallium/drivers/radeonsi/si_pipe.c   |2 
 src/gallium/drivers/radeonsi/si_shader.c |5 
 src/gallium/drivers/radeonsi/si_state.h  |2 
 src/gallium/drivers/radeonsi/si_state_draw.c |   10 -
 src/gallium/drivers/radeonsi/si_state_shaders.c  |  173 +
 src/gallium/state_trackers/dri/dri2.c|   33 +--
 src/gallium/state_trackers/dri/dri_drawable.c|8 
 src/gallium/targets/opencl/Makefile.am   |3 
 src/glx/Makefile.am  |1 
 src/glx/dri_common.c |6 
 src/glx/glxcmds.c|4 
 src/glx/glxextensions.h  |   10 -
 src/mapi/mapi_glapi.c|2 
 src/mesa/drivers/common/meta_blit.c  |   35 ++-
 src/mesa/drivers/dri/i915/i830_context.h |8 
 src/mesa/drivers/dri/i915/i915_context.h |   14 -
 src/mesa/drivers/dri/i915/i915_fragprog.c|   83 ++--
 src/mesa/drivers/dri/i915/intel_fbo.c|5 
 src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp |   42 +++-
 src/mesa/main/ffvertex_prog.c|   17 +
 src/mesa/main/glformats.c|   21 +-
 src/mesa/main/mipmap.c   |   36 +--
 src/mesa/state_tracker/st_cb_blit.c  |2 
 src/mesa/state_tracker/st_format.c   |6 
 47 files changed, 755 insertions(+), 199 deletions(-)

New commits:
commit 914966befcd57764941405707d8f57d3e7e7f768
Author: Emil Velikov 
Date:   Sat Oct 10 16:21:58 2015 +0100

docs: add release notes for 11.0.3

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.0.3.html b/docs/relnotes/11.0.3.html
new file mode 100644
index 000..25fad25
--- /dev/null
+++ b/docs/relnotes/11.0.3.html
@@ -0,0 +1,184 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 11.0.3 Release Notes / October 10, 2015
+
+
+Mesa 11.0.3 is a bug fix release which fixes bugs found since the 11.0.2 
release.
+
+
+Mesa 11.0.3 implements the OpenGL 4.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.1.  OpenGL
+4.1 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+Bug fixes
+
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=2;>Bug 2 
- Compile errors with --enable-mangling
+
+https://bugs.freedesktop.org/show_bug.cgi?id=71789;>Bug 71789 
- [r300g] Visuals not found in (default) depth = 24
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91044;>Bug 91044 
- piglit spec/egl_khr_create_context/valid debug flag gles* fail
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91342;>Bug 91342 
- Very dark textures on some objects in indoors environments in Postal 2
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91596;>Bug 91596 
- EGL_KHR_gl_colorspace (v2) causes problem with Android-x86 GUI
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91718;>Bug 91718 
- piglit.spec.arb_shader_image_load_store.invalid causes 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |   10 
 docs/relnotes/11.0.0.html |3 
 docs/relnotes/11.0.1.html |  134 ++
 docs/relnotes/11.0.2.html |   84 +
 src/gallium/drivers/freedreno/a3xx/fd3_format.c   |2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |   21 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |   19 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_tex.c   |   22 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |   20 
 src/gallium/drivers/radeonsi/si_shader.c  |2 
 src/gbm/backends/dri/gbm_dri.c|   18 
 src/glsl/builtin_variables.cpp|   12 
 src/glsl/nir/nir.c|   20 
 src/glsl/nir/nir.h|   13 
 src/glsl/nir/nir_from_ssa.c   |2 
 src/glsl/nir/nir_lower_alu_to_scalar.c|6 
 src/glsl/nir/nir_lower_atomics.c  |2 
 src/glsl/nir/nir_lower_io.c   |2 
 src/glsl/nir/nir_lower_locals_to_regs.c   |7 
 src/glsl/nir/nir_lower_vec_to_movs.c  |4 
 src/glsl/nir/nir_opt_peephole_ffma.c  |3 
 src/glsl/nir/nir_opt_peephole_select.c|4 
 src/mesa/drivers/common/meta_tex_subimage.c   |   43 
 src/mesa/drivers/dri/i915/intel_render.c  |2 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |5 
 src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp |  201 +++-
 src/mesa/drivers/dri/i965/brw_vec4.cpp|   29 
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp|4 
 src/mesa/drivers/dri/radeon/radeon_swtcl.c|2 
 src/mesa/main/fbobject.c  |   11 
 src/mesa/main/glformats.c |  663 +-
 src/mesa/main/glformats.h |2 
 src/mesa/main/readpix.c   |1 
 src/mesa/main/texcompress_bptc.c  |3 
 src/mesa/main/texcompress_fxt1.c  |3 
 src/mesa/main/texcompress_rgtc.c  |6 
 src/mesa/main/texcompress_s3tc.c  |9 
 src/mesa/main/teximage.c  |  548 ---
 src/mesa/main/teximage.h  |4 
 src/mesa/state_tracker/st_atom_texture.c  |4 
 src/mesa/tnl_dd/t_dd_dmatmp.h |  155 +--
 44 files changed, 1404 insertions(+), 707 deletions(-)

New commits:
commit 51e0b06d9916e126060c0d218de1aaa4e5a4ce26
Author: Emil Velikov 
Date:   Mon Sep 28 20:45:37 2015 +0100

docs: add release notes for 11.0.2

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.0.2.html b/docs/relnotes/11.0.2.html
new file mode 100644
index 000..baabf6d
--- /dev/null
+++ b/docs/relnotes/11.0.2.html
@@ -0,0 +1,84 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 11.0.2 Release Notes / September 28, 2015
+
+
+Mesa 11.0.2 is a bug fix release which fixes bugs found since the 11.0.1 
release.
+
+
+Mesa 11.0.2 implements the OpenGL 4.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.1.  OpenGL
+4.1 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+Bug fixes
+
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91582;>Bug 91582 
- [bisected] Regression in DEQP 
gles2.functional.negative_api.texture.texsubimage2d_neg_offset
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91970;>Bug 91970 
- [BSW regression] 
dEQP-GLES3.functional.shaders.precision.int.highp_mul_vertex
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92095;>Bug 92095 
- [Regression, bisected] arb_shader_atomic_counters.compiler.builtins.frag
+
+
+
+
+Changes
+
+Eduardo Lima Mitev (3):
+
+  mesa: Fix order of format+type and internal format checks for 
glTexImageXD ops
+  mesa: Move _mesa_base_tex_format() from teximage to glformats files
+  mesa: Use the effective internal format instead for validation
+
+
+Emil Velikov (2):
+
+  docs: add sha256 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk |3 
 VERSION   |2 
 docs/relnotes/11.0.0.html |  168 +-
 src/gallium/auxiliary/Makefile.am |   29 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp |   11 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp|   90 -
 src/gallium/drivers/nouveau/nouveau_buffer.c  |4 
 src/gallium/drivers/nouveau/nouveau_buffer.h  |2 
 src/gallium/drivers/nouveau/nouveau_context.h |5 
 src/gallium/drivers/nouveau/nv30/nv30_miptree.c   |   38 ++
 src/gallium/drivers/nouveau/nv30/nv30_screen.c|   20 +
 src/gallium/drivers/nouveau/nv30/nv30_screen.h|2 
 src/gallium/drivers/nouveau/nv30/nv30_transfer.c  |4 
 src/gallium/drivers/nouveau/nv50/nv50_formats.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h   |8 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c|3 
 src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c  |   46 ++
 src/gallium/drivers/r600/evergreen_state.c|4 
 src/gallium/drivers/r600/r600_shader.c|   19 -
 src/gallium/drivers/r600/r600_state.c |8 
 src/gallium/drivers/radeonsi/si_pipe.c|4 
 src/gallium/state_trackers/clover/llvm/invocation.cpp |2 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |   15 
 src/glsl/Android.gen.mk   |   22 -
 src/glsl/Makefile.am  |   53 +--
 src/glsl/Makefile.sources |3 
 src/glsl/opt_constant_propagation.cpp |   46 +-
 src/glsl/opt_constant_variable.cpp|   39 +-
 src/mapi/Makefile.am  |   23 -
 src/mapi/glapi/gen/Makefile.am|   38 +-
 src/mesa/Makefile.am  |   45 +-
 src/mesa/drivers/common/meta_generate_mipmap.c|9 
 src/mesa/drivers/dri/common/xmlpool/Makefile.am   |2 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp  |4 
 src/mesa/drivers/dri/i965/brw_context.c   |9 
 src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp |   44 +-
 src/mesa/drivers/dri/i965/intel_tex_copy.c|4 
 src/mesa/state_tracker/st_extensions.c|9 
 src/mesa/state_tracker/st_format.c|   22 -
 src/util/Makefile.am  |6 
 45 files changed, 630 insertions(+), 252 deletions(-)

New commits:
commit 4f1e500150be2e82a2d7eb954f7198cc0c5cbec1
Author: Emil Velikov 
Date:   Sat Sep 12 10:33:49 2015 +0100

docs: Update 11.0.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/11.0.0.html b/docs/relnotes/11.0.0.html
index 537b883..875ff6e 100644
--- a/docs/relnotes/11.0.0.html
+++ b/docs/relnotes/11.0.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 11.0.0 Release Notes / TBD
+Mesa 11.0.0 Release Notes / September 12, 2015
 
 
 Mesa 11.0.0 is a new development release.
@@ -83,13 +83,175 @@ Note: some of the new features are only available with 
certain drivers.
 EGL 1.5 on r600, radeonsi, nv50, nvc0
 
 
+
 Bug fixes
 
-TBD.
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=51658;>Bug 51658 
- r200 ( possibly radeon) DRI fixes for gnome shell on Mesa 8.0.3
+
+https://bugs.freedesktop.org/show_bug.cgi?id=65525;>Bug 65525 
- [llvmpipe] lp_scene.h:210:lp_scene_alloc: Assertion `size = (64 * 1024)' 
failed.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=66346;>Bug 66346 
- shader_query.cpp:49: error: invalid conversion from 'void*' to 'GLuint'
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73512;>Bug 73512 
- [clover] mesa.icd. should contain full path
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73528;>Bug 73528 
- Deferred lighting in Second Life causes system hiccups and screen 
flickering
+
+https://bugs.freedesktop.org/show_bug.cgi?id=74329;>Bug 74329 
- Please expose OES_texture_float and OES_texture_half_float on the ES3 
context
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80500;>Bug 80500 
- Flickering shadows in unreleased title trace
+

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 src/egl/SConscript |1 
 src/gallium/auxiliary/gallivm/lp_bld_const.c   |2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr.h   |5 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c |   42 +-
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h  |2 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h  |2 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h  |5 
 src/gallium/drivers/freedreno/a4xx/fd4_format.c|   10 -
 src/gallium/drivers/freedreno/adreno_common.xml.h  |2 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h |2 
 src/gallium/drivers/nouveau/nouveau_buffer.c   |   12 +
 src/gallium/drivers/nouveau/nv30/nv30_miptree.c|   29 ++--
 src/gallium/drivers/nouveau/nv30/nv30_resource.h   |3 
 src/gallium/drivers/nouveau/nv50/nv50_context.c|6 
 src/gallium/drivers/nouveau/nv50/nv50_context.h|2 
 src/gallium/drivers/nouveau/nv50/nv50_program.c|1 
 src/gallium/drivers/nouveau/nv50/nv50_program.h|1 
 src/gallium/drivers/nouveau/nv50/nv50_query.c  |   15 +-
 src/gallium/drivers/nouveau/nv50/nv50_shader_state.c   |7 -
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |3 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c|   21 +--
 src/gallium/drivers/r600/r600_pipe.h   |   26 
 src/gallium/drivers/r600/r600_state.c  |2 
 src/gallium/drivers/r600/r600_state_common.c   |   25 
 src/gallium/drivers/r600/sb/sb_bc_finalize.cpp |3 
 src/gallium/drivers/radeonsi/si_hw_context.c   |   17 +-
 src/gallium/drivers/radeonsi/si_shader.h   |1 
 src/gallium/drivers/radeonsi/si_state.c|   24 +++
 src/gallium/drivers/radeonsi/si_state.h|2 
 src/gallium/drivers/radeonsi/si_state_shaders.c|   10 +
 src/gallium/drivers/vc4/vc4_qir.c  |1 
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c  |3 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |3 
 src/glsl/linker.cpp|   64 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp   |8 -
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp  |1 
 src/mesa/drivers/dri/i965/intel_blit.c |   72 +--
 src/mesa/drivers/dri/i965/intel_pixel_read.c   |4 
 src/mesa/drivers/dri/i965/intel_tex_subimage.c |4 
 src/mesa/main/formats.c|  106 +
 src/mesa/main/formats.csv  |   16 ++
 src/mesa/main/formats.h|   17 ++
 src/mesa/main/glformats.c  |   32 +
 src/mesa/main/image.c  |   58 -
 src/mesa/main/image.h  |   20 +--
 src/mesa/main/readpix.c|   14 --
 src/mesa/main/texcompress_fxt1.c   |2 
 src/mesa/main/texcompress_s3tc.c   |8 -
 src/mesa/main/texgetimage.c|   21 +--
 src/mesa/main/texstore.c   |   28 ++--
 src/mesa/main/uniform_query.cpp|   35 -
 src/mesa/main/uniforms.c   |   72 +--
 src/mesa/main/uniforms.h   |2 
 src/mesa/state_tracker/st_cb_readpixels.c  |4 
 src/mesa/swrast/s_drawpix.c|   14 +-
 src/mesa/swrast/s_texfetch.c   |   16 ++
 57 files changed, 637 insertions(+), 273 deletions(-)

New commits:
commit 271290f0774e123f221d6415e4b158e4d4b958cc
Author: Emil Velikov 
Date:   Sun Sep 6 19:30:23 2015 +0100

Update version to 11.0.0-rc3

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index f25fb60..c4bfb78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0-rc2
+11.0.0-rc3

commit 7bf27c2393e3d07f6293b30cc859a6ef2aa07212
Author: Ilia Mirkin 
Date:   Thu Jul 2 18:44:18 2015 -0400

nouveau: don't mark full range as used on unmap with explicit flush

Signed-off-by: Ilia Mirkin 
Cc: mesa-sta...@lists.freedesktop.org
(cherry picked from commit a778831735ea45f789c247c40677cd26adc78e3e)

diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c 
b/src/gallium/drivers/nouveau/nouveau_buffer.c
index 67e181e..912b778 100644
--- a/src/gallium/drivers/nouveau/nouveau_buffer.c
+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
@@ -532,8 +532,13 @@ nouveau_buffer_transfer_unmap(struct pipe_context *pipe,
struct nv04_resource *buf = nv04_resource(transfer->resource);
 
if (tx->base.usage & 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 src/gallium/auxiliary/util/u_debug.c   |7 -
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c  |   19 +++
 src/gallium/drivers/freedreno/freedreno_context.h  |2 
 src/gallium/drivers/freedreno/freedreno_state.c|4 
 src/gallium/drivers/nouveau/nv50/nv50_state.c  |   10 -
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |   22 
 src/gallium/drivers/nouveau/nv50/nv50_stateobj.h   |2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c|6 +
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c|1 
 src/gallium/drivers/r600/r600_asm.c|2 
 src/gallium/drivers/r600/r600_pipe.h   |   31 +++---
 src/gallium/drivers/r600/r600_shader.c |4 
 src/gallium/drivers/r600/sb/sb_bc_decoder.cpp  |1 
 src/gallium/drivers/r600/sb/sb_bc_parser.cpp   |9 +
 src/gallium/drivers/r600/sb/sb_sched.cpp   |2 
 src/gallium/drivers/radeon/r600_query.c|   16 +--
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c  |8 -
 src/gallium/winsys/radeon/drm/radeon_drm_cs.h  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c  |   12 --
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h  |1 
 src/mesa/drivers/dri/i965/brw_draw_upload.c|   30 ++---
 src/mesa/drivers/dri/i965/brw_fs.cpp   |4 
 src/mesa/drivers/dri/i965/brw_misc_state.c |3 
 src/mesa/drivers/dri/i965/gen8_draw_upload.c   |   71 ++
 src/mesa/main/get.c|   86 +
 src/mesa/main/texgetimage.c|7 +
 src/mesa/main/teximage.c   |   11 +-
 src/mesa/main/texparam.c   |   12 ++
 src/mesa/main/texstore.c   |2 
 src/mesa/main/uniform_query.cpp|   21 ++--
 src/mesa/main/uniforms.c   |9 -
 32 files changed, 304 insertions(+), 115 deletions(-)

New commits:
commit 3f8d44210c70f4b16651f1faf5fd72c47c64ab07
Author: Emil Velikov 
Date:   Mon Aug 31 13:40:19 2015 +0100

Update version to 11.0.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 69d3cd2..f25fb60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0-rc1
+11.0.0-rc2

commit 579ca506aefabc018d2cdd1856de4ce0e95bdfcf
Author: Marek Olšák 
Date:   Sun Aug 23 12:57:09 2015 +0200

gallium/radeon: fix the ADDRESS_HI mask for EVENT_WRITE CIK packets

Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Alex Deucher 
(cherry picked from commit 437cb1e3f482570447501526927df4d80c845bf5)

diff --git a/src/gallium/drivers/radeon/r600_query.c 
b/src/gallium/drivers/radeon/r600_query.c
index 7057aa1..65339bb 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -197,7 +197,7 @@ static void r600_emit_query_begin(struct 
r600_common_context *ctx, struct r600_q
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0));
radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_ZPASS_DONE) | 
EVENT_INDEX(1));
radeon_emit(cs, va);
-   radeon_emit(cs, (va >> 32UL) & 0xFF);
+   radeon_emit(cs, (va >> 32) & 0x);
break;
case PIPE_QUERY_PRIMITIVES_EMITTED:
case PIPE_QUERY_PRIMITIVES_GENERATED:
@@ -206,13 +206,13 @@ static void r600_emit_query_begin(struct 
r600_common_context *ctx, struct r600_q
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0));
radeon_emit(cs, EVENT_TYPE(event_type_for_stream(query)) | 
EVENT_INDEX(3));
radeon_emit(cs, va);
-   radeon_emit(cs, (va >> 32UL) & 0xFF);
+   radeon_emit(cs, (va >> 32) & 0x);
break;
case PIPE_QUERY_TIME_ELAPSED:
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
radeon_emit(cs, 
EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5));
radeon_emit(cs, va);
-   radeon_emit(cs, (3 << 29) | ((va >> 32UL) & 0xFF));
+   radeon_emit(cs, (3 << 29) | ((va >> 32) & 0x));
radeon_emit(cs, 0);
radeon_emit(cs, 0);
break;
@@ -220,7 +220,7 @@ static void r600_emit_query_begin(struct 
r600_common_context *ctx, struct r600_q
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0));
radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_SAMPLE_PIPELINESTAT) | 
EVENT_INDEX(2));
radeon_emit(cs, va);
-   radeon_emit(cs, (va >> 32UL) & 0xFF);
+   radeon_emit(cs, (va >> 32) & 0x);
break;

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 configure.ac   |   22 
 docs/GL3.txt   |   52 
 docs/egl.html  |6 
 docs/index.html|6 
 docs/relnotes.html |1 
 docs/relnotes/10.6.4.html  |  137 
 docs/relnotes/10.7.0.html  |   75 
 docs/relnotes/11.0.0.html  |   89 
 include/GL/glx.h   |   92 
 include/GL/internal/dri_interface.h|   17 
 include/c99_math.h |   12 
 include/pci_ids/radeonsi_pci_ids.h |   25 
 scons/gallium.py   |1 
 src/egl/Makefile.am|1 
 src/egl/SConscript |1 
 src/egl/drivers/dri2/egl_dri2.c|  237 
 src/egl/drivers/dri2/platform_wayland.c|   46 
 src/egl/drivers/dri2/platform_x11.c|  123 
 src/egl/main/eglapi.c  |   36 
 src/egl/main/eglapi.h  |   24 
 src/egl/main/eglarray.c|3 
 src/egl/main/eglcontext.c  |   33 
 src/egl/main/eglfallbacks.c|6 
 src/egl/main/eglsurface.c  |3 
 src/gallium/Android.mk |1 
 src/gallium/Makefile.am|1 
 src/gallium/auxiliary/gallivm/lp_bld_arit.c|6 
 src/gallium/auxiliary/gallivm/lp_bld_intr.c|   12 
 src/gallium/auxiliary/gallivm/lp_bld_intr.h|3 
 src/gallium/auxiliary/gallivm/lp_bld_logic.c   |2 
 src/gallium/auxiliary/gallivm/lp_bld_tgsi.c|2 
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c|3 
 src/gallium/auxiliary/hud/hud_context.c|   70 
 src/gallium/auxiliary/hud/hud_driver_query.c   |   22 
 src/gallium/auxiliary/hud/hud_private.h|3 
 src/gallium/auxiliary/nir/tgsi_to_nir.c|3 
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c|   13 
 src/gallium/auxiliary/target-helpers/inline_drm_helper.h   |8 
 src/gallium/auxiliary/util/u_debug.c   |8 
 src/gallium/auxiliary/util/u_debug.h   |6 
 src/gallium/auxiliary/util/u_format_rgb9e5.h   |   11 
 src/gallium/auxiliary/util/u_math.c|2 
 src/gallium/auxiliary/util/u_math.h|2 
 src/gallium/auxiliary/util/u_video.h   |7 
 src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c |1 
 src/gallium/docs/source/screen.rst |9 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h  |4 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h  |   23 
 src/gallium/drivers/freedreno/a3xx/fd3_blend.h |4 
 src/gallium/drivers/freedreno/a3xx/fd3_draw.c  |7 
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c  |6 
 src/gallium/drivers/freedreno/a3xx/fd3_format.h|   23 
 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c  |9 
 src/gallium/drivers/freedreno/a3xx/fd3_program.c   |6 
 src/gallium/drivers/freedreno/a3xx/fd3_screen.c|2 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c   |5 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h  |  187 
 src/gallium/drivers/freedreno/a4xx/fd4_blend.c |   18 
 src/gallium/drivers/freedreno/a4xx/fd4_blend.h |4 
 src/gallium/drivers/freedreno/a4xx/fd4_draw.c  |   41 
 src/gallium/drivers/freedreno/a4xx/fd4_draw.h  |8 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 313940b03cf7c857143b9e3ec0ab969ce4472c83
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Tue Jul 28 02:37:51 2015 -0400

nvc0/ir: trim out barrier sync for non-compute shaders

It seems like they're never necessary, and actively cause harm. This
fixes some of the barrier-related piglits.

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index 710f53d..c632e30 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -559,6 +559,12 @@ NVC0LegalizePostRA::visit(BasicBlock *bb)
   } else
   if (i-isNop()) {
  bb-remove(i);
+  } else
+  if (i-op == OP_BAR  i-subOp == NV50_IR_SUBOP_BAR_SYNC 
+  prog-getType() != Program::TYPE_COMPUTE) {
+ // It seems like barriers are never required for tessellation since
+ // the warp size is 32, and there are always at most 32 tcs threads.
+ bb-remove(i);
   } else {
  // TODO: Move this to before register allocation for operations that
  // need the $c register !

commit ab63610a3603ae1e40a36d238b5938621bb9e8cc
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Tue Jul 28 02:00:20 2015 -0400

nvc0/ir: fix barrier emission

immediate arguments require a flag to be set for each one

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
index 3ed815b..f607f3b 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
@@ -1451,6 +1451,7 @@ CodeEmitterNVC0::emitBAR(const Instruction *i)
   ImmediateValue *imm = i-getSrc(0)-asImm();
   assert(imm);
   code[0] |= imm-reg.data.u32  20;
+  code[1] |= 0x8000;
}
 
// thread count
@@ -1461,6 +1462,7 @@ CodeEmitterNVC0::emitBAR(const Instruction *i)
   assert(imm);
   code[0] |= imm-reg.data.u32  26;
   code[1] |= imm-reg.data.u32  6;
+  code[1] |= 0x4000;
}
 
if (i-srcExists(2)  (i-predSrc != 2)) {

commit 7850774f2118ae87c7e6a4f6c17751e405edfb34
Author: Eric Anholt e...@anholt.net
Date:   Wed Jul 22 12:14:40 2015 -0700

vc4: Add support for ARB_draw_elements_base_vertex.

Gallium exposes it unconditionally, so do our best to support it.  It
fails on the negative index cases, but those seem unlikely to be used in
the wild.

diff --git a/src/gallium/drivers/vc4/vc4_draw.c 
b/src/gallium/drivers/vc4/vc4_draw.c
index fc3c232..1c7f3b1 100644
--- a/src/gallium/drivers/vc4/vc4_draw.c
+++ b/src/gallium/drivers/vc4/vc4_draw.c
@@ -201,7 +201,9 @@ vc4_draw_vbo(struct pipe_context *pctx, const struct 
pipe_draw_info *info)
 struct pipe_vertex_buffer *vb =
 vertexbuf-vb[elem-vertex_buffer_index];
 struct vc4_resource *rsc = vc4_resource(vb-buffer);
-uint32_t offset = vb-buffer_offset + elem-src_offset;
+uint32_t offset = (vb-buffer_offset +
+   elem-src_offset +
+   vb-stride * info-index_bias);
 uint32_t vb_size = rsc-bo-size - offset;
 uint32_t elem_size =
 util_format_get_blocksize(elem-src_format);

commit 98a4b111fbb9e3ae45e907ddd4d2407e5ab669ec
Author: Rob Clark robcl...@freedesktop.org
Date:   Sat Jul 25 12:53:23 2015 -0400

freedreno/ir3: add transform-feedback support

Signed-off-by: Rob Clark robcl...@freedesktop.org

diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c 
b/src/gallium/drivers/freedreno/freedreno_screen.c
index b28d315..97e4161 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -227,9 +227,20 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum 
pipe_cap param)
 
/* Stream output. */
case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
+   if (is_a3xx(screen) || is_a4xx(screen))
+   return PIPE_MAX_SO_BUFFERS;
+   return 0;
case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
+   if (is_a3xx(screen) || is_a4xx(screen))
+   return 1;
+   return 0;
case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
+   if (is_a3xx(screen) || is_a4xx(screen))
+   return 16;/* should only be shader out limit? */
+   return 0;
case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
+   if (is_a3xx(screen) || is_a4xx(screen))
+   return 16;/* should only be shader out limit? */
return 0;
 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |  145 
 docs/relnotes/10.6.1.html |3 
 docs/relnotes/10.6.2.html |  164 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp |   12 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |7 
 src/gallium/drivers/r600/r600_blit.c  |7 
 src/gallium/drivers/radeonsi/si_state_draw.c  |4 
 src/gallium/state_trackers/dri/dri2.c |2 
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c   |6 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |   28 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c |   17 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h |1 
 src/glsl/ast_array_index.cpp  |   38 -
 src/glsl/linker.cpp   |   77 ++
 src/glsl/loop_unroll.cpp  |   12 
 src/glsl/opt_algebraic.cpp|4 
 src/loader/loader.c   |   46 -
 src/mesa/drivers/common/meta.c|4 
 src/mesa/drivers/dri/i915/i915_context.c  |3 
 src/mesa/drivers/dri/i965/brw_context.c   |4 
 src/mesa/drivers/dri/i965/brw_context.h   |1 
 src/mesa/drivers/dri/i965/brw_defines.h   |1 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |   20 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   19 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |7 
 src/mesa/drivers/dri/i965/brw_program.c   |   11 
 src/mesa/drivers/dri/i965/gen6_cc.c   |2 
 src/mesa/drivers/dri/i965/gen8_ps_state.c |3 
 src/mesa/drivers/dri/i965/intel_batchbuffer.h |4 
 src/mesa/main/mtypes.h|1 
 src/mesa/main/texstore.c  |1 
 src/mesa/program/prog_opt_constant_fold.c |2 
 src/mesa/state_tracker/st_context.c   |5 
 src/util/Makefile.am  |7 
 src/util/Makefile.sources |4 
 src/util/SConscript   |5 
 src/util/mesa-sha1.c  |  316 --
 src/util/mesa-sha1.h  |   53 -
 43 files changed, 454 insertions(+), 607 deletions(-)

New commits:
commit 9643cce94c8a1938e3342fb83d025a1e5c2aa79b
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Sat Jul 11 19:46:49 2015 +0100

Add release notes for the 10.6.2 release

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.6.2.html b/docs/relnotes/10.6.2.html
new file mode 100644
index 000..8ba6cdb
--- /dev/null
+++ b/docs/relnotes/10.6.2.html
@@ -0,0 +1,164 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.6.2 Release Notes / July 11, 2015/h1
+
+p
+Mesa 10.6.2 is a bug fix release which fixes bugs found since the 10.6.1 
release.
+/p
+p
+Mesa 10.6.2 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2SHA256 checksums/h2
+pre
+TBD
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=73528;Bug 73528/a 
- Deferred lighting in Second Life causes system hiccups and screen 
flickering/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=80500;Bug 80500/a 
- Flickering shadows in unreleased title trace/li
+
+lia 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION|2 
 configure.ac   |1 
 docs/relnotes/10.6.0.html  |  243 ++
 src/Makefile.am|3 
 src/egl/main/eglcontext.c  |5 
 src/gallium/auxiliary/cso_cache/cso_context.c  |7 
 src/gallium/auxiliary/draw/draw_llvm.c |4 
 src/gallium/auxiliary/util/u_math.h|1 
 src/gallium/drivers/freedreno/Makefile.am  |3 
 src/gallium/drivers/freedreno/a3xx/fd3_program.c   |9 
 src/gallium/drivers/freedreno/ir3/ir3_cmdline.c|8 
 src/gallium/drivers/freedreno/ir3/ir3_compiler.c   |   14 
 src/gallium/drivers/llvmpipe/lp_query.c|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp  |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp  |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp   |   20 
 src/gallium/drivers/nouveau/nv30/nv30_clear.c  |2 
 src/gallium/drivers/nouveau/nv30/nv30_context.h|2 
 src/gallium/drivers/nouveau/nv30/nv30_draw.c   |   74 
 src/gallium/drivers/nouveau/nv30/nv30_fragprog.c   |5 
 src/gallium/drivers/nouveau/nv30/nv30_state_validate.c |   26 
 src/gallium/drivers/nouveau/nv30/nv30_vbo.c|2 
 src/gallium/drivers/nouveau/nv30/nv30_vertprog.c   |5 
 src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c   |5 
 src/gallium/drivers/nouveau/nv50/nv50_miptree.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c|2 
 src/gallium/drivers/radeonsi/si_state_shaders.c|   11 
 src/gallium/state_trackers/clover/api/interop.cpp  |7 
 src/gallium/state_trackers/clover/core/error.hpp   |1 
 src/gallium/state_trackers/dri/dri2.c  |2 
 src/gallium/state_trackers/dri/dri_context.c   |9 
 src/gallium/state_trackers/xa/xa_tracker.c |   12 
 src/gallium/targets/d3dadapter9/Makefile.am|2 
 src/gallium/targets/dri/Makefile.am|6 
 src/gallium/targets/osmesa/Makefile.am |1 
 src/gallium/targets/pipe-loader/Makefile.am|2 
 src/glsl/Makefile.am   |   13 
 src/glsl/SConscript|4 
 src/glsl/linker.cpp|   10 
 src/glsl/main.cpp  |6 
 src/glsl/tests/common.c|   30 
 src/loader/Makefile.am |   10 
 src/mapi/glapi/gen/Makefile.am |3 
 src/mapi/glapi/gen/apiexec.py  |  240 ++
 src/mapi/glapi/gen/gl_genexec.py   |   54 
 src/mesa/Android.libmesa_glsl_utils.mk |6 
 src/mesa/drivers/dri/Makefile.am   |1 
 src/mesa/drivers/dri/common/Android.mk |4 
 src/mesa/drivers/dri/common/Makefile.am|6 
 src/mesa/drivers/dri/common/Makefile.sources   |4 
 src/mesa/drivers/dri/common/SConscript |2 
 src/mesa/drivers/dri/i915/intel_extensions.c   |1 
 src/mesa/drivers/dri/i965/Makefile.am  |1 
 src/mesa/drivers/dri/i965/brw_context.c|7 
 src/mesa/drivers/dri/i965/brw_eu_compact.c |6 
 src/mesa/drivers/dri/i965/brw_fs.cpp   |   13 
 src/mesa/drivers/dri/i965/brw_fs.h |3 
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp |   18 
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp  |   17 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   |6 
 src/mesa/drivers/dri/i965/brw_util.h   |   15 
 src/mesa/drivers/dri/i965/brw_vec4_generator.cpp   |   18 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |   20 
 src/mesa/drivers/dri/i965/gen6_sf_state.c  |6 
 src/mesa/drivers/dri/i965/gen7_sf_state.c  |6 
 src/mesa/drivers/dri/i965/gen8_depth_state.c   |   10 
 src/mesa/drivers/dri/i965/gen8_sf_state.c  |6 
 src/mesa/drivers/dri/i965/intel_blit.c |   55 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 docs/GL3.txt  |   26 
 docs/VERSIONS |4 
 docs/egl.html |8 
 docs/envvars.html |1 
 docs/index.html   |8 
 docs/libGL.txt|2 
 docs/relnotes.html|1 
 docs/relnotes/10.0.3.html |2 
 docs/relnotes/10.5.5.html |   95 
 docs/relnotes/10.6.0.html |   18 
 docs/relnotes/7.10.html   |2 
 docs/specs/MESA_image_dma_buf_export.txt  |   25 
 docs/versions.html|4 
 docs/viewperf.html|7 
 include/EGL/eglmesaext.h  |   66 
 include/GL/internal/dri_interface.h   |   60 
 include/pci_ids/radeonsi_pci_ids.h|1 
 scons/llvm.py |   33 
 src/egl/drivers/dri2/egl_dri2.c   |  178 
 src/egl/drivers/dri2/egl_dri2.h   |   17 
 src/egl/drivers/dri2/egl_dri2_fallbacks.h |9 
 src/egl/drivers/dri2/platform_wayland.c   |  918 +++-
 src/egl/drivers/dri2/platform_x11.c   |   11 
 src/egl/drivers/haiku/egl_haiku.cpp   |2 
 src/egl/main/Makefile.sources |4 
 src/egl/main/README.txt   |   13 
 src/egl/main/eglapi.c |  626 --
 src/egl/main/eglapi.h |   47 
 src/egl/main/eglarray.h   |8 
 src/egl/main/eglcompiler.h|8 
 src/egl/main/eglconfig.c  |4 
 src/egl/main/eglconfig.h  |8 
 src/egl/main/eglcontext.h |8 
 src/egl/main/eglcurrent.c |8 
 src/egl/main/eglcurrent.h |8 
 src/egl/main/egldefines.h |6 
 src/egl/main/egldisplay.h |   13 
 src/egl/main/egldriver.c  |  368 -
 src/egl/main/egldriver.h  |   22 
 src/egl/main/eglfallbacks.c   |   21 
 src/egl/main/eglimage.h   |9 
 src/egl/main/egllog.h |8 
 src/egl/main/eglmode.c|  357 -
 src/egl/main/eglmode.h|   88 
 src/egl/main/eglscreen.c  |  235 -
 src/egl/main/eglscreen.h  |  117 
 src/egl/main/eglsurface.c |   55 
 src/egl/main/eglsurface.h |8 
 src/egl/main/eglsync.c|   71 
 src/egl/main/eglsync.h|3 
 src/egl/main/egltypedefs.h|   12 
 src/gallium/SConscript|5 
 src/gallium/auxiliary/Makefile.sources|1 
 src/gallium/auxiliary/cso_cache/cso_context.c |  100 
 src/gallium/auxiliary/cso_cache/cso_context.h |   12 
 src/gallium/auxiliary/draw/draw_llvm.c|2 
 src/gallium/auxiliary/gallivm/lp_bld_sample.c |2 
 src/gallium/auxiliary/hud/hud_context.c   |6 
 src/gallium/auxiliary/hud/hud_driver_query.c  |5 
 src/gallium/auxiliary/hud/hud_private.h   |2 
 src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c   |4 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c|2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c|2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c   |2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c |2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c |2 
 src/gallium/auxiliary/postprocess/postprocess.h   |9 
 src/gallium/auxiliary/postprocess/pp_run.c|6 
 src/gallium/auxiliary/rbug/rbug_connection.c  |2 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 6fc0cd2f52ddc4a1e7026c9c46fd6da3968fa439
Author: Gediminas Jakutis gedimi...@varciai.lt
Date:   Sun Apr 12 02:58:33 2015 +0300

gallium/hud: add more options to customize HUD panes

Extends the syntax of GALLIUM_HUD environment variable to:
- Add options to set the size and exact location of each pane.
- Add an option to limit the maximum allowed value of the X axis on a
  pane, clamping the graph down to not go above this value.
- Add an option to auto-adjust the value of the Y axis down to the
  highest value still visible on the graph.

v2:
- Make the patch simpler and smaller.
- With dynamic auto-adjusting on, adjust the Y axis once per pane
  update instead of updating once every several seconds.
- No longer mishandle pane height when having more than one graph per
  pane.

diff --git a/src/gallium/auxiliary/hud/hud_context.c 
b/src/gallium/auxiliary/hud/hud_context.c
index e46c68c..00ec205 100644
--- a/src/gallium/auxiliary/hud/hud_context.c
+++ b/src/gallium/auxiliary/hud/hud_context.c
@@ -569,9 +569,36 @@ hud_pane_set_max_value(struct hud_pane *pane, uint64_t 
value)
pane-yscale = -(int)pane-inner_height / (float)pane-max_value;
 }
 
+static void
+hud_pane_update_dyn_ceiling(struct hud_graph *gr, struct hud_pane *pane)
+{
+   unsigned i;
+   float tmp = 0.0f;
+
+   if (pane-dyn_ceil_last_ran != gr-index) {
+  LIST_FOR_EACH_ENTRY(gr, pane-graph_list, head) {
+ for (i = 0; i   gr-num_vertices; ++i) {
+tmp = gr-vertices[i * 2 + 1]  tmp ?
+  gr-vertices[i * 2 + 1] : tmp;
+ }
+  }
+
+  /* Avoid setting it lower than the initial starting height. */
+  tmp = tmp  pane-initial_max_value ? tmp : pane-initial_max_value;
+  hud_pane_set_max_value(pane, tmp);
+   }
+
+   /*
+* Mark this adjustment run so we could avoid repeating a full update
+* again needlessly in case the pane has more than one graph.
+*/
+   pane-dyn_ceil_last_ran = gr-index;
+}
+
 static struct hud_pane *
 hud_pane_create(unsigned x1, unsigned y1, unsigned x2, unsigned y2,
-unsigned period, uint64_t max_value)
+unsigned period, uint64_t max_value, uint64_t ceiling,
+boolean dyn_ceiling)
 {
struct hud_pane *pane = CALLOC_STRUCT(hud_pane);
 
@@ -590,6 +617,10 @@ hud_pane_create(unsigned x1, unsigned y1, unsigned x2, 
unsigned y2,
pane-inner_height = pane-inner_y2 - pane-inner_y1;
pane-period = period;
pane-max_num_vertices = (x2 - x1 + 2) / 2;
+   pane-ceiling = ceiling;
+   pane-dyn_ceiling = dyn_ceiling;
+   pane-dyn_ceil_last_ran = 0;
+   pane-initial_max_value = max_value;
hud_pane_set_max_value(pane, max_value);
LIST_INITHEAD(pane-graph_list);
return pane;
@@ -633,6 +664,9 @@ hud_pane_add_graph(struct hud_pane *pane, struct hud_graph 
*gr)
 void
 hud_graph_add_value(struct hud_graph *gr, uint64_t value)
 {
+   gr-current_value = value;
+   value = value  gr-pane-ceiling ? gr-pane-ceiling : value;
+
if (gr-index == gr-pane-max_num_vertices) {
   gr-vertices[0] = 0;
   gr-vertices[1] = gr-vertices[(gr-index-1)*2+1];
@@ -646,7 +680,9 @@ hud_graph_add_value(struct hud_graph *gr, uint64_t value)
   gr-num_vertices++;
}
 
-   gr-current_value = value;
+   if (gr-pane-dyn_ceiling == true) {
+  hud_pane_update_dyn_ceiling(gr, gr-pane);
+   }
if (value  gr-pane-max_value) {
   hud_pane_set_max_value(gr-pane, value);
}
@@ -683,6 +719,69 @@ parse_string(const char *s, char *out)
return i;
 }
 
+static char *
+read_pane_settings(char *str, unsigned * const x, unsigned * const y,
+   unsigned * const width, unsigned * const height,
+   uint64_t * const ceiling, boolean * const dyn_ceiling)
+{
+   char *ret = str;
+   unsigned tmp;
+
+   while (*str == '.') {
+  ++str;
+  switch (*str) {
+  case 'x':
+ ++str;
+ *x = strtoul(str, ret, 10);
+ str = ret;
+ break;
+
+  case 'y':
+ ++str;
+ *y = strtoul(str, ret, 10);
+ str = ret;
+ break;
+
+  case 'w':
+ ++str;
+ tmp = strtoul(str, ret, 10);
+ *width = tmp  80 ? tmp : 80; /* 80 is chosen arbitrarily */
+ str = ret;
+ break;
+
+  /*
+   * Prevent setting height to less than 50. If the height is set to less,
+   * the text of the Y axis labels on the graph will start overlapping.
+   */
+  case 'h':
+ ++str;
+ tmp = strtoul(str, ret, 10);
+ *height = tmp  50 ? tmp : 50;
+ str = ret;
+ break;
+
+  case 'c':
+ ++str;
+ tmp = strtoul(str, ret, 10);
+ *ceiling = tmp  10 ? tmp : 10;
+ str = ret;
+ break;
+
+  case 'd':
+ ++str;
+ ret = str;
+ *dyn_ceiling = true;
+ break;
+
+  default:
+ fprintf(stderr, 

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 VERSION |2 
 docs/relnotes/10.5.0.html   |  147 +++-
 src/gallium/auxiliary/os/os_misc.c  |4 
 src/gallium/drivers/r600/sb/sb_sched.cpp|4 
 src/gallium/state_trackers/omx/vid_dec_h264.c   |5 
 src/gallium/targets/pipe-loader/Makefile.am |6 
 src/glsl/opt_algebraic.cpp  |   75 +++-
 src/glx/dri_common_query_renderer.c |   36 -
 src/mapi/Makefile.am|2 
 src/mesa/Android.gen.mk |2 
 src/mesa/Makefile.am|8 -
 src/mesa/Makefile.sources   |2 
 src/mesa/SConscript |2 
 src/mesa/drivers/common/meta_tex_subimage.c |   89 --
 src/mesa/drivers/dri/common/xmlpool/Makefile.am |2 
 src/mesa/drivers/dri/i965/gen8_depth_state.c|   12 +
 src/mesa/main/.gitignore|4 
 src/mesa/main/formats.c |2 
 18 files changed, 315 insertions(+), 89 deletions(-)

New commits:
commit 97357d475fc8cbb5dbe7bf17ca41f535827fb253
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Fri Mar 6 22:55:59 2015 +

docs: Update 10.5.0 release notes

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.5.0.html b/docs/relnotes/10.5.0.html
index 578db4f..cde8f3d 100644
--- a/docs/relnotes/10.5.0.html
+++ b/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 iframe src=../contents.html/iframe
 div class=content
 
-h1Mesa 10.5.0 Release Notes / TBD/h1
+h1Mesa 10.5.0 Release Notes / March 06, 2015/h1
 
 p
 Mesa 10.5.0 is a new development release.
@@ -55,7 +55,150 @@ Note: some of the new features are only available with 
certain drivers.
 
 h2Bug fixes/h2
 
-TBD.
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=10370;Bug 10370/a 
- Incorrect pixels read back if draw bitmap texture through Display list/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=45348;Bug 45348/a 
- [swrast] piglit fbo-drawbuffers-arbfp regression/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=60879;Bug 60879/a 
- [radeonsi] X11 can't start with acceleration enabled/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=67672;Bug 67672/a 
- [llvmpipe] lp_test_arit fails on old CPUs/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=77544;Bug 77544/a 
- i965: Try to use LINE instructions to perform MAD with immediate 
arguments/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78770;Bug 78770/a 
- [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=80568;Bug 80568/a 
- [gen4] GPU Crash During Google Chrome Operation/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=82477;Bug 82477/a 
- [softpipe] piglit fp-long-alu regression/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=82585;Bug 82585/a 
- geometry shader with optional out variable segfaults/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=82991;Bug 82991/a 
- Inverted bumpmap in webgl applications/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=83463;Bug 83463/a 
- [swrast] piglit glsl-vs-clamp-1 regression/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=83500;Bug 83500/a 
- si_dma_copy_tile causes GPU hangs/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=83510;Bug 83510/a 
- Graphical glitches in Unreal Engine 4/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=83908;Bug 83908/a 
- [i965] Incorrect icon colors in Steam Big Picture/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=84212;Bug 84212/a 
- [BSW]ES3-CTS.shaders.loops.do_while_dynamic_iterations.vector_counter_vertex 
fails and causes GPU hang/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=84651;Bug 84651/a 
- Distorted graphics or black window when running Battle.net app on Intel 
hardware via wine/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=84777;Bug 84777/a 
- [BSW]Piglit spec_glsl-1.50_execution_geometry-basic fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85367;Bug 85367/a 
- [gen4] GPU hang in glmark-es2/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85467;Bug 85467/a 
- [llvmpipe] piglit gl-1.0-dlist-beginend failure with llvm-3.6.0svn/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85529;Bug 85529/a 
- Surfaces not drawn in Unvanquished/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85647;Bug 85647/a 
- Random radeonsi crashes with mesa 10.3.x/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85696;Bug 85696/a 
- r600g+nine: Bioshock shader failure after 
7b1c0cbc90d456384b0950ad21faa3c61a6b43ff/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=86089;Bug 86089/a 
- 

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit b9518a41d4103fb19337d51971de0f14e267b954
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Thu Feb 12 14:00:41 2015 +

Increment version to 10.5.0-rc1

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/VERSION b/VERSION
index 093d8ba..49dab28 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.5.0-devel
+10.5.0-rc1

commit 550d7c26e773bdfb71f51c53ad160caca68420e2
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Tue Feb 10 15:11:09 2015 +

auxiliary/vl: bring back the VL code for the dri targets

With commit c642e87d9f4(auxiliary/vl: rework the build of the VL code)
we split out the VL code into a separate static library that was meant
to be used by the VL targets alone - va, vdpau, xvmc.

The commit failed to consider the way we handle vdpau-gl interop and
broke it. Bring back the functionality by keeping the vl  vl_stub
separation as requrested by Christian.

v2: Update the omx target as well. Update mesa-stable email address.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86837
Cc: 10.5 mesa-sta...@lists.freedesktop.org
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
Tested-by: Andy Furniss adf.li...@gmail.com

diff --git a/configure.ac b/configure.ac
index 155f496..351027b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1572,7 +1572,8 @@ if test -n $with_gallium_drivers -a 
x$with_gallium_drivers != xswrast; then
 fi
 fi
 
-if test x$enable_xvmc = xyes -o \
+if test x$enable_dri = xyes -o \
+x$enable_xvmc = xyes -o \
 x$enable_vdpau = xyes -o \
 x$enable_omx = xyes -o \
 x$enable_va = xyes; then
diff --git a/src/gallium/auxiliary/Makefile.am 
b/src/gallium/auxiliary/Makefile.am
index 1053ce4..453282a 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -53,9 +53,7 @@ libgalliumvl_stub_la_SOURCES = \
 
 if NEED_GALLIUM_VL
 
-noinst_LTLIBRARIES += libgalliumvl.la
-
-libgalliumvl_la_CFLAGS = \
+COMMON_VL_CFLAGS = \
$(AM_CFLAGS) \
$(VL_CFLAGS) \
$(LIBDRM_CFLAGS) \
@@ -63,14 +61,27 @@ libgalliumvl_la_CFLAGS = \
-DPIPE_SEARCH_DIR=\$(libdir)/gallium-pipe\
 
 if HAVE_GALLIUM_STATIC_TARGETS
-libgalliumvl_la_CFLAGS += \
+COMMON_VL_CFLAGS += \
-DGALLIUM_STATIC_TARGETS=1
 
 endif # HAVE_GALLIUM_STATIC_TARGETS
 
+noinst_LTLIBRARIES += libgalliumvl.la
+
+libgalliumvl_la_CFLAGS = \
+   $(COMMON_VL_CFLAGS)
+
 libgalliumvl_la_SOURCES = \
$(VL_SOURCES)
 
+noinst_LTLIBRARIES += libgalliumvlwinsys.la
+
+libgalliumvlwinsys_la_CFLAGS = \
+   $(COMMON_VL_CFLAGS)
+
+libgalliumvlwinsys_la_SOURCES = \
+   $(VL_WINSYS_SOURCES)
+
 endif
 
 EXTRA_DIST = \
diff --git a/src/gallium/auxiliary/Makefile.sources 
b/src/gallium/auxiliary/Makefile.sources
index c45dd18..d330935 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -334,10 +334,13 @@ VL_SOURCES := \
vl/vl_video_buffer.h \
vl/vl_vlc.h \
vl/vl_winsys.h \
-   vl/vl_winsys_dri.c \
vl/vl_zscan.c \
vl/vl_zscan.h
 
+# XXX: Nuke this as our dri targets no longer depend on VL.
+VL_WINSYS_SOURCES := \
+   vl/vl_winsys_dri.c
+
 VL_STUB_SOURCES := \
vl/vl_stubs.c
 
diff --git a/src/gallium/targets/dri/Makefile.am 
b/src/gallium/targets/dri/Makefile.am
index 7f2ce6a..aaeb950 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -44,7 +44,7 @@ gallium_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
$(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
-   $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
+   $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
$(top_builddir)/src/gallium/drivers/noop/libnoop.la \
diff --git a/src/gallium/targets/omx/Makefile.am 
b/src/gallium/targets/omx/Makefile.am
index 0ae7c55..f52e669 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -24,6 +24,7 @@ endif # HAVE_LD_VERSION_SCRIPT
 
 libomx_mesa_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
+   $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
diff --git a/src/gallium/targets/pipe-loader/Makefile.am 
b/src/gallium/targets/pipe-loader/Makefile.am
index 3d73a51..94658f8 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -40,6 +40,7 @@ PIPE_LIBS =
 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 VERSION   |2 
 docs/relnotes/10.4.1.html |4 
 docs/relnotes/10.4.2.html |  125 ++
 src/gallium/auxiliary/util/u_cpu_detect.c |8 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |3 
 src/gallium/drivers/nouveau/nv50/nv50_3d.xml.h|2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|9 
 src/gallium/drivers/nouveau/nv50/nv50_state.c |9 
 src/gallium/drivers/nouveau/nv50/nv50_stateobj.h  |2 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |8 
 src/gallium/drivers/nouveau/nvc0/mme/com9097.mme  |7 
 src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h|   12 
 src/gallium/drivers/nouveau/nvc0/nvc0_3d.xml.h|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |4 
 src/gallium/drivers/nouveau/nvc0/nvc0_stateobj.h  |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |8 
 src/gallium/drivers/r600/r600_shader.c|2 
 src/gallium/drivers/r600/sb/sb_bc.h   |2 
 src/gallium/drivers/r600/sb/sb_bc_finalize.cpp|  109 +---
 src/gallium/drivers/r600/sb/sb_bc_parser.cpp  |2 
 src/gallium/drivers/r600/sb/sb_context.cpp|2 
 src/gallium/drivers/r600/sb/sb_if_conversion.cpp  |4 
 src/gallium/drivers/r600/sb/sb_ir.h   |9 
 src/gallium/drivers/r600/sb/sb_pass.h |5 
 src/gallium/drivers/r600/sb/sb_sched.cpp  |3 
 src/gallium/drivers/radeonsi/si_shader.c  |7 
 src/gallium/drivers/radeonsi/si_state.c   |6 
 src/mesa/drivers/dri/i965/brw_context.h   |7 
 src/mesa/drivers/dri/i965/brw_draw.c  |   15 -
 src/mesa/drivers/dri/i965/brw_draw_upload.c   |   12 
 src/mesa/drivers/dri/i965/brw_performance_monitor.c   |2 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |8 
 src/mesa/drivers/dri/i965/intel_tex_subimage.c|7 
 src/mesa/state_tracker/st_draw.c  |3 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|3 
 src/mesa/vbo/vbo_exec_array.c |3 
 38 files changed, 310 insertions(+), 113 deletions(-)

New commits:
commit 02f2e97c3ee4a10696bfce79b6299d478bb6e59a
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Mon Jan 12 10:30:28 2015 +

Add release notes for the 10.4.2 release

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.4.2.html b/docs/relnotes/10.4.2.html
new file mode 100644
index 000..84813a5
--- /dev/null
+++ b/docs/relnotes/10.4.2.html
@@ -0,0 +1,125 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.4.2 Release Notes / January 12, 2015/h1
+
+p
+Mesa 10.4.2 is a bug fix release which fixes bugs found since the 10.4.1 
release.
+/p
+p
+Mesa 10.4.2 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+h2SHA256 checksums/h2
+pre
+TBD
+/pre
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=85529;Bug 85529/a 
- Surfaces not drawn in Unvanquished/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=87619;Bug 87619/a 
- Changes to state such as render targets change fragment shader without 
marking it dirty./li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=87658;Bug 87658/a 
- [llvmpipe] SEGV in sse2_has_daz on ancient Pentium4-M/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=87913;Bug 87913/a 
- CPU cacheline size of 0 can be returned by CPUID leaf 0x8006 in some 
virtual machines/li
+
+/ul
+
+
+h2Changes/h2
+
+pChad Versace (2):/p
+ul
+  lii965: Use safer pointer arithmetic in 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 60e2e04fe8d9a55aeeeb8737a52c301e8a270458
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Tue Dec 30 02:11:34 2014 +

Add release notes for the 10.4.1 release

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.4.1.html b/docs/relnotes/10.4.1.html
new file mode 100644
index 000..ec6d3c0
--- /dev/null
+++ b/docs/relnotes/10.4.1.html
@@ -0,0 +1,95 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.4.1 Release Notes / December 29, 2014/h1
+
+p
+Mesa 10.4.1 is a bug fix release which fixes bugs found since the 10.4.0 
release.
+/p
+p
+Mesa 10.4.1 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+h2SHA256 checksums/h2
+pre
+TBD
+/pre
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=82585;Bug 82585/a 
- geometry shader with optional out variable segfaults/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=82991;Bug 82991/a 
- Inverted bumpmap in webgl applications/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=83908;Bug 83908/a 
- [i965] Incorrect icon colors in Steam Big Picture/li
+
+/ul
+
+
+h2Changes/h2
+
+pAndres Gomez (1):/p
+ul
+  lii965/brw_reg: struct constructor now needs explicit negate and abs 
values./li
+/ul
+
+pCody Northrop (1):/p
+ul
+  lii965: Require pixel alignment for GPU copy blit/li
+/ul
+
+pEmil Velikov (3):/p
+ul
+  lidocs: Add 10.4 sha256 sums, news item and link release notes/li
+  liRevert glx/dri3: Request non-vsynced Present for swapinterval zero. 
(v3)/li
+  liUpdate version to 10.4.1/li
+/ul
+
+pIan Romanick (2):/p
+ul
+  lilinker: Wrap access of producer_var with a NULL check/li
+  lilinker: Assign varying locations geometry shader inputs for SSO/li
+/ul
+
+pMario Kleiner (4):/p
+ul
+  liglx/dri3: Fix glXWaitForSbcOML() to handle targetSBC==0 correctly. 
(v2)/li
+  liglx/dri3: Track separate (ust, msc) for PresentPixmap vs. 
PresentNotifyMsc (v2)/li
+  liglx/dri3: Request non-vsynced Present for swapinterval zero. (v3)/li
+  liglx/dri3: Don't fail on glXSwapBuffersMscOML(dpy, window, 0, 0, 0) 
(v2)/li
+/ul
+
+pMaxence Le Doré (1):/p
+ul
+  liglsl: Add gl_MaxViewports to available builtin constants/li
+/ul
+
+
+/div
+/body
+/html

commit 1a3df8cc777af497f1557d9c6ad9360f7322b7fb
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Tue Dec 30 02:07:33 2014 +

Update version to 10.4.1

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/VERSION b/VERSION
index 816c071..da772b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.4.0
+10.4.1

commit 45416a255f304c53ef14c5d78a079f0979b72600
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Tue Dec 30 01:03:14 2014 +

Revert glx/dri3: Request non-vsynced Present for swapinterval zero. (v3)

This reverts commit ee241a688904211663e9445ed90e6d51aca3204f.

May not be the correct fix. Discussion is ongoing.

http://lists.freedesktop.org/archives/mesa-dev/2014-December/072969.html

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 1ddc723..0bda670 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1526,7 +1526,6 @@ dri3_swap_buffers(__GLXDRIdrawable *pdraw, int64_t 
target_msc, int64_t divisor,
xcb_connection_t *c = XGetXCBConnection(dpy);
struct dri3_buffer *back;
int64_t ret = 0;
-   uint32_t options = XCB_PRESENT_OPTION_NONE;
 
unsigned flags = __DRI2_FLUSH_DRAWABLE;
if (flush)
@@ -1579,17 +1578,6 @@ dri3_swap_buffers(__GLXDRIdrawable *pdraw, int64_t 
target_msc, int64_t divisor,
  remainder = 0;
   }
 
-  /* From the GLX_EXT_swap_control spec:
-   *
-   * If interval is set to a value of 0, buffer swaps are not
-   *  synchronized to a video frame.
-   *
-   * Implementation note: It is possible to enable triple buffering 
behaviour
-   * by not using XCB_PRESENT_OPTION_ASYNC, but this should not be the 
default.
-   */
-  if (priv-swap_interval == 0)
-  options |= XCB_PRESENT_OPTION_ASYNC;
-
   back-busy = 1;
   back-last_swap = priv-send_sbc;
   xcb_present_pixmap(c,
@@ -1603,7 +1591,7 @@ dri3_swap_buffers(__GLXDRIdrawable 

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 Makefile.am   |1 
 VERSION   |2 
 configure.ac  |   18 +
 src/gallium/drivers/freedreno/a2xx/fd2_context.c  |1 
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c |   11 -
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |   10 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.h  |1 
 src/gallium/drivers/freedreno/freedreno_resource.c|  108 ++
 src/gallium/drivers/freedreno/ir3/ir3_dump.c  |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   32 ++
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h   |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |4 
 src/gallium/drivers/nouveau/nv50/nv50_state.c |7 
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c|8 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   16 -
 src/gallium/drivers/nouveau/nv50/nv50_transfer.c  |2 
 src/gallium/drivers/nouveau/nv50/nv84_video.c |   15 -
 src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c   |1 
 src/gallium/drivers/r600/r600_blit.c  |3 
 src/gallium/drivers/r600/r600_state_common.c  |   12 -
 src/gallium/drivers/radeon/r600_query.c   |   28 ++
 src/gallium/state_trackers/dri/dri2.c |8 
 src/gallium/targets/dri/Makefile.am   |6 
 src/gallium/targets/vdpau/Makefile.am |6 
 src/gallium/winsys/svga/drm/vmw_screen_dri.c  |   13 -
 src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c |   82 ++-
 src/glsl/lower_variable_index_to_cond_assign.cpp  |2 
 src/mesa/Makefile.am  |3 
 src/mesa/drivers/common/meta.c|   38 ---
 src/mesa/drivers/common/meta_copy_image.c |2 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |   20 +
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|   23 +-
 src/mesa/drivers/dri/i965/intel_copy_image.c  |   53 +++-
 src/mesa/main/attrib.c|4 
 src/mesa/main/context.c   |3 
 src/mesa/main/macros.h|7 
 src/mesa/state_tracker/st_extensions.c|5 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   51 +++-
 38 files changed, 424 insertions(+), 190 deletions(-)

New commits:
commit 4e1ca4a190a0809e3c33327590faaa7eb25812ab
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Fri Sep 5 17:00:40 2014 +0100

Increment version to 10.3.0-rc3

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/VERSION b/VERSION
index 87d81b2..babe311 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.3.0-rc2
+10.3.0-rc3

commit 06f1f1ea8106e285a92e873a04de90e3aa228a32
Author: Marek Olšák marek.ol...@amd.com
Date:   Thu Sep 4 14:38:18 2014 +0200

st/mesa: use 1.0f as boolean true on drivers without integer support

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82882

Cc: 10.2 10.3 mesa-sta...@lists.freedesktop.org
Reviewed-by: Brian Paul bri...@vmware.com
Reviewed-by: Matt Turner matts...@gmail.com
(cherry picked from commit 1a00f247512f22e58548053a99a706615a178672)

diff --git a/src/mesa/state_tracker/st_extensions.c 
b/src/mesa/state_tracker/st_extensions.c
index 4110eb5..914004b 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -34,6 +34,7 @@
 #include pipe/p_context.h
 #include pipe/p_defines.h
 #include pipe/p_screen.h
+#include util/u_math.h
 
 #include st_context.h
 #include st_extensions.h
@@ -274,8 +275,6 @@ void st_init_limits(struct pipe_screen *screen,
c-MinProgramTextureGatherOffset = screen-get_param(screen, 
PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET);
c-MaxProgramTextureGatherOffset = screen-get_param(screen, 
PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET);
 
-   c-UniformBooleanTrue = ~0;
-
c-MaxTransformFeedbackBuffers =
   screen-get_param(screen, PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS);
c-MaxTransformFeedbackBuffers = MIN2(c-MaxTransformFeedbackBuffers, 
MAX_FEEDBACK_BUFFERS);
@@ -697,6 +696,8 @@ void st_init_extensions(struct pipe_screen *screen,
   }
}
 
+   consts-UniformBooleanTrue = consts-NativeIntegers ? ~0 : fui(1.0f);
+
/* Below are the cases which cannot be moved into tables easily. */
 
if (!has_lib_dxtc  !options-force_s3tc_enable) {

commit e842a02df3730aaabe7c71dd560c4f0f163ffbc5
Author: Marek Olšák marek.ol...@amd.com
Date:   Thu Sep 4 15:03:31 2014 +0200

mesa: set 

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 Makefile.am   |   12 +--
 VERSION   |2 
 include/pci_ids/radeonsi_pci_ids.h|7 ++
 src/gallium/auxiliary/vl/vl_compositor.c  |2 
 src/gallium/drivers/radeon/radeon_video.c |7 +-
 src/gallium/state_trackers/vdpau/device.c |   43 +-
 src/gallium/state_trackers/vdpau/output.c |   42 +
 src/gallium/state_trackers/vdpau/vdpau_private.h  |1 
 src/glsl/glcpp/glcpp-lex.l|   10 ++-
 src/mesa/Makefile.am  |3 
 src/mesa/drivers/dri/i965/brw_eu_compact.c|   14 +---
 src/mesa/drivers/dri/i965/brw_meta_fast_clear.c   |1 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|7 ++
 src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp |5 -
 14 files changed, 116 insertions(+), 40 deletions(-)

New commits:
commit 390a9f6cb7ddc755380a680ff8e07b308e5b31b4
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Sun Aug 31 19:29:42 2014 +0100

Increment version to 10.3.0-rc2

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/VERSION b/VERSION
index 9cad0c5..87d81b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.3.0-rc1
+10.3.0-rc2

commit 0fbb9a599df898d4e1166d6d6f00cb34a0524bea
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Sun Aug 31 23:16:15 2014 +0100

mesa: fix make tarballs

Current method of generating distribution tar-balls involves manually
invoking make + target name in the appropriate places. This temporary
solution is used until we get 'make dist' working.

Currently it does not work, as in order to have the target (which is
also a filename) available in the final Makefile we need to add a PHONY
target + use the correct target name.

Cc: 10.2 10.3 mesa-sta...@lists.freedesktop.org
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
(cherry picked from commit 88cbe3908f0ea08228a5ffb1808f98b6906c4416)

diff --git a/Makefile.am b/Makefile.am
index d2916da..111c1c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ IGNORE_FILES = \
 
 parsers: configure
$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp 
glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
-   $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c 
program/program_parse.tab.h
+   $(MAKE) -C src/mesa ../../src/mesa/program/lex.yy.c 
../../src/mesa/program/program_parse.tab.c 
../../src/mesa/program/program_parse.tab.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index e71bccb..b23208a 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -36,7 +36,8 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
+.PHONY: $(BUILDDIR)main/git_sha1.h.tmp $(BUILDDIR)program/lex.yy.c 
$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h
+
 $(BUILDDIR)main/git_sha1.h.tmp:
@touch main/git_sha1.h.tmp
@if test -d $(top_srcdir)/.git; then \

commit 2310a4b4cf0fd7a4cd04dd9aba5c89f52070e5d2
Author: Matt Turner matts...@gmail.com
Date:   Thu Aug 28 20:16:42 2014 -0700

i965/vec4: Update register coalescing test.

In commit 04895f5c I added support for reswizzling writemasks. This test
was checking that we didn't support this.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82881
(cherry picked from commit 8b5ac1df17608e0d0d5ce412988ee8de97f61405)

diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp 
b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
index 149174c..16e6270 100644
--- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
@@ -241,8 +241,5 @@ TEST_F(register_coalesce_test, test_channel_mul_grf)
 
register_coalesce(v);
 
-   /* This path isn't supported yet in the reswizzling code, so we're checking
-* that we haven't done anything bad to scalar non-DP[234]s.
-*/
-   EXPECT_NE(mul-dst.reg, to.reg);
+   EXPECT_EQ(mul-dst.reg, to.reg);
 }

commit 8ef3d4fe03de1b370e255a3c900719a8cce59599
Author: Kenneth Graunke kenn...@whitecape.org
Date:   Fri Aug 29 15:15:43 2014 -0700

i965: Add 2x MSAA support to Broadwell fast clear code.

According to the cited documentation section (but in the newer docs),
x_scaledown is the same for 2x and 4x MSAA.

+47 piglits.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83081
Signed-off-by: Kenneth Graunke kenn...@whitecape.org
Reviewed-by: Matt Turner matts...@gmail.com
Cc: 10.3 mesa-sta...@lists.freedesktop.org
(cherry picked from commit 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.mk |5 
 CleanSpec.mk   |7 
 VERSION|2 
 configure.ac   |   60 
 docs/GL3.txt   |   56 
 docs/autoconf.html |   54 
 docs/index.html|6 
 docs/relnotes.html |1 
 docs/relnotes/10.2.6.html  |  118 
 docs/relnotes/10.3.html|   15 
 include/GL/gl_mangle.h |  139 
 include/GL/glcorearb.h | 3589 
++
 include/GL/glext.h |  380 +
 include/GL/glxext.h|   11 
 include/GL/wglext.h|   11 
 include/c11/threads_win32.h|2 
 install-lib-links.mk   |2 
 scons/custom.py|3 
 src/Makefile.am|   13 
 src/egl/drivers/dri2/Android.mk|4 
 src/egl/drivers/dri2/egl_dri2.c|   39 
 src/egl/drivers/dri2/platform_android.c|4 
 src/egl/main/Android.mk|   52 
 src/egl/main/Makefile.am   |   40 
 src/egl/main/Makefile.sources  |   38 
 src/egl/main/SConscript|   21 
 src/gallium/Android.mk |   22 
 src/gallium/Makefile.am|  174 
 src/gallium/SConscript |   42 
 src/gallium/auxiliary/Makefile.sources |1 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  |4 
 src/gallium/auxiliary/os/os_misc.c |   64 
 src/gallium/auxiliary/os/os_misc.h |7 
 src/gallium/auxiliary/os/os_process.c  |7 
 src/gallium/auxiliary/pipe-loader/pipe_loader.h|2 
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c|2 
 src/gallium/auxiliary/tgsi/tgsi_info.c |4 
 src/gallium/auxiliary/tgsi/tgsi_ureg.c |2 
 src/gallium/auxiliary/tgsi/tgsi_util.c |2 
 src/gallium/auxiliary/util/u_blitter.c |2 
 src/gallium/auxiliary/util/u_format.c  |4 
 src/gallium/auxiliary/util/u_format.csv|6 
 src/gallium/auxiliary/util/u_format.h  |   12 
 src/gallium/auxiliary/util/u_format_bptc.c |   26 
 src/gallium/auxiliary/util/u_format_bptc.h |  109 
 src/gallium/auxiliary/util/u_format_pack.py|2 
 src/gallium/auxiliary/util/u_format_table.py   |3 
 src/gallium/auxiliary/util/u_inlines.h |3 
 src/gallium/auxiliary/util/u_math.h|   62 
 src/gallium/docs/source/screen.rst |   12 
 src/gallium/docs/source/tgsi.rst   |   12 
 src/gallium/drivers/Makefile.am|  100 
 src/gallium/drivers/freedreno/Android.mk   |   44 
 src/gallium/drivers/freedreno/Makefile.am  |2 
 src/gallium/drivers/freedreno/freedreno_screen.c   |   18 
 src/gallium/drivers/i915/i915_screen.c |   25 
 src/gallium/drivers/i915/i915_winsys.h |5 
 src/gallium/drivers/ilo/Makefile.sources   |1 
 src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c |   34 
 src/gallium/drivers/ilo/ilo_blitter_blt.c  |   44 
 src/gallium/drivers/ilo/ilo_blitter_rectlist.c |   12 
 src/gallium/drivers/ilo/ilo_common.h   |2 
 src/gallium/drivers/ilo/ilo_gpe.h  |   13 
 src/gallium/drivers/ilo/ilo_gpe_gen6.c |  279 
 src/gallium/drivers/ilo/ilo_gpe_gen7.c |   70 
 src/gallium/drivers/ilo/ilo_layout.c   | 1387 +++
 src/gallium/drivers/ilo/ilo_layout.h   |  292 
 src/gallium/drivers/ilo/ilo_resource.c | 1381 ---
 src/gallium/drivers/ilo/ilo_resource.h |   54 
 

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit 3b48f6a4c06db57a7203d247994b05e55c9418c1
Author: Chris Forbes chr...@ijw.co.nz
Date:   Sun Aug 3 19:55:55 2014 +1200

mesa: Add a new function for getting the nonconst sampler array index

If the array index is not a constant expression, the existing support
will assume a zero offset (giving us the sampler index of the base of
the array).

For dynamically uniform indexing of sampler arrays, we need both that
and the indexing expression.

Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Matt Turner matts...@gmail.com
Reviewed-by: Ilia Mirkin imir...@alum.mit.edu

diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index e6532be..29a5408 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -134,3 +134,14 @@ _mesa_get_sampler_uniform_value(class ir_dereference 
*sampler,
return shader_program-UniformStorage[location].sampler[shader].index +
   getname.offset;
 }
+
+
+extern C class ir_rvalue *
+_mesa_get_sampler_array_nonconst_index(class ir_dereference *sampler)
+{
+   ir_dereference_array *deref_arr = sampler-as_dereference_array();
+   if (!deref_arr || deref_arr-array_index-as_constant())
+  return NULL;
+
+   return deref_arr-array_index;
+}
diff --git a/src/mesa/program/sampler.h b/src/mesa/program/sampler.h
index 22467e9..8b7c3b6 100644
--- a/src/mesa/program/sampler.h
+++ b/src/mesa/program/sampler.h
@@ -27,3 +27,6 @@ int
 _mesa_get_sampler_uniform_value(class ir_dereference *sampler,
struct gl_shader_program *shader_program,
const struct gl_program *prog);
+
+class ir_rvalue *
+_mesa_get_sampler_array_nonconst_index(class ir_dereference *sampler);

commit 1b4761bc27a50208dba2bc028c9835fed572e696
Author: Chris Forbes chr...@ijw.co.nz
Date:   Sun Aug 3 17:57:05 2014 +1200

glsl: Allow dynamically uniform sampler array indexing with 4.0/gs5

V2: Expand comment to explain what dynamically uniform expressions are
about.

Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Matt Turner matts...@gmail.com
Reviewed-by: Ilia Mirkin imir...@alum.mit.edu

diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp
index 50f9987..5ca85f6 100644
--- a/src/glsl/ast_array_index.cpp
+++ b/src/glsl/ast_array_index.cpp
@@ -213,6 +213,13 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
* as using a loop counter as the index to an array of samplers.  If the
* loop in unrolled, the code should compile correctly.  Instead, emit a
* warning.
+   *
+   * In GLSL 4.00 / ARB_gpu_shader5, this requirement is relaxed again to 
allow
+   * indexing with dynamically uniform expressions. Note that these are not
+   * required to be uniforms or expressions based on them, but merely that 
the
+   * values must not diverge between shader invocations run together. If 
the
+   * values *do* diverge, then the behavior of the operation requiring a
+   * dynamically uniform expression is undefined.
*/
   if (array-type-element_type()-is_sampler()) {
 if (!state-is_version(130, 100)) {
@@ -227,7 +234,7 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
  expressions will be forbidden in GLSL 1.30 
  and later);
}
-} else {
+} else if (!state-is_version(400, 0)  
!state-ARB_gpu_shader5_enable) {
_mesa_glsl_error(loc, state,
 sampler arrays indexed with non-constant 
 expressions is forbidden in GLSL 1.30 and 

commit f525bd01d1430a5e33f57805f50fe4e89aa86ae8
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Wed Aug 6 23:45:05 2014 -0400

nvc0/ir: describe the tex arguments for fermi/kepler

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index ade315d..7da9b0b 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -567,6 +567,31 @@ NVC0LoweringPass::handleTEX(TexInstruction *i)
const int lyr = arg - (i-tex.target.isMS() ? 2 : 1);
const int chipset = prog-getTarget()-getChipset();
 
+   // Arguments to the TEX instruction are a little insane. Even though the
+   // encoding is identical between SM20 and SM30, the arguments mean
+   // different things between Fermi and Kepler+. A lot of arguments are
+   // optional based on flags passed to the instruction. This summarizes the
+   // order of things.
+   //
+   // Fermi:
+   //  array/indirect
+   //  coords
+   //  sample
+   //  lod bias
+   //  depth compare
+   //  offsets:
+   //- tg4: 8 bits each, either 2 (1 offset reg) or 8 (2 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 configure.ac  |1 
 docs/index.html   |7 +
 docs/relnotes/10.2.html   |6 -
 src/egl/main/eglapi.c |   12 +-
 src/gallium/drivers/llvmpipe/lp_rast.c|   12 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|   11 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   11 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |5 
 src/gallium/drivers/nouveau/nv50/nv50_context.c   |7 -
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c|4 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   20 +++
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |9 -
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c   |   13 --
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|7 -
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c|1 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |   13 ++
 src/gallium/drivers/r600/r600_blit.c  |3 
 src/gallium/drivers/radeon/r600_texture.c |3 
 src/gallium/drivers/radeonsi/si_blit.c|3 
 src/glsl/ast_to_hir.cpp   |6 -
 src/glx/glxext.c  |4 
 src/mapi/glapi/glapi_dispatch.c   |   57 ++
 src/mesa/drivers/common/meta.h|4 
 src/mesa/drivers/common/meta_blit.c   |   15 ++
 src/mesa/drivers/dri/i915/intel_context.c |2 
 src/mesa/drivers/dri/i965/brw_defines.h   |3 
 src/mesa/drivers/dri/i965/brw_device_info.c   |   31 +++--
 src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp|   37 --
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |   38 --
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |1 
 src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp   |   12 --
 src/mesa/drivers/dri/i965/brw_state.h |3 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|   16 +-
 src/mesa/drivers/dri/i965/brw_wm.c|3 
 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c  |   21 ++-
 src/mesa/drivers/dri/i965/gen7_sampler_state.c|6 -
 src/mesa/main/get.c   |   10 +
 src/mesa/main/get_hash_generator.py   |2 
 src/mesa/main/get_hash_params.py  |4 
 src/mesa/state_tracker/st_program.c   |   30 ++---
 42 files changed, 339 insertions(+), 121 deletions(-)

New commits:
commit 1b69ea1c6d4e66ade7ab4fa0b08d024efe9dae9c
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 22:13:36 2014 -0700

Bump version to 10.2.1

diff --git a/VERSION b/VERSION
index 2bd6f7e..26ee5b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.0
+10.2.1

commit c2fc9fb90786cae02d589ee7242d5f5fe99bdbec
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 22:07:34 2014 -0700

radeonsi: Fix build error introduced in 5ab9a9c

While resolving conflicts in cherry picking commit d226191, I
accidentally introduced some garbage.  Because radeonsi isn't built by
default, the problem went unnoticed by me.

Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reported-by: Laurent Carlier lordhea...@gmail.com
Tested-by: Laurent Carlier lordhea...@gmail.com

diff --git a/src/gallium/drivers/radeonsi/si_blit.c 
b/src/gallium/drivers/radeonsi/si_blit.c
index 892ee84..1dfff49 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -692,7 +692,6 @@ static bool do_hardware_msaa_resolve(struct pipe_context 
*ctx,
!(dst-surface.flags  RADEON_SURF_SCANOUT) 
(!dst-cmask.size || !dst-dirty_level_mask) /* dst cannot be 
fast-cleared */) {
si_blitter_begin(ctx, SI_COLOR_RESOLVE);
-t-cleared
util_blitter_custom_resolve_color(sctx-blitter,
  info-dst.resource, 
info-dst.level,
  info-dst.box.z,

commit 28d41e409d74aabe35f1031e759179e82cb760b4
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 21:17:02 2014 -0700

docs: Add MD5 checksum, etc. for 10.1 release

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/index.html b/docs/index.html
index 186bda2..5bd9601 100644
--- 

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION   |2 
 src/gallium/auxiliary/tgsi/tgsi_strings.c |3 
 src/gallium/drivers/freedreno/Makefile.sources|3 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h |   10 
 src/gallium/drivers/freedreno/a2xx/fd2_emit.c |2 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h |  158 ++-
 src/gallium/drivers/freedreno/a3xx/fd3_compiler.c |  394 +++-
 src/gallium/drivers/freedreno/a3xx/fd3_compiler_old.c |3 
 src/gallium/drivers/freedreno/a3xx/fd3_context.c  |3 
 src/gallium/drivers/freedreno/a3xx/fd3_program.c  |4 
 src/gallium/drivers/freedreno/a3xx/fd3_program.h  |4 
 src/gallium/drivers/freedreno/a3xx/fd3_query.c|  139 ++
 src/gallium/drivers/freedreno/a3xx/fd3_query.h|   36 
 src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c   |   18 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |8 
 src/gallium/drivers/freedreno/a3xx/fd3_util.c |   28 
 src/gallium/drivers/freedreno/adreno_common.xml.h |   43 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h|  102 ++
 src/gallium/drivers/freedreno/freedreno_context.c |3 
 src/gallium/drivers/freedreno/freedreno_context.h |   65 +
 src/gallium/drivers/freedreno/freedreno_draw.c|6 
 src/gallium/drivers/freedreno/freedreno_gmem.c|   19 
 src/gallium/drivers/freedreno/freedreno_query.c   |  117 --
 src/gallium/drivers/freedreno/freedreno_query.h   |   33 
 src/gallium/drivers/freedreno/freedreno_query_hw.c|  465 ++
 src/gallium/drivers/freedreno/freedreno_query_hw.h|  164 +++
 src/gallium/drivers/freedreno/freedreno_query_sw.c|  165 +++
 src/gallium/drivers/freedreno/freedreno_query_sw.h|   55 +
 src/gallium/drivers/freedreno/freedreno_resource.c|3 
 src/gallium/drivers/freedreno/freedreno_screen.c  |   17 
 src/gallium/drivers/freedreno/freedreno_util.h|9 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |   94 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |   47 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp   |2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   16 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |   14 
 src/gallium/targets/egl-static/Makefile.am|2 
 src/glx/apple/apple_visual.c  |   14 
 src/mapi/glapi/gen/gl_gentable.py |2 
 src/mesa/drivers/common/meta.c|  106 +-
 src/mesa/drivers/common/meta.h|   10 
 src/mesa/drivers/common/meta_blit.c   |   50 -
 src/mesa/drivers/dri/i915/intel_fbo.c |8 
 src/mesa/drivers/dri/i965/brw_reset.c |   18 
 src/mesa/drivers/dri/i965/brw_wm_state.c  |1 
 src/mesa/drivers/dri/i965/gen8_blend_state.c  |4 
 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp   |   13 
 src/mesa/drivers/dri/i965/intel_extensions.c  |3 
 src/mesa/drivers/dri/i965/intel_fbo.c |   20 
 src/mesa/drivers/dri/nouveau/nouveau_driver.c |2 
 src/mesa/drivers/dri/radeon/radeon_fbo.c  |2 
 src/mesa/drivers/x11/xm_dd.c  |2 
 src/mesa/main/fbobject.c  |6 
 54 files changed, 2150 insertions(+), 369 deletions(-)

New commits:
commit 697316fe0667fcf44dd52f69906a920450cbd1e4
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri May 23 17:36:42 2014 -0700

Bump version to 10.2-rc4

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 24ee34e..01f7126 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.0-rc3
+10.2.0-rc4

commit 9a8f12ae034feefc7ce189485dfc8f387945eee0
Author: Pavel Popov pavel.e.po...@intel.com
Date:   Fri May 16 12:00:02 2014 +0700

i965: Properly return *RESET* status in glGetGraphicsResetStatusARB

The glGetGraphicsResetStatusARB from ARB_robustness extension always
returns GUILTY_CONTEXT_RESET_ARB and never returns NO_ERROR for guilty
context with LOSE_CONTEXT_ON_RESET_ARB strategy.  This is because Mesa
returns GUILTY_CONTEXT_RESET_ARB if batch_active !=0 whereas kernel
driver never reset batch_active and this variable always  0 for guilty
context.  The same behaviour also can be observed for batch_pending and
INNOCENT_CONTEXT_RESET_ARB.

But 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 VERSION   |2 
 bin/.cherry-ignore|3 
 configure.ac  |   28 
 docs/relnotes/10.2.html   |   19 
 src/egl/wayland/wayland-drm/wayland-drm.xml   |   35 
 src/gallium/auxiliary/draw/draw_context.c |2 
 src/gallium/auxiliary/draw/draw_gs.c  |   10 
 src/gallium/auxiliary/draw/draw_private.h |4 
 src/gallium/auxiliary/draw/draw_vs.c  |4 
 src/gallium/auxiliary/draw/draw_vs_exec.c |4 
 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |3 
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |   10 
 src/gallium/drivers/nouveau/nv50/nv50_query.c |6 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   21 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |   11 
 src/gallium/drivers/r600/r600_pipe.h  |9 
 src/gallium/drivers/radeon/r600_pipe_common.h |9 
 src/gallium/drivers/radeonsi/si_descriptors.c |4 
 src/gallium/drivers/radeonsi/si_pipe.c|4 
 src/gallium/drivers/radeonsi/si_pipe.h|4 
 src/gallium/drivers/radeonsi/si_state.c   |   17 
 src/gallium/include/pipe/p_state.h|3 
 src/gallium/state_trackers/clover/core/device.cpp |5 
 src/gallium/state_trackers/xa/xa_context.c|2 
 src/glsl/builtin_functions.cpp|8 
 src/glsl/glsl_parser.yy   |   11 
 src/glsl/link_varyings.cpp|8 
 src/glsl/tests/varyings_test.cpp  |   11 
 src/glx/tests/query_renderer_implementation_unittest.cpp  |6 
 src/mesa/drivers/common/meta.c|  293 +++--
 src/mesa/drivers/common/meta.h|   38 
 src/mesa/drivers/common/meta_blit.c   |  179 +--
 src/mesa/drivers/common/meta_generate_mipmap.c|2 
 src/mesa/drivers/dri/i965/Makefile.sources|2 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp  |  124 --
 src/mesa/drivers/dri/i965/brw_context.h   |   14 
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |  524 ++
 src/mesa/drivers/dri/i965/brw_meta_updownsample.c |   35 
 src/mesa/drivers/dri/i965/brw_meta_util.c |  160 +++
 src/mesa/drivers/dri/i965/brw_meta_util.h |   46 
 src/mesa/drivers/dri/i965/brw_state.h |6 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   24 
 src/mesa/drivers/dri/i965/gen7_misc_state.c   |   15 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |   17 
 src/mesa/drivers/dri/i965/gen8_depth_state.c  |   17 
 src/mesa/drivers/dri/i965/gen8_generator.cpp  |   14 
 src/mesa/drivers/dri/i965/gen8_surface_state.c|   87 +
 src/mesa/drivers/dri/i965/intel_buffers.c |2 
 src/mesa/drivers/dri/i965/intel_extensions.c  |5 
 src/mesa/drivers/dri/i965/intel_fbo.c |9 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |9 
 src/mesa/drivers/dri/i965/intel_tex_image.c   |1 
 src/mesa/main/context.c   |4 
 src/mesa/main/fbobject.c  |2 
 src/mesa/state_tracker/st_cb_blit.c   |1 
 src/mesa/state_tracker/st_cb_readpixels.c |1 
 src/mesa/state_tracker/st_cb_texture.c|2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   11 
 65 files changed, 1430 insertions(+), 498 deletions(-)

New commits:
commit d0aa3947411fa48cf03de2ded53d8538998df653
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri May 16 23:48:44 2014 -0700

Bump version to 10.2-rc3

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 827ea06..24ee34e 100644

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 68bba1801eb49f749ea91e36905d3b99245fa03c
Author: Christian König christian.koe...@amd.com
Date:   Sun Apr 6 17:07:41 2014 +0200

st/omx/enc: separate input buffer private and task structure

Keep tasks as linked list, this way we can associate
more than one encoding task with each buffer.

Signed-off-by: Christian König christian.koe...@amd.com

diff --git a/src/gallium/state_trackers/omx/vid_enc.c 
b/src/gallium/state_trackers/omx/vid_enc.c
index 080730b..88d15a9 100644
--- a/src/gallium/state_trackers/omx/vid_enc.c
+++ b/src/gallium/state_trackers/omx/vid_enc.c
@@ -54,12 +54,18 @@
 #include entrypoint.h
 #include vid_enc.h
 
-struct input_buf_private {
+struct encode_task {
+   struct list_head list;
+
struct pipe_video_buffer *buf;
struct pipe_resource *bitstream;
void *feedback;
 };
 
+struct input_buf_private {
+   struct list_head tasks;
+};
+
 struct output_buf_private {
struct pipe_resource *bitstream;
struct pipe_transfer *transfer;
@@ -79,6 +85,8 @@ static OMX_ERRORTYPE 
vid_enc_AllocateOutBuffer(omx_base_PortType *comp, OMX_INOU
 static OMX_ERRORTYPE vid_enc_FreeOutBuffer(omx_base_PortType *port, OMX_U32 
idx, OMX_BUFFERHEADERTYPE *buf);
 static void vid_enc_BufferEncoded(OMX_COMPONENTTYPE *comp, 
OMX_BUFFERHEADERTYPE* input, OMX_BUFFERHEADERTYPE* output);
 
+static void enc_ReleaseTasks(struct list_head *head);
+
 static void vid_enc_name(char str[OMX_MAX_STRINGNAME_SIZE])
 {
snprintf(str, OMX_MAX_STRINGNAME_SIZE, OMX_VID_ENC_BASE_NAME, 
driver_descriptor.name);
@@ -243,6 +251,9 @@ static OMX_ERRORTYPE vid_enc_Constructor(OMX_COMPONENTTYPE 
*comp, OMX_STRING nam
priv-scale.xWidth = OMX_VID_ENC_SCALING_WIDTH_DEFAULT;
priv-scale.xHeight = OMX_VID_ENC_SCALING_WIDTH_DEFAULT;
 
+   LIST_INITHEAD(priv-free_tasks);
+   LIST_INITHEAD(priv-used_tasks);
+
return OMX_ErrorNone;
 }
 
@@ -251,6 +262,9 @@ static OMX_ERRORTYPE vid_enc_Destructor(OMX_COMPONENTTYPE 
*comp)
vid_enc_PrivateType* priv = comp-pComponentPrivate;
int i;
 
+   enc_ReleaseTasks(priv-free_tasks);
+   enc_ReleaseTasks(priv-used_tasks);
+
if (priv-ports) {
   for (i = 0; i  priv-sPortTypesParam[OMX_PortDomainVideo].nPorts; ++i) {
  if(priv-ports[i])
@@ -563,9 +577,10 @@ static OMX_ERRORTYPE 
vid_enc_MessageHandler(OMX_COMPONENTTYPE* comp, internalReq
 static OMX_ERRORTYPE vid_enc_FreeInBuffer(omx_base_PortType *port, OMX_U32 
idx, OMX_BUFFERHEADERTYPE *buf)
 {
struct input_buf_private *inp = buf-pInputPortPrivate;
-   pipe_resource_reference(inp-bitstream, NULL);
-   inp-buf-destroy(inp-buf);
-   FREE(inp);
+   if (inp) {
+  enc_ReleaseTasks(inp-tasks);
+  FREE(inp);
+   }
return base_port_FreeBuffer(port, idx, buf);
 }
 
@@ -607,22 +622,25 @@ static OMX_ERRORTYPE 
vid_enc_FreeOutBuffer(omx_base_PortType *port, OMX_U32 idx,
return base_port_FreeBuffer(port, idx, buf);
 }
 
-static OMX_ERRORTYPE enc_NeedInputPortPrivate(omx_base_PortType *port, 
OMX_BUFFERHEADERTYPE *buf)
+static struct encode_task *enc_NeedTask(omx_base_PortType *port)
 {
+   OMX_VIDEO_PORTDEFINITIONTYPE *def = port-sPortParam.format.video;
OMX_COMPONENTTYPE* comp = port-standCompContainer;
vid_enc_PrivateType *priv = comp-pComponentPrivate;
-   OMX_VIDEO_PORTDEFINITIONTYPE *def = port-sPortParam.format.video;
-   struct input_buf_private **inp = (struct input_buf_private 
**)buf-pInputPortPrivate;
+
struct pipe_video_buffer templat = {};
+   struct encode_task *task;
 
-   if (*inp) {
-  pipe_resource_reference((*inp)-bitstream, NULL);
-  return OMX_ErrorNone;
+   if (!LIST_IS_EMPTY(priv-free_tasks)) {
+  task = LIST_ENTRY(struct encode_task, priv-free_tasks.next, list);
+  LIST_DEL(task-list);
+  return task;
}
 
-   if (!(*inp = CALLOC(1, sizeof(struct input_buf_private {
-  return OMX_ErrorInsufficientResources;
-   }
+   /* allocate a new one */
+   task = CALLOC_STRUCT(encode_task);
+   if (!task)
+  return NULL;
 
templat.buffer_format = PIPE_FORMAT_NV12;
templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420;
@@ -630,25 +648,46 @@ static OMX_ERRORTYPE 
enc_NeedInputPortPrivate(omx_base_PortType *port, OMX_BUFFE
templat.height = def-nFrameHeight;
templat.interlaced = false;
 
-   if (!((*inp)-buf = priv-s_pipe-create_video_buffer(priv-s_pipe, 
templat))) {
-  FREE(*inp);
-  return OMX_ErrorInsufficientResources;
+   task-buf = priv-s_pipe-create_video_buffer(priv-s_pipe, templat);
+   if (!task-buf) {
+  FREE(task);
+  return NULL;
}
 
-   return OMX_ErrorNone;
+   return task;
+}
+
+static void enc_MoveTasks(struct list_head *from, struct list_head *to)
+{
+   to-prev-next = from-next;
+   from-next-prev = to-prev;
+   from-prev-next = to;
+   to-prev = from-prev;
+   LIST_INITHEAD(from);
 }
 
-static OMX_ERRORTYPE enc_LoadImage(omx_base_PortType *port, 
OMX_BUFFERHEADERTYPE *buf)
+static void enc_ReleaseTasks(struct list_head 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 src/gallium/targets/egl-static/egl_pipe.c   |   17 +
 src/gallium/targets/pipe-loader/pipe_r300.c |2 +-
 src/gallium/targets/pipe-loader/pipe_r600.c |1 +
 src/gallium/targets/pipe-loader/pipe_radeonsi.c |1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 9d36a8d4d27230dd91d4c4002a781edeec22d044
Author: José Fonseca jfons...@vmware.com
Date:   Fri Apr 11 16:46:02 2014 +0100

egl-static: Fix missing radeon_surface.h includes.

Fixes

  fatal error: radeon_surface.h: No such file or directory

when libdrm is not present, or non-Linux OSes.

Trivial.

diff --git a/src/gallium/targets/egl-static/egl_pipe.c 
b/src/gallium/targets/egl-static/egl_pipe.c
index a61cde8..1c36919 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -29,27 +29,43 @@
 #include egl_pipe.h
 
 /* for i915 */
+#if _EGL_PIPE_I915
 #include i915/drm/i915_drm_public.h
 #include i915/i915_public.h
 #include target-helpers/inline_wrapper_sw_helper.h
+#endif
 /* for ilo */
+#if _EGL_PIPE_ILO
 #include intel/intel_winsys.h
 #include ilo/ilo_public.h
+#endif
 /* for nouveau */
+#if _EGL_PIPE_NOUVEAU
 #include nouveau/drm/nouveau_drm_public.h
+#endif
 /* for r300 */
+#if _EGL_PIPE_R300
 #include radeon/drm/radeon_winsys.h
 #include radeon/drm/radeon_drm_public.h
 #include r300/r300_public.h
+#endif
 /* for r600 */
+#if _EGL_PIPE_R600
 #include r600/r600_public.h
+#endif
 /* for radeonsi */
+#if _EGL_PIPE_RADEONSI
 #include radeonsi/si_public.h
+#endif
 /* for vmwgfx */
+#if _EGL_PIPE_VMWGFX
 #include svga/drm/svga_drm_public.h
 #include svga/svga_public.h
+#endif
 /* for freedreno */
+#if _EGL_PIPE_FREEDRENO
 #include freedreno/drm/freedreno_drm_public.h
+#endif
 
 static struct pipe_screen *
 pipe_i915_create_screen(int fd)

commit 5ac3435a47c616286c5a5ee16148f829493c2127
Author: Knut Andre Tidemann knut.andre.tidem...@jotron.com
Date:   Fri Apr 11 08:59:11 2014 +0200

gallium/radeon: fix missing winsys include in pipe-loader.

The commit 3b0b44f7def0acb4f7a7aef086c0bece321418a6 introduced a build
error:

error: dereferencing pointer to incomplete type

This patch fixes this issue in all the affected files.

Reviewed-by: Tom Stellard thomas.stell...@amd.com

diff --git a/src/gallium/targets/egl-static/egl_pipe.c 
b/src/gallium/targets/egl-static/egl_pipe.c
index ce734fb..a61cde8 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -38,6 +38,7 @@
 /* for nouveau */
 #include nouveau/drm/nouveau_drm_public.h
 /* for r300 */
+#include radeon/drm/radeon_winsys.h
 #include radeon/drm/radeon_drm_public.h
 #include r300/r300_public.h
 /* for r600 */
diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c 
b/src/gallium/targets/pipe-loader/pipe_r300.c
index 388b091..6ab7e74 100644
--- a/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -1,7 +1,7 @@
-
 #include target-helpers/inline_debug_helper.h
 #include state_tracker/drm_driver.h
 #include radeon/drm/radeon_drm_public.h
+#include radeon/drm/radeon_winsys.h
 #include r300/r300_public.h
 
 static struct pipe_screen *
diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c 
b/src/gallium/targets/pipe-loader/pipe_r600.c
index 0c59087..2e6bd42 100644
--- a/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -1,6 +1,7 @@
 #include state_tracker/drm_driver.h
 #include target-helpers/inline_debug_helper.h
 #include radeon/drm/radeon_drm_public.h
+#include radeon/drm/radeon_winsys.h
 #include r600/r600_public.h
 
 static struct pipe_screen *
diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c 
b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 406ba1e..9a8feae 100644
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -1,6 +1,7 @@
 #include state_tracker/drm_driver.h
 #include target-helpers/inline_debug_helper.h
 #include radeon/drm/radeon_drm_public.h
+#include radeon/drm/radeon_winsys.h
 #include radeonsi/si_public.h
 
 static struct pipe_screen *


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wyefk-0002r9...@moszumanska.debian.org

mesa: Changes to 'upstream-experimental'

[Andreas Boll]

 VERSION |2 +-
 src/glx/dri2_query_renderer.c   |5 +
 src/mesa/drivers/dri/i965/brw_draw.c|2 +-
 src/mesa/drivers/dri/i965/brw_program.h |6 +++---
 src/mesa/drivers/dri/i965/brw_tex.c |2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 4a86465f4754a0d79ed98f2d1ce425864854418b
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Wed Mar 5 08:59:46 2014 +0200

mesa: Bump version to 10.1 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 4b9caf0..4149c39 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0-rc3
+10.1.0

commit 03d0c9fd308db2124efbe240eda24a2a67eb67d2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Mar 1 10:11:11 2014 +0100

glx/dri2: fix build failure on HURD

Patch from Debian package.

Cc: 10.0 10.1 mesa-sta...@lists.freedesktop.org
Reviewed-by: Ian Romanick ian.d.roman...@intel.com
(cherry picked from commit 6f0e2731e862d1c2d8d21927040bead5049a2d68)

diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
index b50a202..95560cb 100644
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri2_query_renderer.c
@@ -20,6 +20,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+#if defined(GLX_DIRECT_RENDERING)  !defined(GLX_USE_APPLEGL)
+
 #include glxclient.h
 #include glx_error.h
 #include xf86drm.h
@@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int 
attribute,
 
return psc-rendererQuery-queryString(psc-driScreen, dri_attribute, 
value);
 }
+
+#endif /* GLX_DIRECT_RENDERING */

commit 4c0702b05ca002e42dbf05c6c4451113df0c3799
Author: Chris Forbes chr...@ijw.co.nz
Date:   Sat Feb 22 18:09:31 2014 +1300

i965: Validate (and resolve) all the bound textures.

BRW_MAX_TEX_UNIT is the static limit on the number of textures we
support per-stage, not in total.

Core's `Unit` array is sized by MAX_COMBINED_TEXTURE_IMAGE_UNITS, which
is significantly larger, and across the various shader stages, up to
ctx-Const.MaxCombinedTextureImageUnits elements of it may be actually
used.

Fixes invisible bad behavior in piglit's max-samplers test (although
this escalated to an assertion failure on HSW with texture_view, since
non-immutable textures only have _Format set by validation.)

Signed-off-by: Chris Forbes chr...@ijw.co.nz
Cc: 9.2 10.0 10.1 mesa-sta...@lists.freedesktop.org
Cc: Kenneth Graunke kenn...@whitecape.org
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
(cherry picked from commit befbda56a246f77797bdf13fc005353441db2879)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 39da953..1e018bb 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -326,7 +326,7 @@ brw_predraw_resolve_buffers(struct brw_context *brw)
/* Resolve depth buffer of each enabled depth texture, and color buffer of
 * each fast-clear-enabled color texture.
 */
-   for (int i = 0; i  BRW_MAX_TEX_UNIT; i++) {
+   for (int i = 0; i  ctx-Const.MaxCombinedTextureImageUnits; i++) {
   if (!ctx-Texture.Unit[i]._ReallyEnabled)
 continue;
   tex_obj = intel_texture_object(ctx-Texture.Unit[i]._Current);
diff --git a/src/mesa/drivers/dri/i965/brw_tex.c 
b/src/mesa/drivers/dri/i965/brw_tex.c
index 9234e3a..b1f4de0 100644
--- a/src/mesa/drivers/dri/i965/brw_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -47,7 +47,7 @@ void brw_validate_textures( struct brw_context *brw )
struct gl_context *ctx = brw-ctx;
int i;
 
-   for (i = 0; i  BRW_MAX_TEX_UNIT; i++) {
+   for (i = 0; i  ctx-Const.MaxCombinedTextureImageUnits; i++) {
   struct gl_texture_unit *texUnit = ctx-Texture.Unit[i];
 
   if (texUnit-_ReallyEnabled) {

commit 5fbd6494517be0bc2f2ead4d6966776fcb0d426d
Author: Chris Forbes chr...@ijw.co.nz
Date:   Thu Feb 27 07:28:05 2014 +1300

i965: Widen sampler key bitfields for 32 samplers

Previously the `high` 16 samplers on Haswell+ would not get sampler
workarounds applied.

Don't bother widening YUV fields, since they're ignored and going away
soon anyway.

Signed-off-by: Chris Forbes chr...@ijw.co.nz
Cc: 10.1 mesa-sta...@lists.freedesktop.org
Cc: Kenneth Graunke kenn...@whitecape.org
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
(cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4)

diff --git a/src/mesa/drivers/dri/i965/brw_program.h 
b/src/mesa/drivers/dri/i965/brw_program.h
index 51182ea..f4dedf8 100644
--- a/src/mesa/drivers/dri/i965/brw_program.h
+++ b/src/mesa/drivers/dri/i965/brw_program.h
@@ -33,7 +33,7 @@ struct brw_sampler_prog_key_data {
 */
uint16_t swizzles[MAX_SAMPLERS];
 
-   uint16_t gl_clamp_mask[3];
+   uint32_t gl_clamp_mask[3];
 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 VERSION  |2 
 src/gallium/docs/source/screen.rst   |6 +
 src/gallium/drivers/freedreno/freedreno_screen.c |5 
 src/gallium/drivers/i915/i915_screen.c   |5 
 src/gallium/drivers/ilo/ilo_screen.c |3 
 src/gallium/drivers/llvmpipe/lp_screen.c |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp   |   39 ++-
 src/gallium/drivers/nouveau/nouveau_screen.h |5 
 src/gallium/drivers/nouveau/nouveau_vp3_video.c  |   78 ++-
 src/gallium/drivers/nouveau/nv30/nv30_screen.c   |4 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c   |3 
 src/gallium/drivers/nouveau/nv50/nv84_video.c|   68 -
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c   |3 
 src/gallium/drivers/r300/r300_screen.c   |2 
 src/gallium/drivers/r600/r600_hw_context.c   |2 
 src/gallium/drivers/r600/r600_pipe.c |   14 +-
 src/gallium/drivers/r600/r600_pipe.h |1 
 src/gallium/drivers/radeon/r600_buffer_common.c  |2 
 src/gallium/drivers/radeon/r600_pipe_common.c|2 
 src/gallium/drivers/radeon/r600_pipe_common.h|3 
 src/gallium/drivers/radeon/r600_texture.c|2 
 src/gallium/drivers/radeonsi/si_hw_context.c |4 
 src/gallium/drivers/radeonsi/si_pipe.c   |6 +
 src/gallium/drivers/softpipe/sp_screen.c |3 
 src/gallium/drivers/svga/svga_screen.c   |2 
 src/gallium/include/pipe/p_defines.h |4 
 src/gallium/targets/r600/vdpau/Makefile.am   |6 -
 src/glsl/ast_to_hir.cpp  |   13 +-
 src/glsl/builtin_functions.cpp   |   11 +-
 src/glsl/glcpp/glcpp-parse.y |   22 +++-
 src/glsl/glcpp/tests/086-reserved-macro-names.c.expected |4 
 src/glsl/linker.cpp  |9 -
 src/glsl/opt_vectorize.cpp   |   14 ++
 src/mesa/drivers/dri/i915/i830_vtbl.c|8 -
 src/mesa/drivers/dri/i915/i915_context.c |2 
 src/mesa/drivers/dri/i915/i915_texstate.c|2 
 src/mesa/drivers/dri/i915/i915_vtbl.c|8 -
 src/mesa/drivers/dri/i915/intel_fbo.c|2 
 src/mesa/drivers/dri/i915/intel_screen.c |2 
 src/mesa/drivers/dri/i965/brw_blorp.cpp  |4 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp |6 -
 src/mesa/drivers/dri/i965/brw_clear.c|2 
 src/mesa/drivers/dri/i965/brw_context.c  |   12 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c   |6 -
 src/mesa/drivers/dri/i965/brw_surface_formats.c  |   12 +-
 src/mesa/drivers/dri/i965/intel_fbo.c|2 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c|8 -
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h|4 
 src/mesa/drivers/dri/i965/intel_screen.c |4 
 src/mesa/drivers/dri/nouveau/nouveau_context.c   |7 -
 src/mesa/drivers/dri/nouveau/nouveau_context.h   |3 
 src/mesa/drivers/dri/nouveau/nouveau_driver.h|1 
 src/mesa/drivers/dri/nouveau/nv04_context.c  |5 
 src/mesa/drivers/dri/nouveau/nv04_surface.c  |8 -
 src/mesa/drivers/dri/nouveau/nv10_context.c  |   13 +-
 src/mesa/drivers/dri/nouveau/nv10_state_fb.c |4 
 src/mesa/drivers/dri/nouveau/nv10_state_raster.c |3 
 src/mesa/drivers/dri/nouveau/nv20_context.c  |5 
 src/mesa/drivers/dri/radeon/radeon_fbo.c |   10 -
 src/mesa/drivers/dri/radeon/radeon_screen.c  |4 
 src/mesa/drivers/dri/radeon/radeon_texture.c |4 
 src/mesa/main/attrib.c   |1 
 src/mesa/main/format_pack.c  |   22 ++--
 src/mesa/main/format_unpack.c|   12 +-
 src/mesa/main/formats.c  |   16 +--
 src/mesa/main/formats.h  |4 
 src/mesa/main/readpix.c  |2 
 src/mesa/main/shaderapi.c|1 
 src/mesa/main/shaderobj.c|1 
 src/mesa/main/texformat.c|6 -
 src/mesa/main/texparam.c |3 
 src/mesa/main/texstore.c |8 -
 src/mesa/state_tracker/st_extensions.c   |2 
 src/mesa/state_tracker/st_format.c   |8 -
 src/mesa/swrast/s_depth.c

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Makefile.am  |
2 
 VERSION  |
2 
 bin/.cherry-ignore   |
5 
 docs/relnotes/10.0.1.html|  
150 ++
 src/egl/drivers/dri2/platform_wayland.c  |   
21 +
 src/gallium/drivers/nouveau/nouveau_buffer.c |
3 
 src/gallium/drivers/nouveau/nouveau_fence.c  |   
11 
 src/gallium/drivers/nouveau/nouveau_vp3_video.c  |
7 
 src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c   |   
61 ++--
 src/gallium/drivers/nouveau/nv50/nv50_screen.c   |
2 
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c   |
4 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c  |
2 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c  |
9 
 src/gallium/drivers/nouveau/nv50/nv98_video.c|
6 
 src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c |   
11 
 src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c|
4 
 src/gallium/state_trackers/xa/xa_tracker.h   |
2 
 src/glsl/ast_to_hir.cpp  |
2 
 src/mesa/drivers/dri/common/megadriver_stub.c|  
126 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp |   
15 +
 src/mesa/drivers/dri/i965/brw_blorp_clear.cpp|   
29 -
 src/mesa/drivers/dri/swrast/swrast.c |
2 
 src/mesa/main/context.c  |
1 
 src/mesa/main/performance_monitor.c  |   
19 +
 src/mesa/main/performance_monitor.h  |
3 
 25 files changed, 413 insertions(+), 86 deletions(-)

New commits:
commit 6f7da0188a73f9aa75c8703d742602b975b10207
Author: Carl Worth cwo...@cworth.org
Date:   Thu Dec 12 22:16:28 2013 -0800

docs: Add md5sums for the 10.0.1 release.

diff --git a/docs/relnotes/10.0.1.html b/docs/relnotes/10.0.1.html
index bd32355..b3f900b 100644
--- a/docs/relnotes/10.0.1.html
+++ b/docs/relnotes/10.0.1.html
@@ -31,6 +31,9 @@ because compatibility contexts not supported.
 
 h2MD5 checksums/h2
 pre
+0a72ca5b36046a658bf6038326ff32ed  MesaLib-10.0.1.tar.bz2
+01bde35c912e504ba62caf1ef9f7022c  MesaLib-10.0.1.tar.gz
+59a174a11a89e6b1b8ee9c3f7e3c388c  MesaLib-10.0.1.zip
 /pre
 
 

commit 12484d2582a478b3ef126efe12f24c8e4a4d4db7
Author: Carl Worth cwo...@cworth.org
Date:   Thu Dec 12 21:34:55 2013 -0800

Update version for the 10.0.1 release.

It's so nice that this is updated in just a single place now. Thanks, Emil!

diff --git a/VERSION b/VERSION
index a13e7b9..1532420 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.0
+10.0.1

commit d573899b932435b0b37a7a33ebcbdc3c8cedd3e1
Author: Carl Worth cwo...@cworth.org
Date:   Thu Dec 12 21:33:02 2013 -0800

Makefile: Add bin/test-driver to EXTRA_FILES

I'm not sure why this change is necessary. When I've built previous tar 
files
(such as 9.2.4) with the make tarballs target, they include the
bin/test-driver file. But at my first attempt to build the tar files for the
10.0.1 release this file was not being included and the build failed.

diff --git a/Makefile.am b/Makefile.am
index 600adad..4780510 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@ EXTRA_FILES = \
bin/ltmain.sh   \
bin/missing \
bin/ylwrap  \
+bin/test-driver\
src/glsl/glsl_parser.cpp\
src/glsl/glsl_parser.h  \
src/glsl/glsl_lexer.cpp \

commit 142144e7fdb6776500bf9f85da42565d15870771
Author: Carl Worth cwo...@cworth.org
Date:   Thu Dec 12 21:16:37 2013 -0800

docs: Add release notes for 10.0.1

diff --git a/docs/relnotes/10.0.1.html b/docs/relnotes/10.0.1.html
new file mode 100644
index 000..bd32355
--- /dev/null
+++ b/docs/relnotes/10.0.1.html
@@ -0,0 +1,147 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.0.1 Release Notes / (December 12, 2013)/h1
+
+p
+Mesa 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

Rebased ref, commits from common ancestor:
commit 866ce39ca091991cc896424ea0e2d3c60b50c143
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Sat Nov 23 17:23:00 2013 -0800

mesa: Bump version to 10.0.0-rc2

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 9db9c78..85e917b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.0-rc1
+10.0.0-rc2

commit 48e4daf977a31dc62a1b46ea01d215f78c7585da
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Sat Nov 23 17:20:36 2013 -0800

Remove 068a073 from the pick list

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 29c1be2..e4aaba7 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,3 +1,8 @@
 # Since we've disabled DRI3 completely in 10.0, this commit is no longer
 # necessary.
 f0f202e6b764be803470e27cba9102f14361ae22 glx: conditionaly build dri3 and 
present loader (v3)
+
+# This patch makes bug #71870 worse, so it won't be cherry picked until that
+# issue can be resolved.  See
+# http://lists.freedesktop.org/archives/mesa-dev/2013-November/048899.html
+068a073c1d4853b5c8f33efdeb481026f42e23a5 meta: fix meta clear of layered 
framebuffers

commit 1efe2ef620ba592d25d127d64d435fbf2db0bbda
Author: Eric Anholt e...@anholt.net
Date:   Tue Nov 19 16:00:28 2013 -0800

i965: Fix streamed state dumping/annotation after the blorp-flush change.

I think I was thinking of the batch command packet cache when I pasted
this in, but this counter is only used for dumping out streamed state for
INTEL_DEBUG=batch and for putting annotations in our aub files.

Cc: 10.0 mesa-sta...@lists.freedesktop.org
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
(cherry picked from commit 5891f981452c1c5ed45b5a7e5fe54a9884ced2b6)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp 
b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index 4cbcebe..fda86f8 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -266,7 +266,6 @@ retry:
 */
brw-state.dirty.brw = ~0;
brw-state.dirty.cache = ~0;
-   brw-state_batch_count = 0;
brw-batch.need_workaround_flush = true;
brw-ib.type = -1;
intel_batchbuffer_clear_cache(brw);

commit 47ff55fa86f9bf74cf05944f4420bb6f2208790a
Author: Paul Berry stereotype...@gmail.com
Date:   Tue Nov 19 21:17:19 2013 -0800

mesa: Implement GL_FRAMEBUFFER_ATTACHMENT_LAYERED query.

From section 6.1.18 (Renderbuffer Object Queries) of the GL 3.2 spec,
under the heading If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE
is TEXTURE, then:

If pname is FRAMEBUFFER_ATTACHMENT_LAYERED, then params will
contain TRUE if an entire level of a three-dimesional texture,
cube map texture, or one-or two-dimensional array texture is
attached. Otherwise, params will contain FALSE.

Fixes piglit tests:
- spec/!OpenGL 3.2/layered-rendering/framebuffer-layered-attachments
- spec/!OpenGL 3.2/layered-rendering/framebuffertexture-defaults

Cc: 10.0 mesa-sta...@lists.freedesktop.org

Reviewed-by: Chris Forbes chr...@ijw.co.nz

v2: Don't include EXT in the error message, since this query only
makes sensen in context versions that have adopted
glGetFramebufferAttachmentParameteriv().

Reviewed-by: Ian Romanick ian.d.roman...@intel.com
(cherry picked from commit ec79c05cbfb7c68fbef7447e1744423c00f26654)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index dd13107..3650627 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2964,6 +2964,18 @@ _mesa_GetFramebufferAttachmentParameteriv(GLenum target, 
GLenum attachment,
 invalid FBO attachment structure);
   }
   return;
+   case GL_FRAMEBUFFER_ATTACHMENT_LAYERED:
+  if (!_mesa_has_geometry_shaders(ctx)) {
+ goto invalid_pname_enum;
+  } else if (att-Type == GL_TEXTURE) {
+ *params = att-Layered;
+  } else if (att-Type == GL_NONE) {
+ _mesa_error(ctx, err,
+ glGetFramebufferAttachmentParameteriv(pname));
+  } else {
+ goto invalid_pname_enum;
+  }
+  return;
default:
   goto invalid_pname_enum;
}

commit 8f4d95d41c0e84766279d7220adec959f86ed081
Author: Paul Berry stereotype...@gmail.com
Date:   Tue Nov 19 21:47:04 2013 -0800

mesa: Fix texture target validation for glFramebufferTexture()

Previously we were using the code path for validating
glFramebufferTextureLayer().  But glFramebufferTexture() allows
additional texture types.

Fixes piglit tests:
- spec/!OpenGL 3.2/layered-rendering/gl-layer-cube-map
- spec/!OpenGL 3.2/layered-rendering/framebuffertexture

Cc: 10.0 mesa-sta...@lists.freedesktop.org

Reviewed-by: Jordan Justen jordan.l.jus...@intel.com
Reviewed-by: Chris Forbes 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Android.common.mk  |2 
 SConstruct |2 
 bin/.cherry-ignore |   10 
 configure.ac   |2 
 docs/relnotes/9.2.1.html   |  206 +
 src/egl/main/Makefile.am   |2 
 src/egl/wayland/wayland-egl/wayland-egl.pc.in  |1 
 src/gallium/auxiliary/os/os_process.c  |8 
 src/gallium/drivers/nouveau/nouveau_buffer.c   |2 
 src/gallium/drivers/nv30/nv30_context.c|2 
 src/gallium/drivers/nv30/nvfx_fragprog.c   |3 
 src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp |3 
 src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp   |   12 
 src/gallium/drivers/nvc0/nvc0_context.c|1 
 src/gallium/drivers/nvc0/nvc0_context.h|2 
 src/gallium/drivers/nvc0/nvc0_screen.c |1 
 src/gallium/drivers/nvc0/nvc0_state_validate.c |6 
 src/gallium/drivers/nvc0/nvc0_surface.c|   11 
 src/gallium/drivers/r600/r600_hw_context.c |   11 
 src/gallium/include/state_tracker/st_api.h |3 
 src/gallium/state_trackers/dri/common/dri_drawable.c   |   13 
 src/gallium/state_trackers/dri/common/dri_drawable.h   |3 
 src/gallium/state_trackers/dri/drm/dri2.c  |   23 -
 src/gallium/state_trackers/dri/sw/drisw.c  |3 
 src/gallium/state_trackers/egl/common/egl_g3d_api.c|2 
 src/gallium/state_trackers/egl/common/egl_g3d_st.c |6 
 src/gallium/state_trackers/gbm/Makefile.am |1 
 src/gallium/state_trackers/glx/xlib/xm_st.c|3 
 src/gallium/state_trackers/osmesa/osmesa.c |3 
 src/gallium/state_trackers/vega/vg_manager.c   |3 
 src/gallium/state_trackers/wgl/stw_st.c|3 
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c  |   30 +
 src/glsl/ast_to_hir.cpp|   29 +
 src/glsl/glsl_parser.yy|   10 
 src/glsl/link_functions.cpp|   32 ++
 src/glx/dri2_glx.c |   10 
 src/glx/dri_common.c   |   14 
 src/glx/drisw_glx.c|   10 
 src/mesa/drivers/common/meta.c |5 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp   |2 
 src/mesa/drivers/dri/i965/brw_blorp_clear.cpp  |2 
 src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp|   18 -
 src/mesa/drivers/dri/i965/brw_fs.cpp   |6 
 src/mesa/drivers/dri/i965/brw_fs_fp.cpp|8 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   |8 
 src/mesa/drivers/dri/i965/brw_vec4.cpp |8 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |6 
 src/mesa/drivers/dri/i965/brw_vs.c |2 
 src/mesa/drivers/dri/i965/intel_pixel_bitmap.c |3 
 src/mesa/main/extensions.c |1 
 src/mesa/main/get.c|1 
 src/mesa/main/get_hash_params.py   |8 
 src/mesa/main/glheader.h   |6 
 src/mesa/main/syncobj.c|2 
 src/mesa/main/texformat.c  |   18 -
 src/mesa/state_tracker/st_cb_fbo.c |2 
 src/mesa/state_tracker/st_manager.c|2 
 57 files changed, 473 insertions(+), 123 deletions(-)

New commits:
commit fac3094fef8c58bc73173fafa524dae68d8cf5b2
Author: Brian Paul bri...@vmware.com
Date:   Sat Oct 5 14:18:48 2013 -0600

docs: add missing pre tag

diff --git a/docs/relnotes/9.2.1.html b/docs/relnotes/9.2.1.html
index 6342fb4..f9909dd 100644
--- a/docs/relnotes/9.2.1.html
+++ b/docs/relnotes/9.2.1.html
@@ -30,6 +30,7 @@ because GL_ARB_compatibility is not supported.
 
 
 h2MD5 checksums/h2
+pre
 e6cdfa84dfddd86e3d36ec7ff4b6478a  MesaLib-9.2.1.tar.gz
 dd4c82667d9c19c28a553b12eba3f8a0  MesaLib-9.2.1.tar.bz2
 d9af0f5607f7d275793d293057ca9ac6  MesaLib-9.2.1.zip

commit 8c4c3d01ee4555d59aed6ab253c4aab4e265ceb0
Author: Carl Worth cwo...@cworth.org
Date:   Fri Oct 4 20:42:21 2013 -0700

docs: Add md5sums for 9.2.1 release

Which we could only do after creating the tar files, of course.

diff --git a/docs/relnotes/9.2.1.html b/docs/relnotes/9.2.1.html
index db08517..6342fb4 100644
--- a/docs/relnotes/9.2.1.html
+++ b/docs/relnotes/9.2.1.html
@@ -30,8 +30,9 @@ because GL_ARB_compatibility is not supported.
 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Android.common.mk  |2 
 SConstruct |2 
 configure.ac   |2 
 docs/relnotes/9.2.html |  154 +++--
 4 files changed, 153 insertions(+), 7 deletions(-)

New commits:
commit 2377205bcb3bb0b5db48772224f5f80f2cf9abf7
Author: Brian Paul bri...@vmware.com
Date:   Tue Aug 27 18:57:35 2013 -0600

docs: minor fixes for 9.2 release notes

Fix incorrect /li tag, fix language.

diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html
index 1bbb699..9e1c015 100644
--- a/docs/relnotes/9.2.html
+++ b/docs/relnotes/9.2.html
@@ -51,8 +51,8 @@ Note: some of the new features are only available with 
certain drivers.
 liGL_ARB_texture_multisample/li
 liGL_ARB_texture_storage_multisample/li
 liGL_ARB_texture_query_lod/li
-liEnable GL_ARB_texture_storage on radeon, r200, and nouveau/li
-liGL_EXT_discard_framebuffer in all OpenGL ES (all versions) driversli
+liGL_ARB_texture_storage on radeon, r200, and nouveau/li
+liGL_EXT_discard_framebuffer in all OpenGL ES (all versions) drivers/li
 liGL_EXT_framebuffer_multisample_blit_scaled on i965/li
 liAdded new freedreno gallium driver/li
 liOSMesa interface for gallium llvmpipe/softpipe drivers/li

commit 8218eebc80ff597a4ff27190dceca8c88c3adce3
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Tue Aug 27 16:33:48 2013 -0700

docs: Add 9.2 release md5sums

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html
index bf2fd66..1bbb699 100644
--- a/docs/relnotes/9.2.html
+++ b/docs/relnotes/9.2.html
@@ -33,7 +33,9 @@ because GL_ARB_compatibility is not supported.
 
 h2MD5 checksums/h2
 pre
-tbd
+4f93c6475ec656fc1f7b93aeffc9b6c4  MesaLib-9.2.0.tar.gz
+4185b6aae890bc62a964f4b24cc1aca8  MesaLib-9.2.0.tar.bz2
+3bc5339bc98b9c3ffd14e3a8eca4  MesaLib-9.2.0.zip
 /pre
 
 

commit 46273ba25641e652f83bfa08b3d2bd55a57e55e8
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Tue Aug 27 15:48:55 2013 -0700

mesa: Bump version to 9.2 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/Android.common.mk b/Android.common.mk
index 905d1a9..e6b3b44 100644
--- a/Android.common.mk
+++ b/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-rc2\ \
+   -DPACKAGE_VERSION=\9.2.0\ \

-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/SConstruct b/SConstruct
index 622ff36..b40a468 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ if env['gles']:
 # Environment setup
 
 env.Append(CPPDEFINES = [
-('PACKAGE_VERSION', '\\9.2.0-rc2\\'),
+('PACKAGE_VERSION', '\\9.2.0\\'),
 ('PACKAGE_BUGREPORT', 
'\\https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\;'),
 ])
 
diff --git a/configure.ac b/configure.ac
index 11a711f..10d5ad8 100644
--- a/configure.ac
+++ b/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-rc2],
+AC_INIT([Mesa], [9.2.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])

commit d3f99fb5322fd5695336057e1eab0d8e385cce82
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Tue Aug 27 15:47:48 2013 -0700

docs: Update release notes for 9.2

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html
index 76c7600..bf2fd66 100644
--- a/docs/relnotes/9.2.html
+++ b/docs/relnotes/9.2.html
@@ -14,7 +14,7 @@
 iframe src=../contents.html/iframe
 div class=content
 
-h1Mesa 9.2 Release Notes / (date TBD)/h1
+h1Mesa 9.2 Release Notes / (August 27, 2013)/h1
 
 p
 Mesa 9.2 is a new development release.
@@ -44,11 +44,14 @@ Note: some of the new features are only available with 
certain drivers.
 /p
 
 ul
+liGL_ARB_shading_language_420pack in all drivers that support GLSL 1.30./li
 liGL_ARB_texture_buffer_range/li
 liGL_ARB_texture_multisample/li
 liGL_ARB_texture_storage_multisample/li
 liGL_ARB_texture_query_lod/li
 liEnable GL_ARB_texture_storage on radeon, r200, and nouveau/li
+liGL_EXT_discard_framebuffer in all OpenGL ES (all versions) driversli
+liGL_EXT_framebuffer_multisample_blit_scaled on i965/li
 liAdded new freedreno gallium driver/li
 liOSMesa interface for gallium llvmpipe/softpipe drivers/li
 liGallium Heads-Up Display (HUD) feature for performance monitoring/li
@@ -58,8 +61,149 @@ Note: some of the new features are only available with 
certain drivers.
 
 h2Bug fixes/h2
 
-pTBD -- This list is likely incomplete./p
+pAttempts have been made to bnot/b include bugs fixed in previous 9.1
+releases or bugs that were regressions 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Android.common.mk   |2 
 SConstruct  |2 
 bin/get-pick-list.sh|2 
 configure.ac|   38 ++-
 docs/index.html |6 
 docs/relnotes.html  |1 
 docs/relnotes/9.1.5.html|4 
 docs/relnotes/9.1.6.html|  168 
 src/gallium/auxiliary/Makefile.am   |4 
 src/gallium/drivers/nv30/nv30_screen.c  |1 
 src/gallium/drivers/radeonsi/radeonsi_shader.c  |   23 ++
 src/gallium/drivers/radeonsi/si_state_draw.c|3 
 src/gallium/state_trackers/Makefile.am  |2 
 src/gallium/state_trackers/clover/core/resource.cpp |2 
 src/gallium/state_trackers/osmesa/osmesa.c  |5 
 src/gallium/targets/Makefile.am |2 
 src/gallium/targets/osmesa/Makefile.am  |   23 --
 src/gallium/targets/osmesa/osmesa.pc.in |   12 +
 src/glsl/ast.h  |   10 
 src/glsl/ast_to_hir.cpp |  124 ---
 src/glsl/ast_type.cpp   |3 
 src/glsl/glsl_parser.yy |1 
 src/glsl/glsl_parser_extras.cpp |1 
 src/mapi/glapi/gen/Makefile.am  |8 
 src/mesa/drivers/dri/i965/brw_fs.cpp|   14 +
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp   |3 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp|4 
 src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp |   10 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp  |4 
 src/mesa/drivers/dri/i965/intel_context.c   |   10 
 src/mesa/drivers/osmesa/Makefile.am |1 
 src/mesa/main/context.c |2 
 src/mesa/main/errors.c  |   15 -
 src/mesa/main/queryobj.c|1 
 src/mesa/main/texcompress.c |   22 --
 35 files changed, 417 insertions(+), 116 deletions(-)

New commits:
commit 6fb2032c351e101da2e4a80dcee7b2565d396671
Author: Matt Turner matts...@gmail.com
Date:   Mon Aug 26 14:14:03 2013 -0700

glsl: Disallow uniform block layout qualifiers on non-uniform block vars.

Cc: 9.2 mesa-sta...@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68460
Reviewed-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index d474683..6164f76 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1847,9 +1847,18 @@ is_varying_var(ir_variable *var, 
_mesa_glsl_parser_targets target)
 static void
 validate_matrix_layout_for_type(struct _mesa_glsl_parse_state *state,
YYLTYPE *loc,
-   const glsl_type *type)
+const glsl_type *type,
+ir_variable *var)
 {
-   if (!type-is_matrix()) {
+   if (var  !var-is_in_uniform_block()) {
+  /* Layout qualifiers may only apply to interface blocks and fields in
+   * them.
+   */
+  _mesa_glsl_error(loc, state,
+   uniform block layout qualifiers row_major and 
+   column_major may not be applied to variables 
+   outside of uniform blocks);
+   } else if (!type-is_matrix()) {
   /* The OpenGL ES 3.0 conformance tests did not originally allow
* matrix layout qualifiers on non-matrices.  However, the OpenGL
* 4.4 and OpenGL ES 3.0 (revision TBD) specifications were
@@ -2287,7 +2296,7 @@ apply_type_qualifier_to_variable(const struct 
ast_type_qualifier *qual,
}
 
if (qual-flags.q.row_major || qual-flags.q.column_major) {
-  validate_matrix_layout_for_type(state, loc, var-type);
+  validate_matrix_layout_for_type(state, loc, var-type, var);
}
 }
 
@@ -4350,7 +4359,7 @@ ast_process_structure_or_interface_block(exec_list 
*instructions,
 row_major and column_major can only be 
 applied to uniform interface blocks);
 } else
-   validate_matrix_layout_for_type(state, loc, field_type);
+   validate_matrix_layout_for_type(state, loc, field_type, NULL);
  }
 
  if (qual-flags.q.uniform  qual-has_interpolation()) {

commit c0abf6499f416ff65005cbe5393c4601de5b6633
Author: Kristian Lehmann em...@zero-io.net
Date:   Mon Aug 26 21:19:50 2013 +0200

Fixed and/or order mistake, resulting in compiling llvmpipe without llvm 
installed

Cc: 9.2 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Android.common.mk|2 
 SConstruct   |2 
 configure.ac |2 
 src/gallium/auxiliary/draw/draw_context.c|5 
 src/gallium/drivers/llvmpipe/lp_bld_depth.c  |   27 +--
 src/gallium/drivers/nv30/nv30_format.c   |6 
 src/gallium/drivers/nv50/nv84_video.c|6 
 src/gallium/drivers/radeonsi/radeonsi_shader.c   |  135 ---
 src/gallium/drivers/radeonsi/radeonsi_shader.h   |1 
 src/gallium/drivers/radeonsi/si_state_draw.c |6 
 src/glsl/ast_to_hir.cpp  |   74 ++--
 src/glsl/builtins/profiles/100es.frag|2 
 src/glsl/builtins/profiles/300es.frag|1 
 src/glsl/builtins/profiles/OES_EGL_image_external.glsl   |1 
 src/glsl/builtins/profiles/OES_standard_derivatives.frag |1 
 src/glsl/builtins/profiles/OES_texture_3D.frag   |1 
 src/glsl/glsl_parser_extras.cpp  |1 
 src/glsl/glsl_parser_extras.h|7 
 src/glsl/ir_optimization.h   |2 
 src/glsl/link_uniform_blocks.cpp |   17 +
 src/glsl/link_uniforms.cpp   |   56 +-
 src/glsl/linker.cpp  |6 
 src/glsl/linker.h|   15 +
 src/glsl/opt_dead_builtin_varyings.cpp   |   27 ++-
 src/mesa/drivers/common/meta.c   |   43 +++-
 src/mesa/drivers/dri/i915/intel_tex_image.c  |1 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c|9 +
 src/mesa/drivers/dri/i965/intel_tex_image.c  |1 
 src/mesa/program/program_parse.y |4 
 src/mesa/vbo/vbo_exec_array.c|   82 ++---
 30 files changed, 383 insertions(+), 160 deletions(-)

New commits:
commit 796b4a7b40889747562d8d693f25f67aff35c189
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Mon Aug 19 16:49:02 2013 -0700

mesa: Bump version to 9.2-rc1

diff --git a/Android.common.mk b/Android.common.mk
index c6ee4e1..b5ed472 100644
--- a/Android.common.mk
+++ b/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.2.0-rc1\ \

-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/SConstruct b/SConstruct
index 834e9d5..a75bcb9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ if env['gles']:
 # Environment setup
 
 env.Append(CPPDEFINES = [
-('PACKAGE_VERSION', '\\9.2.0-devel\\'),
+('PACKAGE_VERSION', '\\9.2.0-rc1\\'),
 ('PACKAGE_BUGREPORT', 
'\\https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\;'),
 ])
 
diff --git a/configure.ac b/configure.ac
index 35f6797..bd5c71d 100644
--- a/configure.ac
+++ b/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.2.0-rc1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])

commit d3004acdd15d0fe3a0ac21f9bd7070d22b13a680
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Sat Aug 17 00:27:43 2013 -0700

glsl: Use alignment of container record for its first field

The first field of a record in a UBO has the aligment of the record
itself.

Fixes piglit vs-struct-pad, fs-struct-pad, and (with the patch posted to
the piglit list that extends the test) layout-std140.

NOTE: The bit of strangeness with the version of visit_field without the
record_type poitner is because that method is pure virtual in the base
class.  The original implementation of the class did this to ensure
derived classes remembered to implement that flavor.  Now they can
implement either flavor but not both.  I don't know a C++ way to enforce
that.

Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reviewed-by: Paul Berry stereotype...@gmail.com
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68195
Cc: 9.2 9.1 mesa-sta...@lists.freedesktop.org
(cherry picked from commit 574e4843e9e26aa6affa31c80ac42f745b68268b)

diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
index c72d1d8..e475147 100644
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/glsl/link_uniform_blocks.cpp
@@ -59,6 +59,15 @@ private:
virtual void visit_field(const glsl_type *type, 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

Rebased ref, commits from common ancestor:
commit 33b581f6f6d4e5aab65983f24d06b1dd56882f37
Author: Jon Severinsson j...@severinsson.net
Date:   Sun Aug 11 19:37:01 2013 +0200

radeon/llvm: Add missing %s format string to fprintf.

This fixes a compilation warning with -Wformat-security.

CC: 9.2 mesa-sta...@lists.freedesktop.org

Reviewed-by: Tom Stellard thomas.stell...@amd.com
(cherry picked from commit 9298f537a72dc2323898e91c40894f55e3c4754a)

diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c 
b/src/gallium/drivers/radeon/radeon_llvm_emit.c
index 1a4d4fd..2dd7bf7 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.c
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c
@@ -124,7 +124,7 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct 
radeon_llvm_binary *binary,
r = LLVMTargetMachineEmitToMemoryBuffer(tm, M, LLVMObjectFile, err,
 out_buffer);
if (r) {
-   fprintf(stderr, err);
+   fprintf(stderr, %s, err);
FREE(err);
return 1;
}

commit c088c24588365524f0106936f3d521c9866d9f95
Author: Tapani Pälli tapani.pa...@intel.com
Date:   Fri Jul 26 10:21:56 2013 +0300

glsl: disable ARB_texture_cube_map_array_enable keywords for glsl es

Patch fixes a crash with Webgl 'shader-with-non-reserved-words'
conformance test by ignoring desktop extension keywords on GLSL ES.

v2: fix reserved and allowed desktop glsl versions (Chris)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64087
Signed-off-by: Tapani Pälli tapani.pa...@intel.com
Reviewed-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
(cherry picked from commit 8c211dd742669bc03b44186e41e5aa40081d6bcc)

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 6c5d003..3340c23 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -324,30 +324,11 @@ sampler2DMSArray   KEYWORD_WITH_ALT(150, 300, 150, 0, 
yyextra-ARB_texture_multi
 isampler2DMSArray  KEYWORD_WITH_ALT(150, 300, 150, 0, 
yyextra-ARB_texture_multisample_enable, ISAMPLER2DMSARRAY);
 usampler2DMSArray  KEYWORD_WITH_ALT(150, 300, 150, 0, 
yyextra-ARB_texture_multisample_enable, USAMPLER2DMSARRAY);
 
-samplerCubeArray   {
- if (yyextra-ARB_texture_cube_map_array_enable)
-return SAMPLERCUBEARRAY;
- else
-return IDENTIFIER;
-   }
-isamplerCubeArray  {
- if (yyextra-ARB_texture_cube_map_array_enable)
-return ISAMPLERCUBEARRAY;
- else
-return IDENTIFIER;
-   }
-usamplerCubeArray  {
- if (yyextra-ARB_texture_cube_map_array_enable)
-return USAMPLERCUBEARRAY;
- else
-return IDENTIFIER;
-   }
-samplerCubeArrayShadow {
- if (yyextra-ARB_texture_cube_map_array_enable)
-return SAMPLERCUBEARRAYSHADOW;
- else
-return IDENTIFIER;
-   }
+   /* keywords available with ARB_texture_cube_map_array_enable extension on 
desktop GLSL */
+samplerCubeArray   KEYWORD_WITH_ALT(400, 0, 400, 0, 
yyextra-ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAY);
+isamplerCubeArray KEYWORD_WITH_ALT(400, 0, 400, 0, 
yyextra-ARB_texture_cube_map_array_enable, ISAMPLERCUBEARRAY);
+usamplerCubeArray KEYWORD_WITH_ALT(400, 0, 400, 0, 
yyextra-ARB_texture_cube_map_array_enable, USAMPLERCUBEARRAY);
+samplerCubeArrayShadow   KEYWORD_WITH_ALT(400, 0, 400, 0, 
yyextra-ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAYSHADOW);
 
 samplerExternalOES {
  if (yyextra-OES_EGL_image_external_enable)

commit 7d6dcb61cdaba3a158b2b9635bf029a17cc8543d
Author: Armin K kre...@email.com
Date:   Tue Aug 13 15:38:56 2013 -0700

gbm: Link to libwayland-drm if Wayland EGL platform is enabled

We were relying on libEGL to pull in libwayland-client symbols, but with
commit 2c2e64edaba0f6aeb181ca5b51eb8dea8e9b39f9 cleaned up the
symbol leak.

CC: 9.2 mesa-sta...@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67962
Tested-by: Bryce Harrington b.harring...@samsung.com
Reviewed-by: Chad Versace chad.vers...@linux.intel.com
(cherry picked from commit f423eba46e080b975a2b8366b490d99dee4729ad)

diff --git a/src/Makefile.am b/src/Makefile.am
index b3dc44d..76280a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,10 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
+if HAVE_EGL_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland
+endif
+
 if HAVE_GBM
 SUBDIRS += gbm
 endif
diff --git 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Makefile.am   |2 
 bin/.cherry-ignore|6 
 bin/bugzilla_mesa.sh  |   52 +
 bin/get-pick-list.sh  |6 
 bin/shortlog_mesa.sh  |6 
 configure.ac  |2 
 docs/relnotes-9.1.2.html  |4 
 docs/relnotes-9.1.3.html  |  228 +
 include/pci_ids/r600_pci_ids.h|2 
 include/pci_ids/radeonsi_pci_ids.h|3 
 src/egl/drivers/dri2/egl_dri2.c   |6 
 src/egl/drivers/dri2/platform_x11.c   |   21 
 src/gallium/auxiliary/gallivm/lp_bld_sample.c |2 
 src/gallium/auxiliary/util/u_blitter.c|  113 ++
 src/gallium/auxiliary/util/u_blitter.h|   18 
 src/gallium/drivers/nvc0/nvc0_video.c |4 
 src/gallium/drivers/r600/r600_blit.c  |   31 
 src/gallium/drivers/r600/r600_pipe.c  |   39 
 src/gallium/drivers/r600/r600_pipe.h  |7 
 src/gallium/drivers/r600/r600_shader.c|   51 -
 src/gallium/drivers/r600/r600_texture.c   |   10 
 src/gallium/drivers/radeonsi/r600_blit.c  |   18 
 src/gallium/include/state_tracker/st_api.h|1 
 src/gallium/state_trackers/dri/common/dri_context.c   |2 
 src/gallium/state_trackers/dri/common/dri_screen.c|3 
 src/gallium/winsys/sw/xlib/xlib_sw_winsys.c   |6 
 src/glsl/ast_to_hir.cpp   |   15 
 src/glsl/ir_constant_expression.cpp   |2 
 src/glsl/link_varyings.cpp|   36 
 src/glsl/lower_jumps.cpp  |4 
 src/glsl/lower_packed_varyings.cpp|8 
 src/glsl/ralloc.c |2 
 src/glx/glxcmds.c |4 
 src/mesa/drivers/dri/i965/brw_context.h   |   26 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |   49 -
 src/mesa/drivers/dri/i965/brw_fs.h|3 
 src/mesa/drivers/dri/i965/brw_fs_cse.cpp  |   43 -
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp |1 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |   14 
 src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp |   27 
 src/mesa/drivers/dri/i965/brw_misc_state.c|  195 ++--
 src/mesa/drivers/dri/i965/brw_shader.cpp  |3 
 src/mesa/drivers/dri/i965/brw_state.h |5 
 src/mesa/drivers/dri/i965/brw_vec4_emit.cpp   |4 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|   10 
 src/mesa/drivers/dri/i965/brw_vs_surface_state.c  |7 
 src/mesa/drivers/dri/i965/brw_vtbl.c  |2 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   18 
 src/mesa/drivers/dri/i965/gen6_blorp.cpp  |   35 
 src/mesa/drivers/dri/i965/gen6_sol.c  |   11 
 src/mesa/drivers/dri/i965/gen7_blorp.cpp  |  103 ++
 src/mesa/drivers/dri/i965/gen7_misc_state.c   |   93 --
 src/mesa/drivers/dri/i965/gen7_sol_state.c|   18 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |8 
 src/mesa/drivers/dri/intel/intel_context.h|   18 
 src/mesa/drivers/dri/intel/intel_fbo.c|4 
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c|6 
 src/mesa/drivers/dri/intel/intel_tex.c|4 
 src/mesa/main/context.c   |2 
 src/mesa/main/extensions.c|4 
 src/mesa/main/format_unpack.c |  597 +-
 src/mesa/main/get.c   |   19 
 src/mesa/main/get_hash_params.py  |   14 
 src/mesa/main/hash.c  |4 
 src/mesa/main/imports.h   |6 
 src/mesa/main/mtypes.h|1 
 src/mesa/main/shaderapi.c |6 
 src/mesa/main/stencil.c   |5 
 src/mesa/main/version.h   |4 
 src/mesa/program/prog_cache.c |   11 
 src/mesa/state_tracker/st_atom_constbuf.c |1 
 src/mesa/state_tracker/st_atom_depth.c|2 
 src/mesa/state_tracker/st_extensions.c|3 
 src/mesa/swrast/s_blit.c  |   49 -
 74 

mesa: Changes to 'upstream-experimental'

[Robert Hooker]

 Makefile.am |2 
 bin/.cherry-ignore  |6 
 configure.ac|   19 -
 docs/relnotes-9.1.1.html|3 
 docs/relnotes-9.1.2.html|  235 
 include/c99_compat.h|  147 
 src/egl/main/eglcompiler.h  |   44 ---
 src/gallium/auxiliary/Makefile.am   |7 
 src/gallium/auxiliary/gallivm/lp_bld_tgsi.h |1 
 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c |   20 +
 src/gallium/auxiliary/tgsi/tgsi_text.c  |2 
 src/gallium/drivers/Makefile.am |1 
 src/gallium/drivers/llvmpipe/lp_scene.c |   22 +
 src/gallium/drivers/llvmpipe/lp_scene.h |   10 
 src/gallium/drivers/nv50/nv50_blit.h|   40 +++
 src/gallium/drivers/nv50/nv50_state_validate.c  |   12 -
 src/gallium/drivers/nv50/nv50_surface.c |   77 --
 src/gallium/drivers/nvc0/nvc0_3d.xml.h  |2 
 src/gallium/drivers/nvc0/nvc0_surface.c |  123 +++---
 src/gallium/drivers/r300/compiler/radeon_optimize.c |4 
 src/gallium/drivers/r600/r600_pipe.c|2 
 src/gallium/drivers/r600/r600_query.c   |5 
 src/gallium/drivers/radeon/Makefile.am  |4 
 src/gallium/drivers/radeonsi/si_state_draw.c|5 
 src/gallium/drivers/rbug/Makefile.am|1 
 src/gallium/drivers/svga/Makefile.am|2 
 src/gallium/drivers/trace/Makefile.am   |3 
 src/gallium/include/pipe/p_compiler.h   |   74 --
 src/gallium/state_trackers/egl/Makefile.am  |2 
 src/gallium/state_trackers/xa/Makefile.am   |4 
 src/gallium/winsys/svga/drm/Makefile.am |2 
 src/glsl/glsl_types.cpp |2 
 src/glsl/ir_validate.cpp|6 
 src/glsl/linker.cpp |2 
 src/glx/Makefile.am |1 
 src/mapi/glapi/gen/gl_x86-64_asm.py |   13 -
 src/mapi/glapi/gen/gl_x86_asm.py|   13 -
 src/mapi/mapi/entry_x86-64_tls.h|   13 -
 src/mapi/mapi/entry_x86_tls.h   |   13 -
 src/mapi/mapi/u_compiler.h  |   26 --
 src/mesa/drivers/dri/i965/brw_clear.c   |6 
 src/mesa/drivers/dri/i965/brw_defines.h |   39 +++
 src/mesa/drivers/dri/i965/brw_eu_emit.c |   15 -
 src/mesa/drivers/dri/i965/brw_fs.cpp|   26 +-
 src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp |   54 ++--
 src/mesa/drivers/dri/i965/brw_state.h   |2 
 src/mesa/drivers/dri/i965/brw_vs.c  |8 
 src/mesa/drivers/dri/i965/brw_vs_surface_state.c|5 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c|8 
 src/mesa/drivers/dri/i965/gen6_cc.c |2 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c   |   40 +++
 src/mesa/drivers/dri/intel/intel_screen.c   |2 
 src/mesa/drivers/dri/nouveau/nouveau_driver.c   |3 
 src/mesa/drivers/dri/nouveau/nv10_context.c |2 
 src/mesa/drivers/osmesa/Makefile.am |1 
 src/mesa/main/compiler.h|   59 -
 src/mesa/main/fbobject.c|4 
 src/mesa/main/get.c |   12 -
 src/mesa/main/get_hash_params.py|2 
 src/mesa/main/mtypes.h  |1 
 src/mesa/main/samplerobj.c  |   12 -
 src/mesa/main/samplerobj.h  |2 
 src/mesa/main/tests/hash_table/Makefile.am  |1 
 src/mesa/main/texgetimage.c |1 
 src/mesa/main/teximage.c|   23 +
 src/mesa/main/texparam.c|   12 +
 src/mesa/main/texstorage.c  |1 
 src/mesa/main/version.h |4 
 src/mesa/vbo/vbo_save_draw.c|2 
 69 files changed, 917 insertions(+), 402 deletions(-)

New commits:
commit 8c2981b8e093c6a58723a1bde0ed8c83e1375d45
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Tue Apr 30 15:18:53 2013 -0700

docs: 9.1.2 release notes

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/relnotes-9.1.2.html b/docs/relnotes-9.1.2.html
new file mode 100644
index 000..98626a9
--- /dev/null
+++ b/docs/relnotes-9.1.2.html
@@ -0,0 +1,235 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Makefile.am  |
2 
 configure.ac |
3 
 docs/relnotes-9.1.html   |
3 
 src/gallium/drivers/llvmpipe/Makefile.am |   
17 +
 src/gallium/drivers/r300/Makefile.am |
1 
 src/gallium/drivers/r300/compiler/r3xx_vertprog.c|
2 
 src/gallium/drivers/r300/compiler/radeon_compiler_util.h |   
27 ++
 src/gallium/drivers/r300/compiler/radeon_emulate_loops.h |   
27 ++
 src/gallium/drivers/r300/compiler/radeon_inline_literals.c   |   
24 ++
 src/gallium/drivers/r300/compiler/radeon_optimize.c  |
2 
 src/gallium/drivers/r300/compiler/radeon_pair_dead_sources.c |   
26 ++
 src/gallium/drivers/r300/compiler/radeon_rename_regs.h   |   
26 ++
 src/gallium/drivers/r300/compiler/radeon_swizzle.h   |
2 
 src/gallium/drivers/r300/compiler/radeon_vert_fc.c   |   
24 ++
 src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.c|   
39 +++
 src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.h|   
29 ++
 src/gallium/drivers/r300/compiler/tests/radeon_compiler_optimize_tests.c |   
75 ++
 src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c |   
31 ++
 src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c|   
94 +++-
 src/gallium/drivers/r300/compiler/tests/rc_test_helpers.h|   
42 +++
 src/gallium/drivers/r300/compiler/tests/unit_test.c  |   
34 ++
 src/gallium/drivers/r300/compiler/tests/unit_test.h  |   
28 ++
 src/gallium/drivers/r600/evergreen_state.c   |
5 
 src/gallium/drivers/r600/r600.h  |
1 
 src/gallium/drivers/r600/r600_hw_context.c   |   
11 
 src/gallium/drivers/r600/r600_state_common.c |
6 
 src/gallium/drivers/radeonsi/r600_blit.c |   
15 -
 src/gallium/drivers/radeonsi/r600_texture.c  |   
59 ++---
 src/gallium/drivers/radeonsi/radeonsi_pipe.h |   
16 +
 src/gallium/drivers/radeonsi/radeonsi_shader.c   |
8 
 src/gallium/drivers/radeonsi/si_state.c  |  
117 ++
 src/gallium/targets/xa-vmwgfx/Makefile.am|
2 
 src/glx/dri2_glx.c   |   
15 +
 src/mapi/glapi/gen/glX_proto_send.py |
4 
 src/mesa/drivers/dri/intel/intel_screen.c|
2 
 src/mesa/main/eval.c |   
11 
 src/mesa/main/eval.h |
4 
 src/mesa/main/version.h  |
2 
 src/mesa/main/vtxfmt.c   |   
10 
 src/mesa/state_tracker/st_cb_texture.c   |
4 
 40 files changed, 727 insertions(+), 123 deletions(-)

New commits:
commit 17493b8848d4ba9e4b2315f56f511740cfb351b6
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Feb 22 13:52:16 2013 -0800

docs: Update relelase notes

diff --git a/docs/relnotes-9.1.html b/docs/relnotes-9.1.html
index 75e82ba..24ba9f9 100644
--- a/docs/relnotes-9.1.html
+++ b/docs/relnotes-9.1.html
@@ -14,7 +14,7 @@
 iframe src=contents.html/iframe
 div class=content
 
-h1Mesa 9.1 Release Notes / date TBD/h1
+h1Mesa 9.1 Release Notes / date February 22, 2013/h1
 
 p
 Mesa 9.1 is a new development release.
@@ -56,6 +56,7 @@ Note: some of the new features are only available with 
certain drivers.
 liGL_OES_depth_texture_cube_map/li
 liOpenGL 3.1 core profile support on Radeon HD2000 up to HD6000 series /li
 liMultisample anti-aliasing support on Radeon X1000 series/li
+liOpenGL ES 3.0 support on Intel HD Graphics 2000, 2500, 3000, and 4000/li
 /ul
 
 

commit 3ea699ff3c6d946a5c58b01f301e01ada19408ef
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Feb 22 13:50:09 2013 -0800

mesa: Bump version to 9.1 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/Makefile.am b/Makefile.am
index be42097..a1f7bce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ check-local:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.1-rc2
+PACKAGE_VERSION=9.1
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index a99381a..a98aadf 100644
--- a/src/mesa/main/version.h
+++ 

mesa: Changes to 'upstream-experimental'

[Sven Joachim]

 Makefile.am|2 
 bin/.cherry-ignore |3 
 configure.ac   |   38 +-
 docs/relnotes-9.1.html |1 
 src/egl/drivers/dri2/platform_wayland.c|8 
 src/gallium/auxiliary/util/u_surface.c |4 
 src/gallium/drivers/r600/evergreen_state.c |   31 +
 src/gallium/drivers/r600/r600_asm.c|8 
 src/gallium/drivers/r600/r600_llvm.c   |2 
 src/gallium/drivers/r600/r600_state.c  |   41 +-
 src/gallium/drivers/r600/r600_state_common.c   |5 
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |2 
 src/gallium/drivers/radeonsi/radeonsi_shader.c |   67 +++
 src/gallium/drivers/radeonsi/si_state.c|   67 ++-
 src/gallium/drivers/softpipe/sp_tex_sample.c   |1 
 src/gallium/drivers/svga/svga_state_rss.c  |   11 
 src/gallium/state_trackers/egl/Makefile.am |1 
 src/gallium/state_trackers/xorg/xorg_exa.c |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |7 
 src/glsl/ast_to_hir.cpp|   58 ++-
 src/glsl/builtin_compiler/Makefile.am  |   43 +-
 src/glsl/glsl_types.cpp|   18 +
 src/glsl/glsl_types.h  |6 
 src/glsl/link_uniform_blocks.cpp   |6 
 src/glsl/link_uniforms.cpp |   24 -
 src/glsl/link_varyings.cpp |  227 -
 src/glsl/link_varyings.h   |   59 +++
 src/glsl/linker.cpp|   59 +++
 src/glsl/linker.h  |   33 -
 src/glsl/program.h |4 
 src/glx/dri2_glx.c |8 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp   |  114 +-
 src/mesa/drivers/dri/i965/brw_context.c|   19 +
 src/mesa/drivers/dri/i965/brw_context.h|8 
 src/mesa/drivers/dri/i965/brw_fs.cpp   |   35 +-
 src/mesa/drivers/dri/i965/brw_fs.h |1 
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp  |4 
 src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp |9 
 src/mesa/drivers/dri/i965/brw_primitive_restart.c  |4 
 src/mesa/drivers/dri/i965/brw_state.h  |5 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |   20 -
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c   |   18 -
 src/mesa/drivers/dri/i965/gen6_blorp.cpp   |   19 +
 src/mesa/drivers/dri/i965/gen6_sf_state.c  |   69 ++-
 src/mesa/drivers/dri/i965/gen7_sampler_state.c |2 
 src/mesa/drivers/dri/i965/gen7_sf_state.c  |   36 +-
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c  |3 
 src/mesa/drivers/dri/intel/intel_extensions.c  |4 
 src/mesa/drivers/dri/intel/intel_fbo.c |   30 +
 src/mesa/drivers/dri/intel/intel_fbo.h |4 
 src/mesa/drivers/dri/intel/intel_tex_copy.c|   32 +
 src/mesa/drivers/osmesa/osmesa.c   |3 
 src/mesa/drivers/x11/xm_dd.c   |3 
 src/mesa/main/bufferobj.c  |7 
 src/mesa/main/extensions.c |1 
 src/mesa/main/get_hash_params.py   |4 
 src/mesa/main/glformats.c  |   12 
 src/mesa/main/pack.c   |   26 +
 src/mesa/main/renderbuffer.h   |8 
 src/mesa/main/shaderapi.c  |   14 
 src/mesa/main/texgetimage.c|   92 -
 src/mesa/main/teximage.c   |   42 +-
 src/mesa/main/uniform_query.cpp|   85 +---
 src/mesa/main/uniforms.h   |4 
 src/mesa/main/version.h|2 
 src/mesa/program/ir_to_mesa.cpp|4 
 src/mesa/state_tracker/st_cb_drawpixels.c  |6 
 src/mesa/state_tracker/st_cb_texture.c |2 
 src/mesa/state_tracker/st_extensions.c |   12 
 src/mesa/state_tracker/st_format.c |   29 +
 src/mesa/state_tracker/st_format.h |2 
 src/mesa/state_tracker/st_texture.c|3 
 72 files changed, 1196 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit ff515c4e7cbd9f549e6b9054609ac380bec18468
Author: Matt Turner matts...@gmail.com
Date:   Tue Jan 29 11:22:06 2013 -0800

build: Add missing comma in AS_IF

Reported-by: Lauri Kasanencur...@operamail.com
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47248#c15

diff --git a/configure.ac b/configure.ac
index 1e352db..564ca3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,10 +57,10 @@ LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
 AX_PROG_BISON([],
-  AS_IF([test ! -f $srcdir/src/glsl/glcpp/glcpp-parse.c]
+  AS_IF([test ! -f $srcdir/src/glsl/glcpp/glcpp-parse.c],
 [AC_MSG_ERROR([bison not found - unable to compile 
glcpp-parse.y])]))
 AX_PROG_FLEX([],
- AS_IF([test ! -f $srcdir/src/glsl/glcpp/glcpp-lex.c]
+ AS_IF([test ! -f $srcdir/src/glsl/glcpp/glcpp-lex.c],
[AC_MSG_ERROR([flex not found - unable to compile 
glcpp-lex.l])]))
 
 AC_PATH_PROG([PERL], [perl])

commit d7ca04a7c3a7f9170469615affcb4f6eebd524e5
Author: Marek Olšák mar...@gmail.com
Date:   Tue Jan 29 17:32:14 2013 +0100

docs/relnotes-9.1: document new features in radeon drivers

(cherry picked from commit 845130951f9f62a1baba9ae9ea2b234e83ac5c94)

diff --git a/docs/relnotes-9.1.html b/docs/relnotes-9.1.html
index 036290e..350ae27 100644
--- a/docs/relnotes-9.1.html
+++ b/docs/relnotes-9.1.html
@@ -54,6 +54,8 @@ Note: some of the new features are only available with 
certain drivers.
 liGL_ARB_texture_cube_map_array/li
 liGL_EXT_color_buffer_float/li
 liGL_OES_depth_texture_cube_map/li
+liOpenGL 3.1 core profile support on Radeon HD2000 up to HD6000 series /li
+liMultisample anti-aliasing support on Radeon X1000 series/li
 /ul
 
 

commit 48af880f815b8f37d9c6e77e314d264250f742b0
Author: Matt Turner matts...@gmail.com
Date:   Fri Jan 25 15:06:16 2013 -0800

docs: List new extensions added in Mesa 9.1

I did not list the *_get_program_binary extensions since they're not
useful to anyone with their current implementation (that supports 0
binary formats).

diff --git a/docs/relnotes-9.1.html b/docs/relnotes-9.1.html
index ffca275..036290e 100644
--- a/docs/relnotes-9.1.html
+++ b/docs/relnotes-9.1.html
@@ -44,9 +44,16 @@ Note: some of the new features are only available with 
certain drivers.
 /p
 
 ul
+liGL_ANGLE_texture_compression_dxt3/li
+liGL_ANGLE_texture_compression_dxt5/li
+liGL_ARB_ES3_compatibility/li
+liGL_ARB_internalformat_query/li
 liGL_ARB_map_buffer_alignment/li
-liGL_ARB_texture_cube_map_array/li
+liGL_ARB_shading_language_packing/li
 liGL_ARB_texture_buffer_object_rgb32/li
+liGL_ARB_texture_cube_map_array/li
+liGL_EXT_color_buffer_float/li
+liGL_OES_depth_texture_cube_map/li
 /ul
 
 

commit af2d8f8072c53d4c63ed22b74f78213c1181c1eb
Author: Jerome Glisse jgli...@redhat.com
Date:   Mon Jan 28 19:07:10 2013 -0500

r600g: use uint64_t instead of unsigned long for proper 32bits cpu support

Signed-off-by: Jerome Glisse jgli...@redhat.com

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c 
b/src/gallium/drivers/r600/evergreen_hw_context.c
index ca4f4b3..bb47530 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -243,9 +243,9 @@ void evergreen_set_streamout_enable(struct r600_context 
*ctx, unsigned buffer_en
 void evergreen_dma_copy(struct r600_context *rctx,
struct pipe_resource *dst,
struct pipe_resource *src,
-   unsigned long dst_offset,
-   unsigned long src_offset,
-   unsigned long size)
+   uint64_t dst_offset,
+   uint64_t src_offset,
+   uint64_t size)
 {
struct radeon_winsys_cs *cs = rctx-rings.dma.cs;
unsigned i, ncopy, csize, sub_cmd, shift;
diff --git a/src/gallium/drivers/r600/evergreen_state.c 
b/src/gallium/drivers/r600/evergreen_state.c
index be1c427..0a3861f 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -3481,7 +3481,7 @@ static void evergreen_dma_copy_tile(struct r600_context 
*rctx,
unsigned array_mode, lbpp, pitch_tile_max, slice_tile_max, size;
unsigned ncopy, height, cheight, detile, i, x, y, z, src_mode, dst_mode;
unsigned sub_cmd, bank_h, bank_w, mt_aspect, nbanks, tile_split;
-   unsigned long base, addr;
+   uint64_t base, addr;
 
/* make sure that the dma ring is only one active */
rctx-rings.gfx.flush(rctx, RADEON_FLUSH_ASYNC);
@@ -3625,7 +3625,7 @@ boolean evergreen_dma_blit(struct pipe_context *ctx,
}
 
if (src_mode == dst_mode) {
-   unsigned long dst_offset, src_offset;
+   uint64_t dst_offset, src_offset;
/* simple dma blit would do NOTE code here assume :
 *   src_box.x/y == 0
 *   dst_x/y == 0
diff --git 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Makefile.am |   62 +++
 bin/.cherry-ignore  |   10 
 bin/get-pick-list.sh|   29 +
 configs/default |2 
 configure.ac|   16 -
 docs/news.html  |   10 
 docs/relnotes-9.0.1.html|  157 +
 docs/relnotes-9.0.html  |4 
 docs/relnotes.html  |1 
 src/egl/drivers/dri2/egl_dri2.h |4 
 src/egl/drivers/dri2/platform_wayland.c |  252 +---
 src/egl/drivers/dri2/platform_x11.c |2 
 src/egl/main/eglcontext.c   |   17 -
 src/egl/wayland/wayland-drm/wayland-drm.c   |   26 -
 src/egl/wayland/wayland-egl/wayland-egl-priv.h  |   11 
 src/egl/wayland/wayland-egl/wayland-egl.c   |   33 --
 src/gallium/drivers/nv30/nv30_miptree.c |3 
 src/gallium/drivers/nv50/nv50_miptree.c |3 
 src/gallium/state_trackers/egl/wayland/native_drm.c |   40 +-
 src/gallium/state_trackers/egl/wayland/native_shm.c |   34 +-
 src/gallium/state_trackers/egl/wayland/native_wayland.c |  161 ++
 src/gallium/state_trackers/egl/wayland/native_wayland.h |9 
 src/gbm/backends/dri/gbm_dri.c  |  120 ---
 src/gbm/backends/dri/gbm_driint.h   |8 
 src/glsl/linker.cpp |1 
 src/glsl/ralloc.c   |8 
 src/glsl/ralloc.h   |9 
 src/glsl/tests/Makefile.am  |5 
 src/glx/dri2_glx.c  |2 
 src/glx/glxext.c|3 
 src/mapi/glapi/gen/gl_API.xml   |3 
 src/mesa/drivers/dri/i965/brw_misc_state.c  |6 
 src/mesa/drivers/dri/intel/intel_screen.c   |1 
 src/mesa/main/context.c |5 
 src/mesa/main/get.c |  107 +++---
 src/mesa/main/mtypes.h  |2 
 src/mesa/main/tests/enum_strings.cpp|2 
 src/mesa/main/teximage.c|   20 -
 src/mesa/main/version.h |4 
 src/mesa/state_tracker/st_cb_texture.c  |9 
 40 files changed, 657 insertions(+), 544 deletions(-)

New commits:
commit 2d85170eb79bc8950feff2fdc6a8af374195dbd1
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Wed Nov 14 10:46:47 2012 -0800

docs: Add 9.0.1 release notes

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/relnotes-9.0.1.html b/docs/relnotes-9.0.1.html
index 544990c..8a354b0 100644
--- a/docs/relnotes-9.0.1.html
+++ b/docs/relnotes-9.0.1.html
@@ -7,7 +7,7 @@
 /head
 body
 
-h1Mesa 9.0.1 Release Notes / TBD/h1
+h1Mesa 9.0.1 Release Notes / November 14th, 2012/h1
 
 p
 Mesa 9.0.1 is a bug fix release which fixes bugs found since the 9.0 release.
@@ -34,8 +34,15 @@ TBD.
 pThis list is likely incomplete./p
 
 ul
-!-- lia href=https://bugs.freedesktop.org/show_bug.cgi?id=;Bug /a - 
/li --
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=44912;Bug 44912/a 
- [bisected] WebGL conformance/textures/texture-mips tests fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=55856;Bug 55856/a 
- kwin with gles window content is not updating (gen4)/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=56057;Bug 56057/a 
- INTEL_swap_event not correctly listed/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=56211;Bug 56211/a 
- src/mesa/state_tracker/st_cb_texture.c:1123:copy_image_data_to_texture: 
Assertion `u_minify(stImage-gt;pt-gt;height0, src_level) == 
stImage-gt;base.Height' failed./li
 
+!-- lia href=https://bugs.freedesktop.org/show_bug.cgi?id=;Bug /a - 
/li --
 /ul
 
 
@@ -43,8 +50,108 @@ TBD.
 pThe full set of changes can be viewed by using the following GIT 
command:/p
 
 pre
-  git log mesa-9.0..
+  git log mesa-9.0..mesa-9.0.1
 /pre
 
+pAdam Jackson (1):/p
+ul
+  liglx: Add GLXBadProfileARB to the error string list/li
+/ul
+
+pAndreas Boll (7):/p
+ul
+  lidocs: add news item for 9.0 release/li
+  limesa: add get-pick-list.sh script into bin//li
+  limesa: add initial .cherry-ignore file for the 9.0 branch/li
+  limesa: use .cherry-ignore in the get-pick-list.sh script/li
+  libuild: add config.sub and config.guess to tarballs target/li
+  libuild: add missing Makefile.in files to tarballs target/li
+  libuild: add missing files to tarballs target/li
+/ul
+
+pBrian Paul (2):/p
+ul
+  limesa: don't call TexImage driver hooks for zero-sized images/li
+  

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Makefile.am |2 
 configure.ac|5 
 docs/relnotes-9.0.html  |2 
 src/egl/drivers/dri2/platform_x11.c |3 
 src/gallium/drivers/r600/evergreen_state.c  |   13 +
 src/gallium/drivers/radeon/Makefile |   24 +--
 src/gallium/drivers/radeon/Makefile.sources |   25 +++
 src/mesa/drivers/common/meta.c  |  206 ++--
 src/mesa/drivers/dri/i965/gen6_cc.c |   13 +
 src/mesa/main/api_exec.c|2 
 src/mesa/main/state.c   |3 
 src/mesa/main/teximage.c|   21 --
 src/mesa/main/texstore.c|6 
 src/mesa/main/version.h |2 
 14 files changed, 238 insertions(+), 89 deletions(-)

New commits:
commit e5fdeef1e08b55acd48dc68f0cc8fe213f2820b8
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Mon Oct 8 14:56:11 2012 -0700

mesa: Bump version number to 9.0 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/Makefile.am b/Makefile.am
index 190246c..9a0c1dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ distclean-local:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.0-devel
+PACKAGE_VERSION=9.0
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
index ff31fbb..d72c5bb 100644
--- a/docs/relnotes-9.0.html
+++ b/docs/relnotes-9.0.html
@@ -7,7 +7,7 @@
 /head
 body
 
-h1Mesa 9.0 Release Notes / date TBD/h1
+h1Mesa 9.0 Release Notes / October 8th, 2012/h1
 
 p
 Mesa 9.0 is a new development release.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 5b2e85a..85701ca 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
 #define MESA_MAJOR 9
 #define MESA_MINOR 0
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING 9.0-devel
+#define MESA_VERSION_STRING 9.0
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a)  16) + ((b)  8) + (c))

commit a8d0652c04ae4249608b37f06b5a8b3dca3774a9
Author: Tom Stellard thomas.stell...@amd.com
Date:   Tue Sep 4 09:37:02 2012 -0400

configure.ac: Don't link gallium drivers with libdricore

Reviewed-by: Matt Turner matts...@gmail.com
(cherry picked from commit d68e337c600a1b644d84e4703c92c2087aff82a4)

diff --git a/configure.ac b/configure.ac
index b8d0141..2d922f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -916,7 +916,6 @@ AC_SUBST([GLESv2_LIB_DEPS])
 AC_SUBST([GLESv2_PC_LIB_PRIV])
 
 DRI_LIB_DEPS=\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la
-GALLIUM_DRI_LIB_DEPS=\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so
 
 AC_SUBST([HAVE_XF86VIDMODE])
 

commit ad4b3b93ded960c22388c7bc3ba14d32b30b8f1d
Author: Anuj Phogat anuj.pho...@gmail.com
Date:   Fri Aug 31 13:51:39 2012 -0700

_mesa_meta_GenerateMipmap: Support all texture targets by generating 
shaders at runtime

This is a squash for the following 7 commits.  The first introduces the
functionality, and the remaining six fix various bugs.

Patch 1:
_mesa_meta_GenerateMipmap: Support all texture targets by generating 
shaders at runtime

glsl path of _mesa_meta_GenerateMipmap() function would require 
different fragment
shaders depending on the texture target. This patch adds the code to 
generate
appropriate fragment shader programs at run time.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=54296

V2: Removed the code for integer textures as ARB is planning to
disallow automatic mipmap generation for integer textures.
Now using ralloc_asprintf in setup_glsl_generate_mipmap().

NOTE: This is a candidate for stable branches.

Signed-off-by: Anuj Phogat anuj.pho...@gmail.com
Reviewed-by: Brian Paul bri...@vmware.com
(cherry picked from commit 299acac849eb8506de9760c94c6e8e8b1046d909)

Patch 2:
_mesa_meta_GenerateMipmap: Generate separate shaders for glsl 120 / 130

glsl version of _mesa_meta_GenerateMipmap() would require separate
shaders for glsl 120 and 130.

V2: Removed the code for integer textures as ARB is planning to
disallow automatic mipmap generation for integer textures.

NOTE: This is a candidate for stable branches.

Signed-off-by: Anuj Phogat anuj.pho...@gmail.com
Reviewed-by: Brian Paul bri...@vmware.com
(cherry picked from commit 15bf3103b48a5928321fe56fbb3ed28a0f314418)

Patch 3:
meta: Add on demand compilation of per target shader programs

A call to glGenerateMipmap() follows the generation of a relevant
shader program in setup_glsl_generate_mipmap().

To support all texture targets and to avoid compiling shaders

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk   |2 -
 configure.ac|   45 
 docs/dispatch.html  |2 -
 scons/gallium.py|2 -
 src/egl/main/eglcurrent.c   |6 +--
 src/egl/main/eglmutex.h |2 -
 src/glsl/Makefile.am|6 +--
 src/glsl/tests/Makefile.am  |8 ++--
 src/glx/apple/Makefile  |2 -
 src/glx/glxclient.h |8 ++--
 src/glx/glxcurrent.c|4 +-
 src/glx/tests/Makefile.am   |3 +
 src/mapi/glapi/gen/gl_SPARC_asm.py  |2 -
 src/mapi/glapi/gen/gl_x86-64_asm.py |6 +--
 src/mapi/glapi/gen/gl_x86_asm.py|6 +--
 src/mapi/glapi/glapi_entrypoint.c   |6 +--
 src/mapi/glapi/tests/Makefile.am|3 +
 src/mapi/mapi/stub.c|2 -
 src/mapi/mapi/u_thread.h|8 ++--
 src/mapi/shared-glapi/tests/Makefile.am |3 +
 src/mesa/Makefile.am|   10 +++--
 src/mesa/drivers/dri/common/Makefile.am |3 +
 src/mesa/drivers/dri/i915/Makefile.am   |5 +-
 src/mesa/drivers/dri/i965/Makefile.am   |5 +-
 src/mesa/drivers/dri/i965/gen6_clip_state.c |1 
 src/mesa/drivers/dri/i965/gen6_viewport_state.c |   24 +---
 src/mesa/drivers/dri/i965/gen7_clip_state.c |1 
 src/mesa/drivers/dri/i965/gen7_viewport_state.c |   19 ++
 src/mesa/drivers/dri/nouveau/Makefile.am|5 +-
 src/mesa/drivers/dri/r200/Makefile.am   |5 +-
 src/mesa/drivers/dri/radeon/Makefile.am |5 +-
 src/mesa/drivers/dri/swrast/Makefile.am |3 +
 src/mesa/drivers/osmesa/Makefile.am |   19 +++---
 src/mesa/main/tests/Makefile.am |6 ++-
 34 files changed, 126 insertions(+), 111 deletions(-)

New commits:
commit b2048c5e905cb6321212e33391926fc720b89121
Author: Eric Anholt e...@anholt.net
Date:   Fri Sep 21 10:10:54 2012 +0200

i965: Use visibility cflags on the driver code.
(cherry picked from commit 837f06b42fd46fdfdc0c85734dbad5497ea6d19f)

The only symbols that need to be public (those in intel_screen.c that the
loader looks for) are already marked public.  Saves 100k of compiled driver
size.

Reviewed-by: Kenneth Graunke kenn...@whitecape.org
Reviewed-by: Matt Turner matts...@gmail.com

diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index c9ea1c3..01a6f78 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -36,6 +36,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
$(DEFINES) \
$(API_DEFINES) \
+   $(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
 
 AM_CXXFLAGS = $(AM_CFLAGS)

commit ddb9ecca3b0f820feb4dee6bd8901f8b6e3ee0d8
Author: Matt Turner matts...@gmail.com
Date:   Thu Sep 20 15:08:02 2012 -0700

build: Don't build libdricore if not building classic drivers
(cherry picked from commit 523c01524638b3d1bb363f4c0a647b0777840b7a)

diff --git a/configure.ac b/configure.ac
index 0ae8da3..1a795ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,6 +1089,7 @@ if test x$enable_dri = xyes; then
 DRI_LIB_DEPS=$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm 
$PTHREAD_LIBS $DLOPEN_LIBS
 GALLIUM_DRI_LIB_DEPS=$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS 
$EXPAT_LIB -lm $PTHREAD_LIBS $DLOPEN_LIBS
 fi
+AM_CONDITIONAL(NEED_LIBDRICORE, test -n $DRI_DIRS)
 AC_SUBST([DRI_DIRS])
 AC_SUBST([EXPAT_INCLUDES])
 AC_SUBST([DRI_LIB_DEPS])
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index a76df8c..feec107 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,7 +19,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = x86 x86-64 . libdricore drivers
+if NEED_LIBDRICORE
+DRICORE_SUBDIR = libdricore
+endif
+
+SUBDIRS = x86 x86-64 . $(DRICORE_SUBDIR) drivers
 
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h

commit 76732c9ca5ae857ba8fa4773b25847299b50d098
Author: Matt Turner matts...@gmail.com
Date:   Thu Sep 27 15:35:15 2012 -0700

build: Add visibility CFLAGS to OSMesa
(cherry picked from commit 24ded898761757ec68e8f6dbe7de1f18c0be3f63)

diff --git a/src/mesa/drivers/osmesa/Makefile.am 
b/src/mesa/drivers/osmesa/Makefile.am
index 21b8dfb..c4b178b 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -27,8 +27,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES) \
$(API_DEFINES)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS = 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 7cfd42cefe1949af51ecced9891f415eca2c0e66
Author: Dave Airlie airl...@redhat.com
Date:   Fri Sep 14 10:13:01 2012 +1000

mesa/glsl: rename preprocess to glcpp_preprocess

This symbol with dricore escapes into the namespace, its too generic,
we should prefix it with something just to be nice.

Should be applied to stable + 9.0

Acked-by: Kenneth Graunke kenn...@whitecape.org
Signed-off-by: Dave Airlie airl...@redhat.com
(cherry picked from commit 88b0790b1ae8864d4ec6196b3939498bbffdbb5f)

diff --git a/src/glsl/glcpp/glcpp.c b/src/glsl/glcpp/glcpp.c
index e461a65..35db470 100644
--- a/src/glsl/glcpp/glcpp.c
+++ b/src/glsl/glcpp/glcpp.c
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
if (shader == NULL)
   return 1;
 
-   ret = preprocess(ctx, shader, info_log, NULL, API_OPENGL);
+   ret = glcpp_preprocess(ctx, shader, info_log, NULL, API_OPENGL);
 
printf(%s, shader);
fprintf(stderr, %s, info_log);
diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index a13ade6..a459289 100644
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
@@ -196,7 +196,7 @@ void
 glcpp_parser_destroy (glcpp_parser_t *parser);
 
 int
-preprocess(void *ralloc_ctx, const char **shader, char **info_log,
+glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
   const struct gl_extensions *extensions, int api);
 
 /* Functions for writing to the info log */
diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 9170d14..11b2941 100644
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -150,7 +150,7 @@ remove_line_continuations(glcpp_parser_t *ctx, const char 
*shader)
 }
 
 int
-preprocess(void *ralloc_ctx, const char **shader, char **info_log,
+glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
   const struct gl_extensions *extensions, int api)
 {
int errors;
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index fc08ee2..c8c40ab 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -296,7 +296,7 @@ _mesa_glsl_shader_target_name(enum 
_mesa_glsl_parser_targets target);
 extern C {
 #endif
 
-extern int preprocess(void *ctx, const char **shader, char **info_log,
+extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log,
   const struct gl_extensions *extensions, int api);
 
 extern void _mesa_destroy_shader_compiler(void);
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 64c2496..04143ad 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -144,7 +144,7 @@ compile_shader(struct gl_context *ctx, struct gl_shader 
*shader)
   new(shader) _mesa_glsl_parse_state(ctx, shader-Type, shader);
 
const char *source = shader-Source;
-   state-error = preprocess(state, source, state-info_log,
+   state-error = glcpp_preprocess(state, source, state-info_log,
 state-extensions, ctx-API) != 0;
 
if (!state-error) {
diff --git a/src/glsl/test_optpass.cpp b/src/glsl/test_optpass.cpp
index 31f65c3..5ed1170 100644
--- a/src/glsl/test_optpass.cpp
+++ b/src/glsl/test_optpass.cpp
@@ -216,7 +216,7 @@ int test_optpass(int argc, char **argv)
} else {
   shader-Source = input.c_str();
   const char *source = shader-Source;
-  state-error = preprocess(state, source, state-info_log,
+  state-error = glcpp_preprocess(state, source, state-info_log,
 state-extensions, ctx-API) != 0;
 
   if (!state-error) {
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index d675da2..c9c6db1 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -3060,7 +3060,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct 
gl_shader *shader)
   return;
}
 
-   state-error = preprocess(state, source, state-info_log,
+   state-error = glcpp_preprocess(state, source, state-info_log,
 ctx-Extensions, ctx-API);
 
if (ctx-Shader.Flags  GLSL_DUMP) {

commit 8f7990c5f2ca25e42c7fefff6312bee2ff77e134
Author: Dave Airlie airl...@gmail.com
Date:   Fri Sep 14 19:59:54 2012 +1000

glcpp: fix abuse of yylex

So glcpp tried to workaround yylex its own way, but failed,
do it properly.

This fixes another crash found after fixing the first crash.

this is a candidate for 9.0 and stable branches

Reviewed-by: Kenneth Graunke kenn...@whitecape.org
Signed-off-by: Dave Airlie airl...@redhat.com
(cherry picked from commit 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a)

diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 7a95b68..87affce 100644
--- a/src/glsl/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
@@ -31,7 +31,7 @@ AM_CFLAGS = \
$(LIBRARY_DEFINES) \
$(API_DEFINES)
 
-AM_YFLAGS = -v -d
+AM_YFLAGS = -v 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 configure.ac|8 -
 src/gallium/drivers/r600/evergreen_state.c  |3 
 src/gallium/drivers/r600/evergreend.h   |   11 +
 src/gallium/drivers/r600/r600_state.c   |3 
 src/gallium/drivers/r600/r600_state_common.c|2 
 src/gallium/drivers/r600/r600d.h|9 +
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c   |3 
 src/glsl/ast_to_hir.cpp |   19 ++-
 src/mapi/glapi/gen/glX_proto_send.py|4 
 src/mesa/drivers/common/meta.c  |8 -
 src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp |   24 +++
 src/mesa/drivers/osmesa/Makefile.am |4 
 src/mesa/drivers/osmesa/osmesa.pc.in|2 
 src/mesa/main/extensions.c  |   11 -
 src/mesa/main/fbobject.c|4 
 src/mesa/main/teximage.c|   48 ---
 src/mesa/main/teximage.h|2 
 src/mesa/main/texstorage.c  |  126 ++--
 18 files changed, 210 insertions(+), 81 deletions(-)

New commits:
commit c586fce4fb537e904e35cb5197b6b7fe02217acb
Author: Vadim Girlin vadimgir...@gmail.com
Date:   Tue Sep 4 00:18:13 2012 +0400

r600g: adjust QUANT_MODE for higher precision

Use 1/256 for R6xx/7xx, 1/4096 for evergreen, instead of default 1/16.

Helps to pass some piglit tests (fbo, multisample).

Signed-off-by: Vadim Girlin vadimgir...@gmail.com
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
(cherry picked from commit f44bda17f515c411071ca8744ebd96039d9c583b)

diff --git a/src/gallium/drivers/r600/evergreen_state.c 
b/src/gallium/drivers/r600/evergreen_state.c
index 28a83f2..bda8ed5 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -920,7 +920,8 @@ static void *evergreen_create_rs_state(struct pipe_context 
*ctx,

S_028C08_PIX_CENTER_HALF(state-gl_rasterization_rules));
} else {
r600_pipe_state_add_reg(rstate, R_028C08_PA_SU_VTX_CNTL,
-   
S_028C08_PIX_CENTER_HALF(state-gl_rasterization_rules));
+   
S_028C08_PIX_CENTER_HALF(state-gl_rasterization_rules) |
+   
S_028C08_QUANT_MODE(V_028C08_X_1_4096TH));
}
r600_pipe_state_add_reg(rstate, R_028B7C_PA_SU_POLY_OFFSET_CLAMP, 
fui(state-offset_clamp));
r600_pipe_state_add_reg(rstate, R_028814_PA_SU_SC_MODE_CNTL,
diff --git a/src/gallium/drivers/r600/evergreend.h 
b/src/gallium/drivers/r600/evergreend.h
index 91d78f8..e4d72f5 100644
--- a/src/gallium/drivers/r600/evergreend.h
+++ b/src/gallium/drivers/r600/evergreend.h
@@ -1955,6 +1955,17 @@
 #define   S_028C08_PIX_CENTER_HALF(x)  (((x)  0x1)  0)
 #define   G_028C08_PIX_CENTER_HALF(x)  (((x)  0)  0x1)
 #define   C_028C08_PIX_CENTER_HALF 0xFFFE
+#define   S_028C08_QUANT_MODE(x)   (((x)  0x7)  3)
+#define   G_028C08_QUANT_MODE(x)   (((x)  3)  0x7)
+#define   C_028C08_QUANT_MODE  0xFFC7
+#define V_028C08_X_1_16TH  0x00
+#define V_028C08_X_1_8TH   0x01
+#define V_028C08_X_1_4TH   0x02
+#define V_028C08_X_1_2 0x03
+#define V_028C08_X_1   0x04
+#define V_028C08_X_1_256TH 0x05
+#define V_028C08_X_1_1024TH0x06
+#define V_028C08_X_1_4096TH0x07
 #define R_028C0C_PA_CL_GB_VERT_CLIP_ADJ  0x00028C0C
 #define R_028C10_PA_CL_GB_VERT_DISC_ADJ  0x00028C10
 #define R_028C14_PA_CL_GB_HORZ_CLIP_ADJ  0x00028C14
diff --git a/src/gallium/drivers/r600/r600_state.c 
b/src/gallium/drivers/r600/r600_state.c
index 26db24b..53bbdd9 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -948,7 +948,8 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, sc_mode_cntl);
 
r600_pipe_state_add_reg(rstate, R_028C08_PA_SU_VTX_CNTL,
-   
S_028C08_PIX_CENTER_HALF(state-gl_rasterization_rules));
+   
S_028C08_PIX_CENTER_HALF(state-gl_rasterization_rules) |
+   S_028C08_QUANT_MODE(V_028C08_X_1_256TH));
 
r600_pipe_state_add_reg(rstate, R_028DFC_PA_SU_POLY_OFFSET_CLAMP, 
fui(state-offset_clamp));
r600_pipe_state_add_reg(rstate, R_028814_PA_SU_SC_MODE_CNTL,
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index a6da0a2..28423e1 100644
--- 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Makefile.am |2 
 configs/default |2 
 configure.ac|   71 
 docs/autoconf.html  |   10 
 docs/contents.html  |1 
 docs/download.html  |   18 
 docs/faq.html   |4 
 docs/glu.html   |   46 
 docs/install.html   |5 
 docs/license.html   |2 
 docs/relnotes-9.0.html  |   18 
 docs/sourcetree.html|5 
 include/GL/glu.h|  353 
 include/GL/glu_mangle.h |   86 
 include/GL/internal/dri_interface.h |   67 
 scons/gallium.py|2 
 src/SConscript  |2 
 src/egl/drivers/dri2/egl_dri2.c |  128 
 src/egl/drivers/dri2/platform_android.c |   36 
 src/gallium/auxiliary/tgsi/tgsi_scan.c  |1 
 src/gallium/auxiliary/util/u_format_yuv.c   |1 
 src/gallium/auxiliary/util/u_inlines.h  |4 
 src/gallium/auxiliary/util/u_math.h |1 
 src/gallium/drivers/radeon/AMDGPU.h |1 
 src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp |8 
 src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp  |2 
 src/gallium/drivers/radeon/MCTargetDesc/SIMCCodeEmitter.cpp |   39 
 src/gallium/drivers/radeon/Makefile.sources |1 
 src/gallium/drivers/radeon/R600Instructions.td  |8 
 src/gallium/drivers/radeon/SIGenRegisterInfo.pl |1 
 src/gallium/drivers/radeon/SIISelLowering.h |2 
 src/gallium/drivers/radeon/SIInstrInfo.td   |   10 
 src/gallium/drivers/radeon/SIInstructions.td|   35 
 src/gallium/drivers/radeon/SILowerLiteralConstants.cpp  |  105 
 src/gallium/drivers/radeonsi/radeonsi_pipe.c|4 
 src/gallium/drivers/radeonsi/radeonsi_shader.c  |8 
 src/gallium/drivers/radeonsi/si_state.c |4 
 src/gallium/state_trackers/dri/common/dri_context.c |6 
 src/gallium/state_trackers/dri/common/dri_screen.c  |   10 
 src/gallium/state_trackers/dri/common/dri_screen.h  |1 
 src/gallium/state_trackers/dri/drm/dri2.c   |   82 
 src/gallium/state_trackers/glx/xlib/glx_usefont.c   |4 
 src/gallium/state_trackers/glx/xlib/xm_api.c|   10 
 src/gallium/state_trackers/glx/xlib/xm_st.c |8 
 src/gallium/state_trackers/vega/handle.h|1 
 src/gbm/backends/dri/gbm_dri.c  |   33 
 src/glu/.gitignore  |1 
 src/glu/Makefile|   40 
 src/glu/glu.pc.in   |   13 
 src/glu/sgi/.gitignore  |1 
 src/glu/sgi/Makefile|  144 
 src/glu/sgi/SConscript  |  143 
 src/glu/sgi/dummy.cc|4 
 src/glu/sgi/glu.def |   88 
 src/glu/sgi/glu.exports |  118 
 src/glu/sgi/glu.exports.darwin  |   59 
 src/glu/sgi/include/gluos.h |   86 
 src/glu/sgi/libnurbs/interface/bezierEval.cc|  260 
 src/glu/sgi/libnurbs/interface/bezierEval.h |   48 
 src/glu/sgi/libnurbs/interface/bezierPatch.cc   |  206 
 src/glu/sgi/libnurbs/interface/bezierPatch.h|  104 
 src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc   |  610 
 src/glu/sgi/libnurbs/interface/bezierPatchMesh.h|  121 
 src/glu/sgi/libnurbs/interface/glcurveval.cc|  402 
 src/glu/sgi/libnurbs/interface/glcurveval.h |  157 
 src/glu/sgi/libnurbs/interface/glimports.h  |   42 
 src/glu/sgi/libnurbs/interface/glinterface.cc   |  469 
 src/glu/sgi/libnurbs/interface/glrenderer.cc|  301 
 src/glu/sgi/libnurbs/interface/glrenderer.h |  146 
 src/glu/sgi/libnurbs/interface/glsurfeval.cc| 1293 -
 src/glu/sgi/libnurbs/interface/glsurfeval.h |  404 
 src/glu/sgi/libnurbs/interface/incurveeval.cc   |  206 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Android.common.mk  |4 
 configs/current.in |1 
 configs/default|5 
 configure.ac   |  233 -
 docs/GL3.txt   |   12 
 docs/helpwanted.html   |7 
 docs/intro.html|   11 
 docs/relnotes-8.1.html |   70 
 docs/relnotes-9.0.html |   77 
 docs/utilities.html|   26 
 include/GL/internal/dri_interface.h|   12 
 src/egl/drivers/dri2/Makefile.am   |1 
 src/egl/drivers/dri2/egl_dri2.c|2 
 src/egl/main/eglcontext.c  |2 
 src/gallium/auxiliary/draw/draw_context.c  |   12 
 src/gallium/auxiliary/util/u_blitter.c |   68 
 src/gallium/auxiliary/util/u_blitter.h |   15 
 src/gallium/auxiliary/util/u_tile.c|   36 
 src/gallium/auxiliary/util/u_vbuf.c|4 
 src/gallium/drivers/llvmpipe/lp_limits.h   |5 
 src/gallium/drivers/llvmpipe/lp_texture.c  |6 
 src/gallium/drivers/r300/compiler/radeon_opcodes.c |7 
 src/gallium/drivers/r300/compiler/radeon_opcodes.h |3 
 src/gallium/drivers/r300/compiler/radeon_program_alu.c |   31 
 src/gallium/drivers/r300/compiler/radeon_rename_regs.c |   31 
 src/gallium/drivers/r300/r300_tgsi_to_rc.c |2 
 src/gallium/drivers/r600/evergreen_hw_context.c|  129 
 src/gallium/drivers/r600/evergreen_state.c |  281 +
 src/gallium/drivers/r600/evergreend.h  |   97 
 src/gallium/drivers/r600/r600_asm.c|   13 
 src/gallium/drivers/r600/r600_blit.c   |  138 
 src/gallium/drivers/r600/r600_buffer.c |5 
 src/gallium/drivers/r600/r600_hw_context.c |   16 
 src/gallium/drivers/r600/r600_pipe.c   |   22 
 src/gallium/drivers/r600/r600_pipe.h   |   40 
 src/gallium/drivers/r600/r600_resource.c   |2 
 src/gallium/drivers/r600/r600_resource.h   |   35 
 src/gallium/drivers/r600/r600_state.c  |  412 ++
 src/gallium/drivers/r600/r600_state_common.c   |  154 
 src/gallium/drivers/r600/r600_texture.c|  146 
 src/gallium/drivers/r600/r600d.h   |   20 
 src/gallium/drivers/radeon/AMDGPU.h|2 
 src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp|  128 
 src/gallium/drivers/radeon/AMDGPUAsmPrinter.h  |   43 
 src/gallium/drivers/radeon/AMDGPUConvertToISA.cpp  |   11 
 src/gallium/drivers/radeon/AMDGPUISelLowering.h|2 
 src/gallium/drivers/radeon/AMDGPUInstrInfo.cpp |   14 
 src/gallium/drivers/radeon/AMDGPUInstrInfo.h   |8 
 src/gallium/drivers/radeon/AMDGPUMCInstLower.cpp   |   82 
 src/gallium/drivers/radeon/AMDGPUMCInstLower.h |   30 
 src/gallium/drivers/radeon/AMDGPUSubtarget.cpp |   12 
 src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp |   31 
 src/gallium/drivers/radeon/AMDGPUTargetMachine.h   |4 
 src/gallium/drivers/radeon/AMDIL7XXDevice.cpp  |   13 
 src/gallium/drivers/radeon/AMDIL7XXDevice.h|2 
 src/gallium/drivers/radeon/AMDILDevice.h   |7 
 src/gallium/drivers/radeon/AMDILEvergreenDevice.cpp|   13 
 src/gallium/drivers/radeon/AMDILEvergreenDevice.h  |2 
 src/gallium/drivers/radeon/AMDILInstrInfo.td   |7 
 src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp  |2 
 src/gallium/drivers/radeon/AMDILIntrinsicInfo.h|1 
 src/gallium/drivers/radeon/InstPrinter/AMDGPUInstPrinter.cpp   |   34 
 src/gallium/drivers/radeon/InstPrinter/AMDGPUInstPrinter.h |   34 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUAsmBackend.cpp   |   80 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUMCAsmInfo.cpp|   96 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUMCAsmInfo.h  |   30 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUMCCodeEmitter.h  |   59 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUMCTargetDesc.cpp |  111 
 src/gallium/drivers/radeon/MCTargetDesc/AMDGPUMCTargetDesc.h   |   51 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 configs/current.in |   23 
 configs/default|   18 
 configure.ac   |   91 -
 scons/custom.py|   25 
 src/gallium/auxiliary/cso_cache/cso_context.c  |2 
 src/gallium/auxiliary/draw/draw_context.c  |   49 
 src/gallium/auxiliary/draw/draw_context.h  |3 
 src/gallium/auxiliary/draw/draw_gs.c   |   22 
 src/gallium/auxiliary/draw/draw_llvm.c |   20 
 src/gallium/auxiliary/draw/draw_llvm.h |4 
 src/gallium/auxiliary/draw/draw_llvm_sample.c  |6 
 src/gallium/auxiliary/draw/draw_private.h  |   34 
 src/gallium/auxiliary/draw/draw_vs.c   |6 
 src/gallium/auxiliary/draw/draw_vs_exec.c  |6 
 src/gallium/auxiliary/util/u_upload_mgr.h  |7 
 src/gallium/drivers/galahad/glhd_context.c |   98 -
 src/gallium/drivers/i915/i915_context.h|6 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/i915/i915_state.c  |   15 
 src/gallium/drivers/identity/id_context.c  |   94 -
 src/gallium/drivers/llvmpipe/lp_context.c  |4 
 src/gallium/drivers/llvmpipe/lp_context.h  |2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |4 
 src/gallium/drivers/llvmpipe/lp_state_sampler.c|   92 -
 src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp |2 
 src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp |2 
 src/gallium/drivers/r600/compute_memory_pool.c |6 
 src/gallium/drivers/r600/evergreen_compute.c   |   23 
 src/gallium/drivers/r600/evergreen_compute_internal.c  |   14 
 src/gallium/drivers/r600/evergreen_state.c |  381 ++--
 src/gallium/drivers/r600/r600_blit.c   |  109 -
 src/gallium/drivers/r600/r600_pipe.h   |   16 
 src/gallium/drivers/r600/r600_resource.h   |   14 
 src/gallium/drivers/r600/r600_shader.c |2 
 src/gallium/drivers/r600/r600_state.c  |   15 
 src/gallium/drivers/r600/r600_state_common.c   |   58 
 src/gallium/drivers/r600/r600_texture.c|   70 
 src/gallium/drivers/radeon/R600ISelLowering.cpp|   86 -
 src/gallium/drivers/radeon/R600ISelLowering.h  |7 
 src/gallium/drivers/radeon/R600Instructions.td |   18 
 src/gallium/drivers/radeon/radeon_llvm_emit.cpp|   15 
 src/gallium/drivers/radeonsi/r600.h|   10 
 src/gallium/drivers/radeonsi/r600_blit.c   |   10 
 src/gallium/drivers/radeonsi/r600_buffer.c |8 
 src/gallium/drivers/radeonsi/r600_hw_context.c |   21 
 src/gallium/drivers/radeonsi/r600_resource.c   |6 
 src/gallium/drivers/radeonsi/r600_resource.h   |   20 
 src/gallium/drivers/radeonsi/r600_texture.c|  414 ++---
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |   10 
 src/gallium/drivers/radeonsi/radeonsi_pipe.h   |   22 
 src/gallium/drivers/radeonsi/radeonsi_shader.c |1 
 src/gallium/drivers/radeonsi/si_state.c|   23 
 src/gallium/drivers/radeonsi/si_state_draw.c   |4 
 src/gallium/drivers/rbug/rbug_context.c|  113 -
 src/gallium/drivers/rbug/rbug_context.h|   17 
 src/gallium/drivers/rbug/rbug_core.c   |   17 
 src/gallium/drivers/softpipe/sp_context.c  |8 
 src/gallium/drivers/softpipe/sp_context.h  |2 
 src/gallium/drivers/softpipe/sp_screen.c   |4 
 src/gallium/drivers/softpipe/sp_state_derived.c|2 
 src/gallium/drivers/softpipe/sp_state_sampler.c|   88 -
 src/gallium/drivers/svga/svga_cmd.c|5 
 src/gallium/drivers/svga/svga_pipe_sampler.c   |   89 -
 src/gallium/drivers/svga/svga_state.c  |4 
 src/gallium/drivers/svga/svga_state.h  |4 
 src/gallium/drivers/svga/svga_state_constants.c|   58 
 src/gallium/drivers/trace/tr_context.c |  142 +
 src/gallium/include/pipe/p_state.h |2 
 src/gallium/state_trackers/egl/wayland/native_drm.c|5 
 src/gallium/targets/Makefile.va|2 
 src/gallium/targets/Makefile.vdpau |2 
 src/gallium/targets/Makefile.xvmc  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |   92 -
 src/mesa/SConscript|2 
 src/mesa/drivers/common/meta.c |2 
 src/mesa/drivers/dri/i965/brw_vs_constval.c|4 
 src/mesa/drivers/osmesa/Makefile.am|2 
 src/mesa/main/APIspec.xml 

mesa: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Makefile   |2 
 bin/mklib  |8 
 configs/default|2 
 configure.ac   |3 
 docs/relnotes-8.0.2.html   |4 
 docs/relnotes-8.0.3.html   |  319 +
 docs/relnotes-8.0.4.html   |  202 ++
 docs/relnotes.html |2 
 include/pci_ids/i965_pci_ids.h |1 
 src/egl/main/eglimage.c|2 
 src/gallium/auxiliary/draw/draw_llvm.c |5 
 src/gallium/auxiliary/draw/draw_pipe_pstipple.c|5 
 src/gallium/auxiliary/draw/draw_pt.c   |9 
 src/gallium/auxiliary/util/u_double_list.h |   15 
 src/gallium/auxiliary/util/u_linkage.h |9 
 src/gallium/drivers/i915/i915_flush.c  |5 
 src/gallium/drivers/i915/i915_screen.c |4 
 src/gallium/drivers/llvmpipe/lp_rast.c |4 
 src/gallium/drivers/nv50/nv50_pc_emit.c|4 
 src/gallium/drivers/nvfx/nvfx_fragprog.c   |3 
 src/gallium/drivers/r300/compiler/radeon_program_alu.c |   73 +-
 src/gallium/drivers/r300/r300_blit.c   |9 
 src/gallium/drivers/r300/r300_context.c|   12 
 src/gallium/drivers/r300/r300_context.h|3 
 src/gallium/drivers/r300/r300_emit.c   |   24 
 src/gallium/drivers/r300/r300_render.c |   14 
 src/gallium/drivers/r300/r300_screen.c |1 
 src/gallium/drivers/r300/r300_state.c  |   57 -
 src/gallium/drivers/r300/r300_vs.c |   16 
 src/gallium/drivers/r300/r300_vs.h |5 
 src/gallium/drivers/r300/r300_vs_draw.c|  100 +--
 src/gallium/drivers/r600/r600_shader.c |8 
 src/gallium/drivers/svga/include/svga_types.h  |4 
 src/gallium/drivers/svga/svga_pipe_blit.c  |6 
 src/gallium/drivers/svga/svga_pipe_draw.c  |   11 
 src/gallium/drivers/svga/svga_pipe_sampler.c   |4 
 src/gallium/drivers/svga/svga_screen.c |2 
 src/gallium/drivers/svga/svga_state_tss.c  |   10 
 src/gallium/drivers/svga/svga_surface.c|5 
 src/gallium/state_trackers/dri/sw/drisw.c  |6 
 src/gallium/state_trackers/vega/text.c |4 
 src/gallium/state_trackers/vega/vg_translate.c |4 
 src/gallium/targets/Makefile.xorg  |2 
 src/gallium/targets/egl-static/egl_st.c|3 
 src/glsl/Android.mk|1 
 src/glsl/ast_to_hir.cpp|  545 -
 src/glsl/builtins/ir/acos.ir   |8 
 src/glsl/builtins/tools/texture_builtins.py|6 
 src/glsl/ir.h  |4 
 src/glsl/ir_constant_expression.cpp|   18 
 src/glsl/link_uniforms.cpp |3 
 src/glsl/linker.cpp|4 
 src/glsl/loop_analysis.cpp |   28 
 src/glsl/loop_analysis.h   |   23 
 src/glsl/loop_unroll.cpp   |   15 
 src/glsl/ralloc.c  |2 
 src/glsl/strtod.c  |3 
 src/glu/sgi/libnurbs/internals/mapdesc.cc  |2 
 src/glu/sgi/libnurbs/internals/nurbstess.cc|2 
 src/glx/apple/Makefile |1 
 src/glx/apple/apple_glx.c  |   25 
 src/glx/apple/apple_glx.h  |3 
 src/glx/apple/apple_glx_context.c  |2 
 src/glx/apple/apple_glx_drawable.c |   29 
 src/glx/apple/apple_glx_log.c  |  128 +++
 src/glx/apple/apple_glx_log.h  |   57 +
 src/glx/apple/apple_glx_surface.c  |8 
 src/glx/compsize.c |1 
 src/glx/drisw_glx.c|   11 
 src/glx/glxext.c   |3 
 src/mapi/glapi/glapi_gentable.c|2 
 src/mesa/drivers/common/meta.c |   76 ++
 src/mesa/drivers/dri/common/drirc  |6 
 src/mesa/drivers/dri/i915/i830_state.c |   18 
 src/mesa/drivers/dri/i915/i830_vtbl.c  |7 
 src/mesa/drivers/dri/i915/i915_context.c   |2 
 src/mesa/drivers/dri/i915/i915_context.h   |2 
 

mesa: Changes to 'upstream-experimental'

[Robert Hooker]

Rebased ref, commits from common ancestor:
commit 5f7204c3bbc070fce2f3351419a64362fe15a8c6
Author: Jakob Bornecrantz ja...@vmware.com
Date:   Wed Mar 21 16:51:06 2012 +

docs: Add 8.0.2 release notes

Signed-off-by: Jakob Bornecrantz ja...@vmware.com

diff --git a/docs/news.html b/docs/news.html
index 346065c..e2fcca1 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,14 @@
 H1News/H1
 
 
+h2March 21, 2012/h2
+
+p
+a href=relnotes-8.0.2.htmlMesa 8.0.2/a is released.
+This is a bug fix release.
+/p
+
+
 h2February 16, 2012/h2
 
 p
diff --git a/docs/relnotes-8.0.2.html b/docs/relnotes-8.0.2.html
new file mode 100644
index 000..ad1818c
--- /dev/null
+++ b/docs/relnotes-8.0.2.html
@@ -0,0 +1,158 @@
+HTML
+
+head
+TITLEMesa 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=#ee
+
+H1Mesa 8.0.2 Release Notes / March 21, 2012/H1
+
+p
+Mesa 8.0.2 is a bug fix release which fixes bugs found since the 8.0.1 release.
+/p
+p
+Mesa 8.0.2 implements the OpenGL 3.0 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 3.0.
+/p
+p
+See the a href=install.htmlCompiling/Installing page/a for prerequisites
+for DRI hardware acceleration.
+/p
+
+
+h2MD5 checksums/h2
+pre
+tdb
+/pre
+
+h2New features/h2
+pNone./p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=38720;Bug 38720/a 
- [SNB] Trine triggers a GPU hang/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=40059;Bug 40059/a 
- [SNB] hang in Amnesia: The Dark Descent demo/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=45216;Bug 45216/a 
- [SNB] GPU hang in OilRush/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=46631;Bug 46631/a 
- It's really hard to hit the fast path for the fallback glReadPixels code/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=46679;Bug 46679/a 
- glReadPixels on a luminance texture returns the wrong values/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=46311;Bug 46311/a 
- Missing support of point size in Mesa core/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=46665;Bug 46665/a 
- [PNV] webgl conformance case max texture fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=45975;Bug 45975/a 
- [Gen4 + ILK] render with pointcoord will fail to render/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=4;Bug 4/a 
- [PNV] webgl conformance case NPOT case fails with TEXTURE_MIN_FILTER set to 
LINEAR/li
+
+!-- lia href=https://bugs.freedesktop.org/show_bug.cgi?id=;Bug /a - 
/li --
+
+/ul
+
+
+h2Changes/h2
+pThe full set of changes can be viewed by using the following GIT 
command:/p
+
+pre
+  git log mesa-8.0.1..mesa-8.0.2
+/pre
+
+pBrian Paul (7):
+ul
+  lisvga: add null vs pointer check in update_need_pipeline()/li
+  liutil: add mutex lock in u_debug_memory.c code/li
+  limesa: add _mesa_rebase_rgba_float/uint() functions/li
+  limesa: use _mesa_rebase_rgba_float/uint() in glReadPixels code/li
+  limesa: use _mesa_rebase_rgba_float/uint() in glGetTexImage code/li
+  limesa: fix GL_LUMINANCE handling in glGetTexImage/li
+  lidocs: add links to 8.0.1 release notes/li
+/ul/p
+
+pDaniel Vetter (1):
+ul
+  lii965: fixup W-tile offset computation to take swizzling into 
account/li
+ul/p
+
+pDylan Noblesmith (1):
+ul
+  limesa: add back glGetnUniform*v() overflow error reporting/li
+/ul/p
+
+pIan Romanick (1):
+ul
+  lidocs: Add 8.0.1 release md5sums/li
+/ul/p
+
+pJakob Bornecrantz (3):
+ul
+  limesa: Include mesa ES mapi generated files/li
+  limesa: Bump version number to 8.0.2/li
+  lidocs: Add 8.0.2 release notes/li
+/ul/p
+
+pJeremy Huddleston (3):
+ul
+  lidarwin: config file cleanups/li
+  lidarwin: Build create_context.c/li
+  lidarwin: Link against libxcb/li
+/ul/p
+
+pJosé Fonseca (1):
+ul
+  lisvga: Clamp advertised PIPE_SHADER_CAP_MAX_TEMPS to 
SVGA3D_TEMPREG_MAX./li
+/ul/p
+
+pKenneth Graunke (2):
+ul
+  lii965: Only set Last Render Target Select on the last FB write./li
+  lii965: Fix Gen6+ dynamic state upper bound on older kernels./li
+/ul/p
+
+pMarek Olšák (1):
+ul
+  ligallium/rtasm: properly detect SSE and SSE2/li
+/ul/p
+
+pNeil Roberts (1):
+ul
+  limesa: Don't disable fast path for normalized types/li
+/ul/p
+
+pTom Stellard (1):
+ul
+  lir300/compiler: Fix bug when lowering KILP on r300 cards/li
+/ul/p
+
+pYuanhan Liu (6):
+ul
+  limesa: let GL3 buf obj queries not depend on opengl major version/li
+  litnl: let _TNL_ATTRIB_POINTSIZE do not depend on 
ctx-gt;VertexProgram._Enabled/li
+  lii915: fix wrong rendering of gl_PointSize on Pineview/li
+  lii915: move the FALLBACK_DRAW_OFFSET check outside the 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Makefile |2 
 configure.ac |2 
 docs/relnotes-8.0.html   |2 
 src/gallium/auxiliary/postprocess/postprocess.h  |3 
 src/gallium/auxiliary/postprocess/pp_init.c  |6 
 src/gallium/auxiliary/postprocess/pp_run.c   |   13 
 src/gallium/drivers/softpipe/sp_screen.c |2 
 src/gallium/drivers/softpipe/sp_state_derived.c  |3 
 src/gallium/state_trackers/dri/common/dri_context.c  |3 
 src/gallium/state_trackers/dri/common/dri_drawable.c |   30 -
 src/gallium/state_trackers/dri/drm/dri2.c|3 
 src/gallium/state_trackers/vega/path.c   |2 
 src/gallium/state_trackers/xorg/xvmc/subpicture.c|3 
 src/glsl/ast_to_hir.cpp  |  545 ++-
 src/glsl/glcpp/glcpp-lex.l   |   10 
 src/glsl/glcpp/glcpp-parse.y |3 
 src/glsl/glsl_parser.yy  |6 
 src/glsl/glsl_parser_extras.cpp  |5 
 src/glsl/glsl_parser_extras.h|   21 
 src/mapi/glapi/glapi_nop.c   |8 
 src/mesa/drivers/common/meta.c   |7 
 src/mesa/drivers/dri/common/drirc|   10 
 src/mesa/drivers/dri/common/xmlpool/options.h|   10 
 src/mesa/drivers/dri/i915/i830_vtbl.c|5 
 src/mesa/drivers/dri/i915/i915_vtbl.c|5 
 src/mesa/drivers/dri/i965/brw_context.c  |2 
 src/mesa/drivers/dri/i965/brw_defines.h  |1 
 src/mesa/drivers/dri/i965/brw_eu_emit.c  |2 
 src/mesa/drivers/dri/i965/brw_fs.h   |2 
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp|6 
 src/mesa/drivers/dri/i965/brw_structs.h  |   11 
 src/mesa/drivers/dri/i965/brw_vec4.h |1 
 src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp  |6 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp   |   14 
 src/mesa/drivers/dri/i965/brw_wm.h   |3 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   22 
 src/mesa/drivers/dri/i965/gen6_sf_state.c|   13 
 src/mesa/drivers/dri/i965/gen7_sf_state.c|   18 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c|2 
 src/mesa/drivers/dri/intel/intel_batchbuffer.c   |7 
 src/mesa/drivers/dri/intel/intel_blit.c  |2 
 src/mesa/drivers/dri/intel/intel_context.h   |2 
 src/mesa/drivers/dri/intel/intel_fbo.c   |  112 +--
 src/mesa/drivers/dri/intel/intel_screen.c|3 
 src/mesa/drivers/osmesa/osmesa.c |3 
 src/mesa/main/arrayobj.c |6 
 src/mesa/main/attrib.c   |   13 
 src/mesa/main/bufferobj.c|  138 +---
 src/mesa/main/context.c  |   28 
 src/mesa/main/dlist.c|   21 
 src/mesa/main/format_unpack.c|  353 
 src/mesa/main/mipmap.c   |6 
 src/mesa/main/mtypes.h   |   11 
 src/mesa/main/pack.c |   58 --
 src/mesa/main/shared.c   |   48 +
 src/mesa/main/shared.h   |   11 
 src/mesa/main/texgetimage.c  |9 
 src/mesa/main/teximage.c |   22 
 src/mesa/main/texstore.c |   45 -
 src/mesa/main/version.h  |2 
 src/mesa/swrast/s_aaline.c   |2 
 src/mesa/swrast/s_aalinetemp.h   |2 
 src/mesa/swrast/s_aatriangle.c   |2 
 src/mesa/swrast/s_context.c  |   25 
 src/mesa/swrast/s_fragprog.c |   12 
 src/mesa/swrast/s_fragprog.h |2 
 src/mesa/swrast/s_lines.c|2 
 src/mesa/swrast/s_span.c |   57 -
 src/mesa/swrast/s_triangle.c |4 
 src/mesa/vbo/vbo_exec_array.c|2 
 70 files changed, 1156 insertions(+), 666 deletions(-)

New commits:
commit f9c9933f9c7f72f12be27ccda98c965c75f08a12
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Thu Feb 9 14:26:15 2012 -0800

mesa: Bump version number to 8.0 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/Makefile b/Makefile
index c1f7158..e0dd6ef 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=8.0-rc2
+PACKAGE_VERSION=8.0
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
diff 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Makefile   |2 
 configure.ac   |6 
 src/gallium/drivers/nv50/codegen/nv50_ir.cpp   |1 
 src/gallium/drivers/nv50/codegen/nv50_ir_driver.h  |2 
 src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp |   21 
 src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp |5 
 src/gallium/drivers/nvc0/nvc0_3d.xml.h |5 
 src/gallium/drivers/nvc0/nvc0_context.h|3 
 src/gallium/drivers/nvc0/nvc0_program.c|8 
 src/gallium/drivers/nvc0/nvc0_program.h|3 
 src/gallium/drivers/nvc0/nvc0_push.c   |   74 
 src/gallium/drivers/nvc0/nvc0_screen.c |   24 
 src/gallium/drivers/nvc0/nvc0_vbo.c|3 
 src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c   |2 
 src/gallium/drivers/r600/eg_asm.c  |   17 
 src/gallium/drivers/r600/eg_sq.h   |   49 
 src/gallium/drivers/r600/evergreen_hw_context.c|8 
 src/gallium/drivers/r600/evergreen_state.c |   35 
 src/gallium/drivers/r600/evergreend.h  |   17 
 src/gallium/drivers/r600/r600_asm.c|  324 +-
 src/gallium/drivers/r600/r600_asm.h|   13 
 src/gallium/drivers/r600/r600_hw_context.c |   21 
 src/gallium/drivers/r600/r600_pipe.c   |2 
 src/gallium/drivers/r600/r600_pipe.h   |7 
 src/gallium/drivers/r600/r600_shader.c |  421 ++-
 src/gallium/drivers/r600/r600_shader.h |7 
 src/gallium/drivers/r600/r600_sq.h |7 
 src/gallium/drivers/r600/r600_state.c  |   45 
 src/gallium/drivers/r600/r600_state_common.c   |   30 
 src/gallium/drivers/r600/r600_texture.c|8 
 src/gallium/drivers/r600/r600d.h   |4 
 src/gallium/state_trackers/egl/wayland/native_shm.c|7 
 src/gbm/main/gbm.c |  104 
 src/gbm/main/gbm.h |   45 
 src/gbm/main/gbmint.h  |   15 
 src/glsl/glsl_types.cpp|4 
 src/glsl/link_uniforms.cpp |2 
 src/glsl/linker.cpp|   66 
 src/glsl/s_expression.cpp  |   36 
 src/mesa/drivers/common/driverfuncs.c  |2 
 src/mesa/drivers/common/meta.c |5 
 src/mesa/drivers/dri/common/depthtmp.h |  218 -
 src/mesa/drivers/dri/common/spantmp2.h |  777 -
 src/mesa/drivers/dri/common/spantmp_common.h   |   78 
 src/mesa/drivers/dri/common/stenciltmp.h   |  186 -
 src/mesa/drivers/dri/i915/i830_vtbl.c  |6 
 src/mesa/drivers/dri/i915/i915_tex_layout.c|4 
 src/mesa/drivers/dri/i915/i915_vtbl.c  |6 
 src/mesa/drivers/dri/i965/brw_context.c|   10 
 src/mesa/drivers/dri/i965/brw_context.h|1 
 src/mesa/drivers/dri/i965/brw_disasm.c |   21 
 src/mesa/drivers/dri/i965/brw_eu.h |   11 
 src/mesa/drivers/dri/i965/brw_eu_emit.c|   31 
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp  |2 
 src/mesa/drivers/dri/i965/brw_misc_state.c |   39 
 src/mesa/drivers/dri/i965/brw_shader.cpp   |2 
 src/mesa/drivers/dri/i965/brw_state_cache.c|2 
 src/mesa/drivers/dri/i965/brw_tex_layout.c |6 
 src/mesa/drivers/dri/i965/brw_vec4_emit.cpp|   25 
 src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp|2 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |9 
 src/mesa/drivers/dri/i965/brw_vs.c |2 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c   |   20 
 src/mesa/drivers/dri/i965/gen6_cc.c|   36 
 src/mesa/drivers/dri/i965/gen6_hiz.c   |   11 
 src/mesa/drivers/dri/i965/gen7_misc_state.c|8 
 src/mesa/drivers/dri/i965/gen7_viewport_state.c|2 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c  |   21 
 src/mesa/drivers/dri/intel/intel_blit.c|2 
 src/mesa/drivers/dri/intel/intel_buffer_objects.c  |2 
 src/mesa/drivers/dri/intel/intel_context.c |   20 
 src/mesa/drivers/dri/intel/intel_context.h |1 
 src/mesa/drivers/dri/intel/intel_extensions.c  |8 
 

mesa: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit c85402aba91755808729fadf57a9f92285f4e61a
Author: Jakob Bornecrantz ja...@vmware.com
Date:   Wed Jan 11 23:33:07 2012 +0100

mesa: Bump version number to 8.0-rc1

Signed-off-by: Jakob Bornecrantz ja...@vmware.com

diff --git a/Makefile b/Makefile
index 1fa369a..64e3a7cd 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=8.0-devel
+PACKAGE_VERSION=8.0-rc1
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 8723c1f..c1f4e8e 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
 #define MESA_MAJOR 8
 #define MESA_MINOR 0
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING 8.0-devel
+#define MESA_VERSION_STRING 8.0-rc1
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a)  16) + ((b)  8) + (c))

commit 9c81e4eed1bc691f6308a230fddc80d2d2936a50
Author: Brian Paul bri...@vmware.com
Date:   Fri Jan 13 13:45:58 2012 -0700

docs: add links to xf86-video-vmware wiki pages

(cherry picked from commit 548526f2e967d29e0aa1d9a37e4364100e84dc3f)

diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index 9295644..727f99b 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -23,6 +23,15 @@ End users shouldn't have to go through all these steps once 
the driver is
 included in newer Linux distributions.
 /p
 
+p
+For more information about the X components see these wiki pages at x.org:
+/p
+ul
+lia href=http://wiki.x.org/wiki/vmware; target=_parent
+Driver Overview/a
+lia href=http://wiki.x.org/wiki/vmware/vmware3D; target=_parent
+xf86-video-vmware Details/a
+/ul
 
 
 h2Components/h2

commit daa2545508202302208317ace78d328d60f4d35f
Author: Eric Anholt e...@anholt.net
Date:   Wed Jan 11 14:06:17 2012 -0800

mesa: Throw the required error for glCopyPixels from multisample FBO.

Fixes piglit EXT_framebuffer_multisample/negative-copypixels.

Reviewed-by: Brian Paul bri...@vmware.com
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 9be6654c1f75bc402c807ec0caccebde032afa59)

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 9f5b0b3..01983d9 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -203,6 +203,12 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, 
GLsizei height,
   goto end;
}
 
+   if (ctx-ReadBuffer-Name != 0  ctx-ReadBuffer-Visual.samples  0) {
+  _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+ glCopyPixels(multisample FBO));
+  goto end;
+   }
+
if (!_mesa_source_buffer_exists(ctx, type) ||
!_mesa_dest_buffer_exists(ctx, type)) {
   _mesa_error(ctx, GL_INVALID_OPERATION,

commit baaa30ad52ac6eba0ee444c33678ffd357883a4d
Author: Eric Anholt e...@anholt.net
Date:   Wed Jan 11 14:02:41 2012 -0800

mesa: Throw the required error for glCopyTex{Sub,}Image from multisample 
FBO.

Fixes piglit EXT_framebuffer_multisample/negative-copyteximage.

Reviewed-by: Brian Paul bri...@vmware.com
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 6950a4faf650fe119ee97aa18b006eed099038be)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9475e84..d5e462b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1909,6 +1909,13 @@ copytexture_error_check( struct gl_context *ctx, GLuint 
dimensions,
  glCopyTexImage%dD(invalid readbuffer), dimensions);
  return GL_TRUE;
   }
+
+  if (ctx-ReadBuffer-Visual.samples  0) {
+_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+glCopyTexImage%dD(multisample FBO),
+dimensions);
+return GL_TRUE;
+  }
}
 
/* Check border */
@@ -2008,6 +2015,13 @@ copytexsubimage_error_check1( struct gl_context *ctx, 
GLuint dimensions,
  glCopyTexImage%dD(invalid readbuffer), dimensions);
  return GL_TRUE;
   }
+
+  if (ctx-ReadBuffer-Visual.samples  0) {
+_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+glCopyTexSubImage%dD(multisample FBO),
+dimensions);
+return GL_TRUE;
+  }
}
 
/* check target (proxies not allowed) */

commit b178514e24ee7f2f89448b384683fe42fd448c18
Author: Eric Anholt e...@anholt.net
Date:   Wed Jan 11 13:54:53 2012 -0800

mesa: Throw the required error for glReadPixels() from a multisampled FBO.

Fixes piglit EXT_framebuffer_multisample-negative-readpixels.

Reviewed-by: Brian Paul bri...@vmware.com
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 86b7c6707f915b07347070901d602917bc25dd0f)

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 

mesa: Changes to 'upstream-experimental'

[Christopher Halse Rogers]

 Makefile |   34 -
 configure.ac |  115 +++--
 docs/relnotes-7.11.html  |  259 +
 include/GL/glext.h   |   84 
 include/pci_ids/r600_pci_ids.h   |2 
 src/egl/drivers/dri2/egl_dri2.c  |8 
 src/egl/drivers/dri2/egl_dri2.h  |5 
 src/egl/wayland/wayland-drm/protocol/wayland-drm.xml |   27 +
 src/gallium/auxiliary/util/u_format_s3tc.c   |   11 
 src/gallium/auxiliary/util/u_vbuf_mgr.c  |   10 
 src/gallium/drivers/nv50/nv50_formats.c  |   24 -
 src/gallium/drivers/nv50/nv50_miptree.c  |3 
 src/gallium/drivers/nvc0/nvc0_formats.c  |   24 -
 src/gallium/drivers/nvc0/nvc0_miptree.c  |3 
 src/gallium/drivers/nvfx/nvfx_screen.c   |3 
 src/gallium/drivers/r600/evergreen_state.c   |7 
 src/gallium/drivers/r600/evergreend.h|7 
 src/gallium/drivers/r600/r600.h  |   19 
 src/gallium/drivers/r600/r600_query.c|   15 
 src/gallium/drivers/r600/r600_shader.c   |   29 +
 src/gallium/drivers/r600/r600_state.c|2 
 src/gallium/include/pipe/p_config.h  |   13 
 src/gallium/state_trackers/egl/drm/native_drm.c  |2 
 src/gallium/state_trackers/glx/xlib/glx_api.c|9 
 src/gallium/targets/egl-static/Makefile  |   14 
 src/gallium/winsys/i915/drm/i915_drm_buffer.c|2 
 src/gallium/winsys/r600/drm/evergreen_hw_context.c   |1 
 src/gallium/winsys/r600/drm/r600_drm.c   |   10 
 src/gallium/winsys/r600/drm/r600_hw_context.c|  129 --
 src/gallium/winsys/r600/drm/r600d.h  |2 
 src/gbm/main/gbm.h   |9 
 src/glsl/Makefile|3 
 src/glsl/SConscript  |1 
 src/glsl/ast_function.cpp|6 
 src/glsl/ast_to_hir.cpp  |   37 +
 src/glsl/glsl_parser_extras.cpp  |  327 +++-
 src/glsl/glsl_parser_extras.h|   44 +-
 src/glsl/glsl_types.cpp  |   16 
 src/glsl/glsl_types.h|6 
 src/glsl/ir.cpp  |   17 
 src/glsl/ir.h|   34 +
 src/glsl/ir_function.cpp |   32 +
 src/glsl/ir_function_detect_recursion.cpp|  371 +++
 src/glsl/link_functions.cpp  |   22 -
 src/glsl/linker.cpp  |6 
 src/glsl/lower_variable_index_to_cond_assign.cpp |  198 --
 src/glsl/lower_vec_index_to_cond_assign.cpp  |   29 +
 src/glx/dri_common.c |2 
 src/glx/glxext.c |   11 
 src/mesa/drivers/dri/i915/i830_vtbl.c|  157 
 src/mesa/drivers/dri/i915/i915_fragprog.c|   12 
 src/mesa/drivers/dri/i915/i915_program.c |   51 +-
 src/mesa/drivers/dri/i915/i915_state.c   |   82 +---
 src/mesa/drivers/dri/i915/i915_tex_layout.c  |4 
 src/mesa/drivers/dri/i915/i915_vtbl.c|  152 +++
 src/mesa/drivers/dri/i915/intel_tris.c   |   77 +--
 src/mesa/drivers/dri/i965/brw_context.h  |2 
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp|3 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |   16 
 src/mesa/drivers/dri/i965/brw_misc_state.c   |   55 ++
 src/mesa/drivers/dri/i965/brw_state_upload.c |1 
 src/mesa/drivers/dri/i965/brw_vs_emit.c  |   28 +
 src/mesa/drivers/dri/i965/brw_vs_state.c |2 
 src/mesa/drivers/dri/i965/brw_vtbl.c |  104 -
 src/mesa/drivers/dri/i965/brw_wm_emit.c  |   15 
 src/mesa/drivers/dri/i965/brw_wm_fp.c|   45 +-
 src/mesa/drivers/dri/i965/gen6_cc.c  |3 
 src/mesa/drivers/dri/i965/gen6_sampler_state.c   |3 
 src/mesa/drivers/dri/i965/gen6_scissor_state.c   |4 
 src/mesa/drivers/dri/i965/gen6_viewport_state.c  |3 
 src/mesa/drivers/dri/i965/gen6_vs_state.c|   26 +
 src/mesa/drivers/dri/i965/gen7_sf_state.c|   58 +-
 src/mesa/drivers/dri/i965/gen7_wm_state.c|   11 
 src/mesa/drivers/dri/intel/intel_batchbuffer.c   |   34 +
 src/mesa/drivers/dri/intel/intel_buffers.c   |  199 --
 src/mesa/drivers/dri/intel/intel_buffers.h   |9 
 src/mesa/drivers/dri/intel/intel_clear.c |6 
 src/mesa/drivers/dri/intel/intel_context.c   |9 
 

mesa: Changes to 'upstream-experimental'

[Christopher Halse Rogers]

 Makefile|4 
 src/gallium/auxiliary/gallivm/lp_bld_debug.cpp  |   12 +-
 src/gallium/drivers/i915/i915_batch.h   |   18 +++-
 src/gallium/drivers/i915/i915_clear.c   |5 +
 src/gallium/drivers/i915/i915_context.h |2 
 src/gallium/drivers/i915/i915_flush.c   |1 
 src/gallium/drivers/i915/i915_prim_emit.c   |2 
 src/gallium/drivers/i915/i915_prim_vbuf.c   |3 
 src/gallium/drivers/i915/i915_state.c   |2 
 src/gallium/drivers/i915/i915_state_emit.c  |   34 ---
 src/gallium/drivers/i915/i915_winsys.h  |6 +
 src/gallium/drivers/r600/r600.h |3 
 src/gallium/drivers/r600/r600_blit.c|2 
 src/gallium/drivers/r600/r600_query.c   |5 -
 src/gallium/drivers/r600/r600_shader.c  |   45 ++
 src/gallium/winsys/i915/drm/i915_drm_buffer.c   |   10 ++
 src/gallium/winsys/r600/drm/r600_hw_context.c   |   24 +++--
 src/glsl/ast_to_hir.cpp |2 
 src/glsl/ir_print_visitor.cpp   |   10 ++
 src/glsl/linker.cpp |  108 
 src/glsl/lower_if_to_cond_assign.cpp|4 
 src/glsl/opt_constant_propagation.cpp   |   17 +++
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c |7 -
 src/mesa/main/version.h |2 
 src/mesa/program/ir_to_mesa.cpp |   28 ++
 src/mesa/state_tracker/st_format.c  |   35 ++-
 26 files changed, 273 insertions(+), 118 deletions(-)

New commits:
commit b033f050fd5179b051181a0a4b6d94110624d25c
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jul 8 18:47:21 2011 -0700

mesa: Fix the parsers build rule so that 'make tarballs' can work

You'd think that with all the commit messages about adding stuff to
tarballs or fixing 'make tarballs' that someone would have noticed
that it was completely broken for 4 months (3158cc7).

diff --git a/Makefile b/Makefile
index 09b1e98..abdeb79 100644
--- a/Makefile
+++ b/Makefile
@@ -463,7 +463,7 @@ parsers: configure
-@touch $(TOP)/configs/current
$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
-   $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c 
program_parse.tab.h
+   $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c 
program/program_parse.tab.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(LIB_NAME).tar.gz \

commit c66982f7dcb3670b4bb8f19290dd0d74c84ab600
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jul 8 18:26:39 2011 -0700

mesa: Bump version to 7.11-rc1

diff --git a/Makefile b/Makefile
index 131e578..09b1e98 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.11-devel
+VERSION=7.11-rc1
 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 2e63358..0ce78aa 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 11
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING 7.11-devel
+#define MESA_VERSION_STRING 7.11-rc1
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a)  16) + ((b)  8) + (c))

commit 530c68d616dd2fb9fc5252f41877d5587fbaff17
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Thu Jun 2 12:42:48 2011 -0700

glsl: Fix depth unbalancing problem in if-statement flattening

Previously, if max_depth were 1, the following code would see the
first if-statement (correctly) not get flattened, but the second
if-statement would (incorrectly) get flattened:

void main()
{
if (a)
gl_Position = vec4(0);

if (b)
gl_Position = vec4(1);
}

This is because the visit_leave(ir_if*) method would not decrement the
depth before returning on the first if-statement.

NOTE: This is a candidate for the 7.10 and 7.11 branches.

Reviewed-by: Kenneth Graunke kenn...@whitecape.org
(cherry picked from commit d2c6cef18aa37d197eb323a0795969d271d02819)

diff --git a/src/glsl/lower_if_to_cond_assign.cpp 
b/src/glsl/lower_if_to_cond_assign.cpp
index e3a1065..b637eb4 100644
--- a/src/glsl/lower_if_to_cond_assign.cpp
+++ b/src/glsl/lower_if_to_cond_assign.cpp
@@ -149,11 +149,9 @@ ir_visitor_status
 ir_if_to_cond_assign_visitor::visit_leave(ir_if *ir)
 {
/* Only flatten when beyond the GPU's maximum supported nesting depth. */
-   if (this-depth = this-max_depth)
+   if (this-depth-- = this-max_depth)
   return visit_continue;
 
-   this-depth--;
-
bool found_control_flow = false;
ir_variable *cond_var;
ir_assignment *assign;

commit 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

 src/egl/drivers/glx/egl_glx.c |   26 
 src/egl/main/eglapi.c |   30 +
 src/egl/main/eglapi.h |   30 +
 src/egl/main/eglarray.c   |   28 +
 src/egl/main/eglarray.h   |   28 +
 src/egl/main/eglcompiler.h|   29 +
 src/egl/main/eglconfig.c  |   42 +
 src/egl/main/eglconfig.h  |   30 +
 src/egl/main/eglcontext.c |   30 +
 src/egl/main/eglcontext.h |   30 +
 src/egl/main/eglcurrent.c |   28 +
 src/egl/main/eglcurrent.h |   28 +
 src/egl/main/egldefines.h |   25 
 src/egl/main/egldisplay.c |   30 +
 src/egl/main/egldisplay.h |   30 +
 src/egl/main/egldriver.c  |   30 +
 src/egl/main/egldriver.h  |   30 +
 src/egl/main/eglfallbacks.c   |   28 +
 src/egl/main/eglglobals.c |   30 +
 src/egl/main/eglglobals.h |   30 +
 src/egl/main/eglimage.c   |   29 +
 src/egl/main/eglimage.h   |   29 +
 src/egl/main/egllog.c |   30 +
 src/egl/main/egllog.h |   29 +
 src/egl/main/eglmisc.c|   26 
 src/egl/main/eglmisc.h|   26 
 src/egl/main/eglmode.c|   30 +
 src/egl/main/eglmode.h|   30 +
 src/egl/main/eglmutex.h   |   28 +
 src/egl/main/eglscreen.c  |   30 +
 src/egl/main/eglscreen.h  |   30 +
 src/egl/main/eglstring.c  |   30 +
 src/egl/main/eglstring.h  |   30 +
 src/egl/main/eglsurface.c |   30 +
 src/egl/main/eglsurface.h |   30 +
 src/egl/main/eglsync.c|   28 +
 src/egl/main/eglsync.h|   28 +
 src/egl/main/egltypedefs.h|   30 +
 src/gallium/drivers/r600/r600.h   |1 
 src/gallium/drivers/r600/r600_pipe.c  |3 
 src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp |   33 -
 src/gallium/state_trackers/egl/common/egl_g3d.c   |   29 -
 src/gallium/state_trackers/egl/common/native.h|   26 
 src/gallium/state_trackers/egl/drm/native_drm.c   |   26 
 src/gallium/state_trackers/egl/drm/native_drm.h   |2 
 src/gallium/state_trackers/egl/fbdev/native_fbdev.c   |  384 +++---
 src/gallium/state_trackers/egl/gdi/native_gdi.c   |   58 +-
 src/gallium/state_trackers/egl/wayland/native_drm.c   |   11 
 src/gallium/state_trackers/egl/wayland/native_shm.c   |   12 
 src/gallium/state_trackers/egl/wayland/native_wayland.c   |   20 
 src/gallium/state_trackers/egl/wayland/native_wayland.h   |7 
 src/gallium/state_trackers/egl/x11/native_dri2.c  |   15 
 src/gallium/state_trackers/egl/x11/native_x11.c   |   20 
 src/gallium/state_trackers/egl/x11/native_x11.h   |6 
 src/gallium/state_trackers/egl/x11/native_ximage.c|   56 +-
 src/gallium/targets/egl-static/Makefile   |   10 
 src/gallium/targets/egl-static/st_GL.c|3 
 src/gallium/targets/gbm/Makefile  |   31 -
 src/gallium/winsys/r600/drm/r600_hw_context.c |4 
 src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.c |   71 +-
 src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.h |9 
 src/mesa/drivers/dri/i965/gen7_urb.c  |2 
 src/mesa/state_tracker/st_cb_drawpixels.c |4 
 src/mesa/state_tracker/st_cb_texture.c|4 
 64 files changed, 1519 insertions(+), 443 deletions(-)

New commits:
commit e4cef07b87e42a2fbd944bec3374e88e2b5b32d5
Author: Chia-I Wu o...@lunarg.com
Date:   Sat Jul 2 17:57:30 2011 +0900

egl: add copyright notices

The list of copyright holders could be incomplete.  Please update
directly or notify me if your name is missing.
(cherry picked from commit f2001df508fda599a18b3586d2775e970a3db13a)

diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c
index c3c11c7..7cf8f4d 100644
--- a/src/egl/drivers/glx/egl_glx.c
+++ b/src/egl/drivers/glx/egl_glx.c
@@ -1,8 +1,10 @@
 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Makefile|   14 
 configs/autoconf.in |   10 
 configs/default |   14 
 configure.ac|  505 +++-
 docs/egl.html   |   45 -
 docs/opengles.html  |   19 
 docs/openvg.html|   10 
 docs/relnotes-7.11.html |2 
 include/EGL/eglplatform.h   |6 
 include/GL/internal/dri_interface.h |5 
 src/egl/drivers/dri2/Makefile   |9 
 src/egl/drivers/dri2/egl_dri2.c |   78 +-
 src/egl/drivers/dri2/egl_dri2.h |   16 
 src/egl/drivers/dri2/platform_drm.c |   99 ++-
 src/egl/drivers/dri2/platform_wayland.c |  143 +++-
 src/egl/drivers/dri2/platform_x11.c |9 
 src/egl/main/Makefile   |4 
 src/egl/wayland/wayland-drm/wayland-drm.c   |4 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp   |4 
 src/gallium/auxiliary/indices/u_unfilled_gen.py |4 
 src/gallium/auxiliary/indices/u_unfilled_indices.c  |7 
 src/gallium/auxiliary/util/u_vbuf_mgr.c |   58 -
 src/gallium/auxiliary/util/u_vbuf_mgr.h |   12 
 src/gallium/drivers/i915/Makefile   |1 
 src/gallium/drivers/i915/SConscript |1 
 src/gallium/drivers/i915/i915_clear.c   |2 
 src/gallium/drivers/i915/i915_context.c |   23 
 src/gallium/drivers/i915/i915_context.h |3 
 src/gallium/drivers/i915/i915_fpc_translate.c   |2 
 src/gallium/drivers/i915/i915_query.c   |   85 ++
 src/gallium/drivers/i915/i915_query.h   |   36 +
 src/gallium/drivers/i915/i915_resource.c|4 
 src/gallium/drivers/i915/i915_resource.h|   12 
 src/gallium/drivers/i915/i915_resource_texture.c|  201 +-
 src/gallium/drivers/i915/i915_screen.c  |   11 
 src/gallium/drivers/i915/i915_screen.h  |6 
 src/gallium/drivers/i915/i915_state.c   |3 
 src/gallium/drivers/i915/i915_state_emit.c  |   73 ++
 src/gallium/drivers/i915/i915_state_sampler.c   |2 
 src/gallium/drivers/i915/i915_state_static.c|9 
 src/gallium/drivers/nouveau/nouveau_screen.c|   14 
 src/gallium/drivers/nouveau/nouveau_screen.h|2 
 src/gallium/drivers/nv50/nv50_context.c |8 
 src/gallium/drivers/nv50/nv50_context.h |2 
 src/gallium/drivers/nv50/nv50_screen.h  |2 
 src/gallium/drivers/nv50/nv50_vbo.c |   15 
 src/gallium/drivers/nvc0/nvc0_context.c |8 
 src/gallium/drivers/nvc0/nvc0_context.h |2 
 src/gallium/drivers/nvc0/nvc0_screen.h  |2 
 src/gallium/drivers/nvc0/nvc0_vbo.c |   15 
 src/gallium/drivers/nvfx/nvfx_context.c |   16 
 src/gallium/drivers/nvfx/nvfx_screen.c  |7 
 src/gallium/drivers/nvfx/nvfx_screen.h  |1 
 src/gallium/drivers/r300/r300_render.c  |  102 +--
 src/gallium/drivers/r300/r300_texture.c |   21 
 src/gallium/drivers/r600/eg_state_inlines.h |1 
 src/gallium/drivers/r600/evergreen_state.c  |8 
 src/gallium/drivers/r600/r600_asm.c |2 
 src/gallium/drivers/r600/r600_blit.c|3 
 src/gallium/drivers/r600/r600_pipe.c|8 
 src/gallium/drivers/r600/r600_pipe.h|   15 
 src/gallium/drivers/r600/r600_shader.c  |  200 --
 src/gallium/drivers/r600/r600_shader.h  |2 
 src/gallium/drivers/r600/r600_state.c   |   59 +
 src/gallium/drivers/r600/r600_state_common.c|  101 +--
 src/gallium/drivers/r600/r600_texture.c |   11 
 src/gallium/drivers/r600/r600d.h|3 
 src/gallium/state_trackers/dri/drm/dri2.c   |   19 
 src/gallium/state_trackers/egl/Makefile |3 
 src/gallium/state_trackers/egl/SConscript   |4 
 src/gallium/state_trackers/egl/common/egl_g3d.c |   18 
 src/gallium/state_trackers/egl/common/egl_g3d.h |8 
 src/gallium/state_trackers/egl/common/egl_g3d_api.c |   14 
 src/gallium/state_trackers/egl/common/egl_g3d_image.c   |   70 --
 src/gallium/state_trackers/egl/common/egl_g3d_loader.h  |1 
 src/gallium/state_trackers/egl/common/native.h  |3 
 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit 2fe39b46e73aea37152777fe11d489e0b1bc3f92
Author: Vadim Girlin vadimgir...@gmail.com
Date:   Fri Jun 17 23:02:01 2011 +0400

r600g: fix LIT to handle src==dst properly

Current LIT implementation uses dst components for storing temp
results, possibly overwriting still needed values (depends on the
swizzles).
This patch uses temp reg for one of such cases (found in etqw) and
fixes LIT R.z, R.xyzz.

Tested on evergreen. Fixes some etqw-demo rendering glitches when
Lighting is set to High in the settings.

Signed-off-by: Vadim Girlin vadimgir...@gmail.com
Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
index 0995dd5..0268108 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1366,7 +1366,9 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
memset(alu, 0, sizeof(struct r600_bc_alu));
alu.inst = 
CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_CLAMPED);
r600_bc_src(alu.src[0], ctx-src[0], 1);
-   tgsi_dst(ctx, inst-Dst[0], 2, alu.dst);
+   alu.dst.sel = ctx-temp_reg;
+   alu.dst.chan = 2;
+   alu.dst.write = 1;
alu.last = 1;
r = r600_bc_add_alu(ctx-bc, alu);
if (r)

commit 8ab1c5328b12e8b075f62599a84672024aaf2982
Author: Vadim Girlin vadimgir...@gmail.com
Date:   Fri Jun 17 23:02:00 2011 +0400

r600g: fix RSQ to use abs value of operand on evergreen

fixes https://bugs.freedesktop.org/show_bug.cgi?id=36917

Signed-off-by: Vadim Girlin vadimgir...@gmail.com
Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
index b8a86b0..0995dd5 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -3266,7 +3266,7 @@ static struct r600_shader_tgsi_instruction 
eg_shader_tgsi_instruction[] = {
{TGSI_OPCODE_MOV,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, 
tgsi_op2},
{TGSI_OPCODE_LIT,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, 
tgsi_lit},
{TGSI_OPCODE_RCP,   0, 
EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE, tgsi_trans_srcx_replicate},
-   {TGSI_OPCODE_RSQ,   0, 
EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_IEEE, tgsi_trans_srcx_replicate},
+   {TGSI_OPCODE_RSQ,   0, 
EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_IEEE, tgsi_rsq},
{TGSI_OPCODE_EXP,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, 
tgsi_exp},
{TGSI_OPCODE_LOG,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, 
tgsi_log},
{TGSI_OPCODE_MUL,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL, 
tgsi_op2},

commit a916d4279a2c8daac832f77b84aff66f33b590a3
Author: Vadim Girlin vadimgir...@gmail.com
Date:   Fri Jun 17 23:01:59 2011 +0400

r600g: fix source box in r600_resource_copy_region

Source box needs to be adjusted for blitting from compressed formats.

fixes https://bugs.freedesktop.org/show_bug.cgi?id=35434

Signed-off-by: Vadim Girlin vadimgir...@gmail.com
Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/gallium/drivers/r600/r600_blit.c 
b/src/gallium/drivers/r600/r600_blit.c
index 043c875..e858ea2 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -294,6 +294,7 @@ static void r600_resource_copy_region(struct pipe_context 
*ctx,
 {
struct r600_resource_texture *rsrc = (struct r600_resource_texture*)src;
struct texture_orig_info orig_info[2];
+   struct pipe_box sbox, *psbox;
boolean restore_orig[2];
 
/* Fallback for buffers. */
@@ -311,7 +312,15 @@ static void r600_resource_copy_region(struct pipe_context 
*ctx,
if (util_format_is_compressed(src-format)) {
r600_compressed_to_blittable(src, src_level, orig_info[0]);
restore_orig[0] = TRUE;
-   }
+   sbox.x = util_format_get_nblocksx(orig_info[0].format, 
src_box-x);
+   sbox.y = util_format_get_nblocksy(orig_info[0].format, 
src_box-y);
+   sbox.z = src_box-z;
+   sbox.width = util_format_get_nblocksx(orig_info[0].format, 
src_box-width);
+   sbox.height = util_format_get_nblocksy(orig_info[0].format, 
src_box-height);
+   sbox.depth = src_box-depth;
+   psbox=sbox;
+   } else
+   psbox=src_box;
 
if (util_format_is_compressed(dst-format)) {
r600_compressed_to_blittable(dst, dst_level, orig_info[1]);
@@ -322,7 +331,7 @@ static void r600_resource_copy_region(struct pipe_context 
*ctx,
}
 
r600_hw_copy_region(ctx, dst, dst_level, 

mesa: Changes to 'upstream-experimental'

[Christopher Halse Rogers]

 Makefile  |2 
 configs/autoconf.in   |3 
 configs/default   |5 
 configs/linux-dri |2 
 configs/linux-llvm|2 
 configure.ac  |   14 
 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/SConscript|1 
 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/nv50/nv50_tgsi_to_nc.c|2 
 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/builtins/tools/generate_builtins.py  |   10 
 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 
 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit 7a3f869a475ff9c605f5a29db08768bd5fc4fb34
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jan 7 14:09:03 2011 -0800

mesa: set version string to 7.10

diff --git a/Makefile b/Makefile
index 3026919..d62ec43 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.10-devel
+VERSION=7.10
 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 1b53508..c726428 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 0
-#define MESA_VERSION_STRING 7.10-devel
+#define MESA_VERSION_STRING 7.10
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a)  16) + ((b)  8) + (c))

commit c18447bf97d20deb570216045d4ba5ec9c251392
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jan 7 14:07:22 2011 -0800

docs: Update 7.10 release notes

diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html
index 1f5570d..2abbc4a 100644
--- a/docs/relnotes-7.10.html
+++ b/docs/relnotes-7.10.html
@@ -8,7 +8,7 @@
 
 body bgcolor=#ee
 
-H1Mesa 7.10 Release Notes / tbd/H1
+H1Mesa 7.10 Release Notes / January 7, 2011/H1
 
 p
 Mesa 7.10 is a new development release.
@@ -38,19 +38,2751 @@ tbd
 liGL_ARB_texture_rg (Intel, software drivers, gallium drivers).
 liGL_EXT_separate_shader_objects extension (Intel and software drivers).
 liGL_NV_primitive_restart extension (Gallium softpipe, llvmpipe).
+liNew fragment shader back-end for i965-class hardware.
+liSupport for Sandybridge chipset in i965 DRI driver.
 /ul
 
 
 h2Bug fixes/h2
+pThis list is likely incomplete./p
 ul
-litbd/li
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=28800;Bug 28800/a 
- [r300c, r300g] Texture corruption with World of Warcraft/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=29420;Bug 29420/a 
- Amnesia / HPL2 RendererFeatTest - not rendering correctly/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=29946;Bug 29946/a 
- [swrast] piglit valgrind glsl-array-bounds-04 fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30261;Bug 30261/a 
- [GLSL 1.20] allowing inconsistent invariant declaration between two vertex 
shaders/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30632;Bug 30632/a 
- [softpipe] state_tracker/st_manager.c:489: 
st_context_notify_invalid_framebuffer: Assertion `stfb amp;amp; 
stfb-gt;iface == stfbi' failed./li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30694;Bug 30694/a 
- wincopy will crash on Gallium drivers when going to front buffer/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30771;Bug 30771/a 
-  [r600g] vert-tex glsl demo/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30787;Bug 30787/a 
- Invalid asm shader does not generate draw-time error when used with GLSL 
shader/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30974;Bug 30974/a 
- [llvmpipe] SIGABRT src/gallium/drivers/llvmpipe/lp_state_fs.c:779/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30993;Bug 30993/a 
- getFramebufferAttachmentParameteriv wrongly generates error/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31101;Bug 31101/a 
-  [glsl2] abort() in ir_validate::visit_enter(ir_assignment *ir)/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31193;Bug 31193/a 
-  [regression] aa43176e break water reflections/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31194;Bug 31194/a 
- The mesa meta save/restore code doesn't ref the current GLSL program/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31371;Bug 31371/a 
- glslparsertest: ir.cpp:358: ir_constant::ir_constant(const glsl_type*, const 
ir_constant_data*): Assertion `(type-base_type gt;= 0) amp;amp; 
(type-base_type lt;= 3)' failed./li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31439;Bug 31439/a 
- Crash in glBufferSubData() with size == 0/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31495;Bug 31495/a 
- [i965 gles2c bisected] OpenGL ES 2.0 conformance GL2Tests_GetBIFD_input.run 
regressed/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31514;Bug 31514/a 
- isBuffer returns true for unbound buffers/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31560;Bug 31560/a 
- [tdfx] tdfx_tex.c:702: error: ‘const struct gl_color_table’ has no member 
named ‘Format’/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31617;Bug 31617/a 
- Radeon/Compiz: 'failed to attach dri2 front buffer', error case not 
handled/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31648;Bug 31648/a 
-  [GLSL] array-struct-array gets assertion: `(size gt;= 1)  (size lt;= 4)' 
failed./li
+
+lia 

mesa: Changes to 'upstream-experimental'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit 7a3f869a475ff9c605f5a29db08768bd5fc4fb34
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jan 7 14:09:03 2011 -0800

mesa: set version string to 7.10

diff --git a/Makefile b/Makefile
index 3026919..d62ec43 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.10-devel
+VERSION=7.10
 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 1b53508..c726428 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 0
-#define MESA_VERSION_STRING 7.10-devel
+#define MESA_VERSION_STRING 7.10
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a)  16) + ((b)  8) + (c))

commit c18447bf97d20deb570216045d4ba5ec9c251392
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jan 7 14:07:22 2011 -0800

docs: Update 7.10 release notes

diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html
index 1f5570d..2abbc4a 100644
--- a/docs/relnotes-7.10.html
+++ b/docs/relnotes-7.10.html
@@ -8,7 +8,7 @@
 
 body bgcolor=#ee
 
-H1Mesa 7.10 Release Notes / tbd/H1
+H1Mesa 7.10 Release Notes / January 7, 2011/H1
 
 p
 Mesa 7.10 is a new development release.
@@ -38,19 +38,2751 @@ tbd
 liGL_ARB_texture_rg (Intel, software drivers, gallium drivers).
 liGL_EXT_separate_shader_objects extension (Intel and software drivers).
 liGL_NV_primitive_restart extension (Gallium softpipe, llvmpipe).
+liNew fragment shader back-end for i965-class hardware.
+liSupport for Sandybridge chipset in i965 DRI driver.
 /ul
 
 
 h2Bug fixes/h2
+pThis list is likely incomplete./p
 ul
-litbd/li
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=28800;Bug 28800/a 
- [r300c, r300g] Texture corruption with World of Warcraft/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=29420;Bug 29420/a 
- Amnesia / HPL2 RendererFeatTest - not rendering correctly/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=29946;Bug 29946/a 
- [swrast] piglit valgrind glsl-array-bounds-04 fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30261;Bug 30261/a 
- [GLSL 1.20] allowing inconsistent invariant declaration between two vertex 
shaders/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30632;Bug 30632/a 
- [softpipe] state_tracker/st_manager.c:489: 
st_context_notify_invalid_framebuffer: Assertion `stfb amp;amp; 
stfb-gt;iface == stfbi' failed./li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30694;Bug 30694/a 
- wincopy will crash on Gallium drivers when going to front buffer/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30771;Bug 30771/a 
-  [r600g] vert-tex glsl demo/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30787;Bug 30787/a 
- Invalid asm shader does not generate draw-time error when used with GLSL 
shader/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30974;Bug 30974/a 
- [llvmpipe] SIGABRT src/gallium/drivers/llvmpipe/lp_state_fs.c:779/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=30993;Bug 30993/a 
- getFramebufferAttachmentParameteriv wrongly generates error/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31101;Bug 31101/a 
-  [glsl2] abort() in ir_validate::visit_enter(ir_assignment *ir)/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31193;Bug 31193/a 
-  [regression] aa43176e break water reflections/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31194;Bug 31194/a 
- The mesa meta save/restore code doesn't ref the current GLSL program/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31371;Bug 31371/a 
- glslparsertest: ir.cpp:358: ir_constant::ir_constant(const glsl_type*, const 
ir_constant_data*): Assertion `(type-base_type gt;= 0) amp;amp; 
(type-base_type lt;= 3)' failed./li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31439;Bug 31439/a 
- Crash in glBufferSubData() with size == 0/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31495;Bug 31495/a 
- [i965 gles2c bisected] OpenGL ES 2.0 conformance GL2Tests_GetBIFD_input.run 
regressed/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31514;Bug 31514/a 
- isBuffer returns true for unbound buffers/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31560;Bug 31560/a 
- [tdfx] tdfx_tex.c:702: error: ‘const struct gl_color_table’ has no member 
named ‘Format’/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31617;Bug 31617/a 
- Radeon/Compiz: 'failed to attach dri2 front buffer', error case not 
handled/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=31648;Bug 31648/a 
-  [GLSL] array-struct-array gets assertion: `(size gt;= 1)  (size lt;= 4)' 
failed./li
+
+lia 

mesa: Changes to 'upstream-experimental'

[Julien Cristau]

 Makefile  |6 
 src/egl/drivers/dri2/egl_dri2.c   |   14 
 src/egl/main/eglcontext.c |   21 
 src/egl/main/egldriver.h  |2 
 src/gallium/drivers/llvmpipe/lp_bld_depth.c   |2 
 src/gallium/drivers/r300/r300_chipset.c   |1 
 src/gallium/drivers/r300/r300_chipset.h   |2 
 src/gallium/drivers/r300/r300_context.c   |   17 
 src/gallium/drivers/r300/r300_context.h   |4 
 src/gallium/drivers/r300/r300_reg.h   |2 
 src/gallium/drivers/r300/r300_render.c|3 
 src/gallium/drivers/r300/r300_screen.c|3 
 src/gallium/drivers/r300/r300_state.c |   72 
 src/gallium/drivers/r300/r300_state_derived.c |  109 -
 src/gallium/drivers/r300/r300_texture.c   |   19 
 src/gallium/drivers/r300/r300_texture.h   |6 
 src/gallium/drivers/r300/r300_texture_desc.c  |   52 
 src/gallium/drivers/r300/r300_texture_desc.h  |2 
 src/gallium/state_trackers/egl/Makefile   |2 
 src/gallium/state_trackers/egl/x11/native_x11.h   |1 
 src/gallium/state_trackers/vega/api_context.c |7 
 src/gallium/targets/Makefile.dri  |2 
 src/gallium/targets/dri-vmwgfx/Makefile   |1 
 src/gallium/targets/dri-vmwgfx/vmw_powf.c |   17 
 src/gallium/winsys/radeon/drm/radeon_drm.h|  209 ++
 src/glsl/Makefile |3 
 src/glsl/SConscript   |3 
 src/glsl/ast_function.cpp |2 
 src/glsl/ast_to_hir.cpp   |  127 +
 src/glsl/builtin_types.h  |4 
 src/glsl/builtins/tools/generate_builtins.py  |   16 
 src/glsl/glcpp/glcpp-lex.c|4 
 src/glsl/glcpp/glcpp-lex.l|4 
 src/glsl/glcpp/glcpp-parse.c  |  409 +---
 src/glsl/glcpp/glcpp-parse.h  |7 
 src/glsl/glcpp/glcpp-parse.y  |9 
 src/glsl/glcpp/glcpp.c|8 
 src/glsl/glsl_lexer.cpp   | 1021 +-
 src/glsl/glsl_lexer.lpp   |   13 
 src/glsl/glsl_parser.cpp  |   20 
 src/glsl/glsl_parser.h|6 
 src/glsl/glsl_parser_extras.cpp   |1 
 src/glsl/ir.cpp   |  190 +
 src/glsl/ir.h |   33 
 src/glsl/ir_algebraic.cpp |4 
 src/glsl/ir_constant_expression.cpp   |  111 -
 src/glsl/ir_dead_functions.cpp|2 
 src/glsl/ir_function_can_inline.cpp   |2 
 src/glsl/ir_lower_jumps.cpp   |   19 
 src/glsl/ir_optimization.h|2 
 src/glsl/ir_set_program_inouts.cpp|   35 
 src/glsl/linker.cpp   |  218 +-
 src/glsl/loop_analysis.cpp|1 
 src/glsl/loop_controls.cpp|3 
 src/glsl/loop_unroll.cpp  |  125 -
 src/glsl/lower_discard.cpp|  198 +
 src/glsl/main.cpp |   34 
 src/glsl/opt_discard_simplification.cpp   |  180 +
 src/glsl/s_expression.cpp |2 
 src/glsl/s_expression.h   |1 
 src/glsl/strtod.c |   56 
 src/glsl/strtod.h |   43 
 src/mesa/Makefile |4 
 src/mesa/drivers/common/meta.c|   32 
 src/mesa/drivers/dri/i915/i915_fragprog.c |6 
 src/mesa/drivers/dri/i965/brw_disasm.c|2 
 src/mesa/drivers/dri/i965/brw_eu_emit.c   |   10 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |   17 
 src/mesa/drivers/dri/i965/brw_program.c   |   12 
 src/mesa/drivers/dri/i965/brw_structs.h   |   12 
 

mesa: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 7f2d1280e7d0770bde0f42885e1830a680847879
Author: Alex Deucher alexdeuc...@gmail.com
Date:   Wed Oct 27 14:30:50 2010 -0400

r600c: add missing radeon_prepare_render() call on evergreen

diff --git a/src/mesa/drivers/dri/r600/evergreen_render.c 
b/src/mesa/drivers/dri/r600/evergreen_render.c
index 27089bf..1fa53d7 100644
--- a/src/mesa/drivers/dri/r600/evergreen_render.c
+++ b/src/mesa/drivers/dri/r600/evergreen_render.c
@@ -909,6 +909,10 @@ static void evergreenDrawPrims(GLcontext *ctx,
 {
GLboolean retval = GL_FALSE;
 
+   context_t *context = EVERGREEN_CONTEXT(ctx);
+   radeonContextPtr radeon = context-radeon;
+   radeon_prepare_render(radeon);
+
/* This check should get folded into just the places that
 * min/max index are really needed.
 */

commit 075640e37efe10d10fbbf5a596a18356820f2776
Author: Alex Deucher alexdeuc...@gmail.com
Date:   Wed Oct 27 13:53:29 2010 -0400

r100: revalidate after radeon_update_renderbuffers

This is a port of 603741a86df0e43c0b52e8c202a35c7fe2fc1d9c
to r100.

Signed-off-by: Alex Deucher alexdeuc...@gmail.com

diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c 
b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
index 29defe7..0a81843 100644
--- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
@@ -412,6 +412,8 @@ static GLboolean radeon_run_render( GLcontext *ctx,
   return GL_TRUE;  
 
radeon_prepare_render(rmesa-radeon);
+   if (rmesa-radeon.NewGLState)
+  radeonValidateState( ctx );
 
tnl-Driver.Render.Start( ctx );
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c 
b/src/mesa/drivers/dri/radeon/radeon_tcl.c
index 5e1718f..ded3ebe 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c
@@ -253,6 +253,8 @@ void radeonTclPrimitive( GLcontext *ctx,
GLuint newprim = hw_prim | RADEON_CP_VC_CNTL_TCL_ENABLE;
 
radeon_prepare_render(rmesa-radeon);
+   if (rmesa-radeon.NewGLState)
+  radeonValidateState( ctx );
 
if (newprim != rmesa-tcl.hw_primitive ||
!discrete_prim[hw_prim0xf]) {

commit fb7a09578506289ac27d3d07e890786d41fca083
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Thu Oct 14 22:08:03 2010 +0200

mesa: Make sure we have the talloc cflags when using the talloc headers

Signed-off-by: Thomas Hellstrom thellst...@vmware.com

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index c41c38c..7a6936e 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -34,7 +34,7 @@ ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)
 ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES)
 
 # append include dirs
-MESA_CPPFLAGS += $(INCLUDE_DIRS)
+MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS)
 ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS)
 ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS)
 

commit f245bb4c9cf58170365df4a1845aadbee2386685
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Tue Oct 19 11:44:08 2010 +0200

st/xorg: Fix compilation for Xservers = 1.10

Signed-off-by: Thomas Hellstrom thellst...@vmware.com

diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c 
b/src/gallium/state_trackers/xorg/xorg_driver.c
index 2d71a5e..1ec772d 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -45,6 +45,7 @@
 #include miscstruct.h
 #include dixstruct.h
 #include xf86xv.h
+#include xorgVersion.h
 #ifndef XSERVER_LIBPCIACCESS
 #error libpciaccess needed
 #endif
@@ -1182,6 +1183,8 @@ drv_bind_front_buffer_kms(ScrnInfoPtr pScrn)
stride,
ptr);
 
+#if (XORG_VERSION_CURRENT  XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+
 /* This a hack to work around EnableDisableFBAccess setting the pointer
  * the real fix would be to replace pScrn-EnableDisableFBAccess hook
  * and set the rootPixmap-devPrivate.ptr to something valid before that.
@@ -1191,6 +1194,8 @@ drv_bind_front_buffer_kms(ScrnInfoPtr pScrn)
  */
 pScrn-pixmapPrivate.ptr = ptr;
 
+#endif
+
 return TRUE;
 
 err_destroy:

commit cc71f76be2db0fed2f69f998960dd70e0daf5b4b
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Tue Oct 19 11:25:15 2010 +0200

xorg/vmwgfx: Don't use deprecated x*alloc / xfree functions

Signed-off-by: Thomas Hellstrom thellst...@vmware.com

diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_ctrl.c 
b/src/gallium/targets/xorg-vmwgfx/vmw_ctrl.c
index 9c075b5..9b422e6 100644
--- a/src/gallium/targets/xorg-vmwgfx/vmw_ctrl.c
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_ctrl.c
@@ -212,7 +212,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
struct vmw_customizer *vmw = vmw_customizer(xorg_customizer(pScrn));
int i;
 
-   rects = xcalloc(number, sizeof(*rects));
+   rects = calloc(number, sizeof(*rects));
if (!rects)
   return FALSE;
 
@@ -225,7 +225,7