mesa: Changes to 'ubuntu+1'
Makefile.am | 4
VERSION | 2
configure.ac | 151 -
debian/changelog | 16
debian/control | 12
debian/libgl1-mesa-glx-i686.install.in | 1
debian/not-installed | 2
debian/rules | 3
docs/GL3.txt | 6
docs/index.html | 6
docs/relnotes.html | 1
docs/relnotes/10.6.5.html | 124
docs/relnotes/11.0.0.html | 7
include/GL/glext.h | 294 ++
src/egl/drivers/dri2/platform_drm.c | 10
src/egl/drivers/dri2/platform_wayland.c | 4
src/gallium/auxiliary/tgsi/tgsi_text.c | 23
src/gallium/auxiliary/util/u_blitter.c | 54
src/gallium/auxiliary/util/u_blitter.h | 3
src/gallium/auxiliary/util/u_surface.c | 3
src/gallium/drivers/freedreno/a3xx/fd3_format.c | 11
src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c | 2
src/gallium/drivers/freedreno/a3xx/fd3_texture.c | 2
src/gallium/drivers/freedreno/freedreno_context.c | 4
src/gallium/drivers/freedreno/freedreno_fence.c | 25
src/gallium/drivers/freedreno/freedreno_fence.h | 5
src/gallium/drivers/freedreno/freedreno_resource.c | 8
src/gallium/drivers/freedreno/ir3/ir3_ra.c | 2
src/gallium/drivers/i915/i915_surface.c | 3
src/gallium/drivers/nouveau/Makefile.sources | 3
src/gallium/drivers/nouveau/codegen/nv50_ir.h | 8
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp | 1
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp | 2
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp | 4
src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 12
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 4
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h | 4
src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 253 +
src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 5
src/gallium/drivers/nouveau/codegen/unordered_set.h | 48
src/gallium/drivers/nouveau/nouveau_compiler.c | 4
src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c | 3
src/gallium/drivers/r300/r300_blit.c | 3
src/gallium/drivers/r600/r600_blit.c | 3
src/gallium/drivers/r600/r600_isa.h | 2
src/gallium/drivers/r600/r600_pipe.h | 4
src/gallium/drivers/r600/r600_shader.c | 30
src/gallium/drivers/r600/r600_shader.h | 20
src/gallium/drivers/r600/r600_state_common.c | 42
src/gallium/drivers/radeon/radeon_uvd.c | 5
src/gallium/drivers/radeonsi/si_blit.c | 3
src/gallium/drivers/radeonsi/si_shader.c | 19
src/gallium/drivers/vc4/vc4_context.h | 1
src/gallium/drivers/vc4/vc4_opt_algebraic.c | 33
src/gallium/drivers/vc4/vc4_opt_copy_propagation.c | 22
src/gallium/drivers/vc4/vc4_opt_vpm_writes.c | 18
src/gallium/drivers/vc4/vc4_program.c | 96
src/gallium/drivers/vc4/vc4_qir.c | 38
src/gallium/drivers/vc4/vc4_qir.h | 47
src/gallium/drivers/vc4/vc4_qpu.h | 7
src/gallium/drivers/vc4/vc4_qpu_disasm.c | 16
src/gallium/drivers/vc4/vc4_qpu_emit.c | 63
src/gallium/drivers/vc4/vc4_register_allocate.c | 42
src/gallium/include/pipe/p_state.h | 1
src/gallium/state_trackers/clover/llvm/invocation.cpp | 33
src/gallium/state_trackers/nine/adapter9.c | 38
src/gallium/state_trackers/nine/basetexture9.c | 46
src/gallium/state_trackers/nine/basetexture9.h | 6
src/gallium/state_trackers/nine/cubetexture9.c | 27
src/gallium/state_trackers/nine/device9.c | 436 ++-
src/gallium/state_trackers/nine/device9.h | 13
src/gallium/state_trackers/nine/nine_ff.c | 381 +-
src/gallium/state_trackers/nine/nine_ff.h | 81
src/gallium/state_trackers/nine/nine_pipe.c | 42
src/gallium/state_trackers/nine/nine_pipe.h | 67
src/gallium/state_trackers/nine/nine_shader.c | 307 ++
src/gallium/state_trackers/nine/nine_shader.h | 49
src/gallium/state_trackers/nine/nine_state.c | 1324 +++++-----
src/gallium/state_trackers/nine/nine_state.h | 64
src/gallium/state_trackers/nine/pixelshader9.c | 42
src/gallium/state_trackers/nine/pixelshader9.h | 57
src/gallium/state_trackers/nine/resource9.c | 20
src/gallium/state_trackers/nine/stateblock9.c | 2
src/gallium/state_trackers/nine/surface9.c | 213 -
src/gallium/state_trackers/nine/surface9.h | 14
src/gallium/state_trackers/nine/swapchain9.c | 23
src/gallium/state_trackers/nine/texture9.c | 31
src/gallium/state_trackers/nine/vertexshader9.c | 33
src/gallium/state_trackers/nine/vertexshader9.h | 34
src/gallium/state_trackers/nine/volume9.c | 193 -
src/gallium/state_trackers/nine/volume9.h | 19
src/gallium/state_trackers/nine/volumetexture9.c | 18
src/gallium/targets/d3dadapter9/Makefile.am | 1
src/gallium/targets/d3dadapter9/description.c | 324 ++
src/gallium/targets/d3dadapter9/drm.c | 76
src/gallium/targets/dri/Android.mk | 4
src/gallium/targets/opencl/.gitignore | 1
src/gallium/winsys/amdgpu/drm/Android.mk | 10
src/gallium/winsys/amdgpu/drm/Makefile.sources | 2
src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4
src/gallium/winsys/sw/kms-dri/Makefile.am | 2
src/gbm/main/backend.c | 4
src/glsl/ast_array_index.cpp | 15
src/glsl/ast_to_hir.cpp | 82
src/glsl/builtin_functions.cpp | 265 +-
src/glsl/builtin_types.cpp | 26
src/glsl/builtin_variables.cpp | 24
src/glsl/glcpp/glcpp-parse.y | 3
src/glsl/glsl_lexer.ll | 34
src/glsl/glsl_parser.yy | 96
src/glsl/glsl_parser_extras.cpp | 3
src/glsl/glsl_parser_extras.h | 9
src/glsl/link_uniform_initializers.cpp | 29
src/glsl/linker.cpp | 2
src/glsl/lower_subroutine.cpp | 2
src/glsl/nir/glsl_to_nir.cpp | 21
src/glsl/nir/nir_intrinsics.h | 2
src/glsl/nir/nir_lower_io.c | 81
src/glsl/nir/nir_opt_algebraic.py | 2
src/glsl/opt_constant_propagation.cpp | 45
src/glsl/shader_enums.h | 98
src/glx/dri_common.c | 3
src/glx/dri_common_query_renderer.c | 2
src/glx/glxext.c | 3
src/mapi/glapi/gen/Makefile.am | 1
src/mesa/drivers/dri/common/drirc | 2
src/mesa/drivers/dri/common/utils.c | 2
src/mesa/drivers/dri/i965/brw_conditional_render.c | 6
src/mesa/drivers/dri/i965/brw_context.c | 2
src/mesa/drivers/dri/i965/brw_draw.c | 4
src/mesa/drivers/dri/i965/brw_draw_upload.c | 11
src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 45
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 12
src/mesa/drivers/dri/i965/brw_primitive_restart.c | 2
src/mesa/drivers/dri/i965/brw_queryobj.c | 19
src/mesa/drivers/dri/i965/brw_shader.cpp | 4
src/mesa/drivers/dri/i965/brw_state_cache.c | 2
src/mesa/drivers/dri/i965/brw_tex_layout.c | 2
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 21
src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp | 7
src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 2
src/mesa/drivers/dri/i965/brw_wm_state.c | 2
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 8
src/mesa/drivers/dri/i965/gen6_vs_state.c | 2
src/mesa/drivers/dri/i965/gen7_sol_state.c | 2
src/mesa/drivers/dri/i965/gen8_draw_upload.c | 2
src/mesa/drivers/dri/i965/intel_extensions.c | 1
src/mesa/drivers/dri/i965/intel_fbo.c | 4
src/mesa/drivers/dri/i965/intel_screen.c | 8
src/mesa/main/extensions.c | 8
src/mesa/main/fbobject.c | 10
src/mesa/main/format_info.py | 10
src/mesa/main/formats.c | 6
src/mesa/main/formats.h | 6
src/mesa/main/get_hash_params.py | 2
src/mesa/main/mtypes.h | 121
src/mesa/main/multisample.c | 9
src/mesa/main/shaderapi.c | 109
src/mesa/main/shaderimage.c | 110
src/mesa/main/shaderimage.h | 6
src/mesa/main/texcompress.c | 30
src/mesa/main/teximage.c | 31
src/mesa/main/texobj.c | 5
src/mesa/main/texparam.c | 6
src/mesa/main/texstorage.c | 17
src/mesa/main/texstorage.h | 21
src/mesa/main/uniform_query.cpp | 4
src/mesa/state_tracker/st_cb_blit.c | 1
src/mesa/state_tracker/st_cb_texture.c | 27
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 14
src/util/Makefile.am | 7
src/util/Makefile.sources | 4
src/util/SConscript | 5
src/util/bitset.h | 36
src/util/mesa-sha1.c | 316 --
src/util/mesa-sha1.h | 53
src/util/register_allocate.c | 62
src/util/register_allocate.h | 4
src/util/rounding.h | 3
179 files changed, 4991 insertions(+), 2767 deletions(-)
New commits:
commit 1c84f52315bf371637bf91863113b65d3f66424d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Aug 24 12:33:36 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 41abcd9..1b5ab26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mesa (11.0.0~git20150817-1ubuntu1) UNRELEASED; urgency=medium
+mesa (11.0.0~rc1-1ubuntu1) UNRELEASED; urgency=medium
- * Merge from unreleased debian git.
+ * Merge from Debian.
* egl-platform-mir.patch: Updated.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 19 Aug 2015 11:11:45 +0300
commit 40f54df0b611b958c5aed0d716f66167682104e0
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Aug 24 11:19:17 2015 +0300
release to experimental
diff --git a/debian/changelog b/debian/changelog
index 63b8c8b..cd40081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.0~rc1-1) UNRELEASED; urgency=medium
+mesa (11.0.0~rc1-1) experimental; urgency=medium
[ Andreas Boll ]
* New upstream release candidate.
@@ -14,7 +14,7 @@ mesa (11.0.0~rc1-1) UNRELEASED; urgency=medium
* control: Bump llvm/libclang build-deps to match versions where
amdgpu is enabled.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 18 Aug 2015 16:25:44 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 24 Aug 2015 11:15:16 +0300
mesa (11.0.0~git20150817-1) experimental; urgency=medium
commit 269f8261885040295dcdbbe4727b52b72691442a
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Sat Aug 22 16:42:32 2015 +0200
Drop irrelevant change from changelog
We dropped the swx11 builds.
diff --git a/debian/changelog b/debian/changelog
index c523e53..63b8c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ mesa (11.0.0~rc1-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
* New upstream release candidate.
- * rules: Disable omx for swx11 builds.
* control: Drop unneeded libomxil-bellagio-dev build-dep.
* rules: Explicitly disable vaapi (Closes: #789100).
* control: Update upstream url.
commit ebbe1d5b9e7a1a2808823aaae364373e070dbaae
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Sat Aug 22 16:09:39 2015 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 4170e3c..c523e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-mesa (11.0.0~git20150817-2) UNRELEASED; urgency=medium
+mesa (11.0.0~rc1-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
+ * New upstream release candidate.
* rules: Disable omx for swx11 builds.
* control: Drop unneeded libomxil-bellagio-dev build-dep.
* rules: Explicitly disable vaapi (Closes: #789100).
commit ab94875352c47d3815d78166ee9826af6b17b143
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat Aug 22 11:55:47 2015 +0100
Update version to 11.0.0-rc1
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/VERSION b/VERSION
index 2b1181d..69d3cd2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0-devel
+11.0.0-rc1
commit f077632030425f820ebe96144b436e35259e06ab
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Feb 28 12:12:22 2015 -0800
Revert SHA1 additions.
The shader-cache isn't finished, so the configure checks are a bit
premature and will only stand to confuse users of Mesa 11.0.
This is a squash of the follow four reverts:
Revert "Rename sha1.c and sha1.h to mesa-sha1.c and mesa-sha1.h"
Revert "configure: Add machinery for --enable-shader-cache (and --disable-shader-cache)"
Revert "sha1: Fix gcry_md_hd_t typo."
Revert "mesa: Add mesa SHA-1 functions"
Reviewed-by: Carl Worth <cworth@cworth.org>
diff --git a/configure.ac b/configure.ac
index e3b5f2e..a6499fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,6 @@ dnl Copyright © 2009-2014 Jon TURNEY
dnl Copyright © 2011-2012 Benjamin Franzke
dnl Copyright © 2008-2014 David Airlie
dnl Copyright © 2009-2013 Brian Paul
-dnl Copyright © 2003-2007 Keith Packard, Daniel Stone
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -988,144 +987,6 @@ fi
AC_SUBST([MESA_LLVM])
-# SHA1 hashing
-AC_ARG_WITH([sha1],
- [AS_HELP_STRING([--with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
- [choose SHA1 implementation])])
-case "x$with_sha1" in
-x | xlibc | xlibmd | xlibnettle | xlibgcrypt | xlibcrypto | xlibsha1 | xCommonCrypto | xCryptoAPI)
- ;;
-*)
- AC_MSG_ERROR([Illegal value for --with-sha1: $with_sha1])
-esac
-
-AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
- with_sha1=libc
-fi
-if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then
- AC_MSG_ERROR([sha1 in libc requested but not found])
-fi
-if test "x$with_sha1" = xlibc; then
- AC_DEFINE([HAVE_SHA1_IN_LIBC], [1],
- [Use libc SHA1 functions])
- SHA1_LIBS=""
-fi
-AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes])
-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then
- with_sha1=CommonCrypto
-fi
-if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then
- AC_MSG_ERROR([CommonCrypto requested but not found])
-fi
-if test "x$with_sha1" = xCommonCrypto; then
- AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1],
- [Use CommonCrypto SHA1 functions])
- SHA1_LIBS=""
-fi
-dnl stdcall functions cannot be tested with AC_CHECK_LIB
-AC_CHECK_HEADER([wincrypt.h], [HAVE_SHA1_IN_CRYPTOAPI=yes], [], [#include <windows.h>])
-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_CRYPTOAPI" = xyes; then
- with_sha1=CryptoAPI
-fi
-if test "x$with_sha1" = xCryptoAPI && test "x$HAVE_SHA1_IN_CRYPTOAPI" != xyes; then
- AC_MSG_ERROR([CryptoAPI requested but not found])
-fi
-if test "x$with_sha1" = xCryptoAPI; then
- AC_DEFINE([HAVE_SHA1_IN_CRYPTOAPI], [1],
- [Use CryptoAPI SHA1 functions])
- SHA1_LIBS=""
-fi
-AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])
-if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then
- with_sha1=libmd
-fi
-if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then
- AC_MSG_ERROR([libmd requested but not found])
-fi
-if test "x$with_sha1" = xlibmd; then
- AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],
- [Use libmd SHA1 functions])
- SHA1_LIBS=-lmd
-fi
-PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])
-if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
- with_sha1=libsha1
-fi
-if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then
- AC_MSG_ERROR([libsha1 requested but not found])
-fi
-if test "x$with_sha1" = xlibsha1; then
- AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],
- [Use libsha1 for SHA1])
- SHA1_LIBS=-lsha1
-fi
-AC_CHECK_LIB([nettle], [nettle_sha1_init], [HAVE_LIBNETTLE=yes])
-if test "x$with_sha1" = x && test "x$HAVE_LIBNETTLE" = xyes; then
- with_sha1=libnettle
-fi
-if test "x$with_sha1" = xlibnettle && test "x$HAVE_LIBNETTLE" != xyes; then
- AC_MSG_ERROR([libnettle requested but not found])
-fi
-if test "x$with_sha1" = xlibnettle; then
- AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
- [Use libnettle SHA1 functions])
- SHA1_LIBS=-lnettle
-fi
-AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
-if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
- with_sha1=libgcrypt
-fi
-if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then
- AC_MSG_ERROR([libgcrypt requested but not found])
-fi
-if test "x$with_sha1" = xlibgcrypt; then
- AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
- [Use libgcrypt SHA1 functions])
- SHA1_LIBS=-lgcrypt
-fi
-# We don't need all of the OpenSSL libraries, just libcrypto
-AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])
-PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
- [HAVE_OPENSSL_PKC=no])
-if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then
- if test "x$with_sha1" = x; then
- with_sha1=libcrypto
- fi
-else
- if test "x$with_sha1" = xlibcrypto; then
- AC_MSG_ERROR([OpenSSL libcrypto requested but not found])
- fi
-fi
-if test "x$with_sha1" = xlibcrypto; then
- if test "x$HAVE_LIBCRYPTO" = xyes; then
- SHA1_LIBS=-lcrypto
- else
- SHA1_LIBS="$OPENSSL_LIBS"
- SHA1_CFLAGS="$OPENSSL_CFLAGS"
- fi
-fi
-AC_MSG_CHECKING([for SHA1 implementation])
-AC_MSG_RESULT([$with_sha1])
-AC_SUBST(SHA1_LIBS)
-AC_SUBST(SHA1_CFLAGS)
-
-# Allow user to configure out the shader-cache feature
-AC_ARG_ENABLE([shader-cache],
- AS_HELP_STRING([--disable-shader-cache], [Disable binary shader cache]),
- [enable_shader_cache="$enableval"],
- [if test "x$with_sha1" != "x"; then
- enable_shader_cache=yes
- else
- enable_shader_cache=no
- fi])
-if test "x$with_sha1" = "x"; then
- if test "x$enable_shader_cache" = "xyes"; then
- AC_MSG_ERROR([Cannot enable shader cache (no SHA-1 implementation found)])
- fi
-fi
-AM_CONDITIONAL([ENABLE_SHADER_CACHE], [test x$enable_shader_cache = xyes])
-
case "$host_os" in
linux*)
need_pci_id=yes ;;
@@ -2484,12 +2345,6 @@ else
echo " Gallium: no"
fi
-dnl Shader cache
-echo ""
-echo " Shader cache: $enable_shader_cache"
-if test "x$enable_shader_cache" = "xyes"; then
- echo " With SHA1 from: $with_sha1"
-fi
dnl Libraries
echo ""
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1e087b4..8ce5ac1 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -36,7 +36,6 @@ libmesautil_la_CPPFLAGS = \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
- $(SHA1_CFLAGS) \
$(VISIBILITY_CFLAGS) \
$(MSVC2008_COMPAT_CFLAGS)
@@ -44,12 +43,6 @@ libmesautil_la_SOURCES = \
$(MESA_UTIL_FILES) \
$(MESA_UTIL_GENERATED_FILES)
-if ENABLE_SHADER_CACHE
-libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES)
-
-libmesautil_la_LIBADD = $(SHA1_LIBS)
-endif
-
roundeven_test_LDADD = -lm
check_PROGRAMS = u_atomic_test roundeven_test
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 82df3bc..1f5386a 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -1,7 +1,3 @@
-MESA_UTIL_SHADER_CACHE_FILES := \
- mesa-sha1.c \
- mesa-sha1.h
-
MESA_UTIL_FILES := \
bitset.h \
format_srgb.h \
diff --git a/src/util/SConscript b/src/util/SConscript
index 3dbe70a..bd8fb17 100644
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -33,11 +33,6 @@ mesautil_sources = (
source_lists['MESA_UTIL_GENERATED_FILES']
)
-# XXX We don't yet have scons support for detecting any of the various
-# HAVE_SHA1_* definitions, so for now simply disable the shader cache.
-if False:
- mesautil_sources += source_lists['MESA_UTIL_SHADER_CACHE_FILES']
-
mesautil = env.ConvenienceLibrary(
target = 'mesautil',
source = mesautil_sources,
diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c
deleted file mode 100644
index fa28193..0000000
--- a/src/util/mesa-sha1.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Copyright © 2007 Carl Worth
- * Copyright © 2009 Jeremy Huddleston, Julien Cristau, and Matthieu Herrb
- * Copyright © 2009-2010 Mikhail Gusarov
- * Copyright © 2012 Yaakov Selkowitz and Keith Packard
- * Copyright © 2014 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "mesa-sha1.h"
-
-#if defined(HAVE_SHA1_IN_LIBMD) /* Use libmd for SHA1 */ \
- || defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */
-
-#include <sha1.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- SHA1_CTX *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
-
- SHA1Init(ctx);
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- SHA1_CTX *sha1_ctx = (SHA1_CTX *) ctx;
-
- SHA1Update(sha1_ctx, data, size);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- SHA1_CTX *sha1_ctx = (SHA1_CTX *) ctx;
-
- SHA1Final(result, sha1_ctx);
- free(sha1_ctx);
- return 1;
-}
-
-#elif defined(HAVE_SHA1_IN_COMMONCRYPTO) /* Use CommonCrypto for SHA1 */
-
-#include <CommonCrypto/CommonDigest.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- CC_SHA1_CTX *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
-
- CC_SHA1_Init(ctx);
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- CC_SHA1_CTX *sha1_ctx = (CC_SHA1_CTX *) ctx;
-
- CC_SHA1_Update(sha1_ctx, data, size);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- CC_SHA1_CTX *sha1_ctx = (CC_SHA1_CTX *) ctx;
-
- CC_SHA1_Final(result, sha1_ctx);
- free(sha1_ctx);
- return 1;
-}
-
-#elif defined(HAVE_SHA1_IN_CRYPTOAPI) /* Use CryptoAPI for SHA1 */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <wincrypt.h>
-
-static HCRYPTPROV hProv;
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- HCRYPTHASH *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
-
- CryptAcquireContext(&hProv, NULL, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
- CryptCreateHash(hProv, CALG_SHA1, 0, 0, ctx);
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- HCRYPTHASH *hHash = (HCRYPTHASH *) ctx;
-
- CryptHashData(*hHash, data, size, 0);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- HCRYPTHASH *hHash = (HCRYPTHASH *) ctx;
- DWORD len = 20;
-
- CryptGetHashParam(*hHash, HP_HASHVAL, result, &len, 0);
- CryptDestroyHash(*hHash);
- CryptReleaseContext(hProv, 0);
- free(ctx);
- return 1;
-}
-
-#elif defined(HAVE_SHA1_IN_LIBNETTLE) /* Use libnettle for SHA1 */
-
-#include <nettle/sha.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- struct sha1_ctx *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
- sha1_init(ctx);
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- sha1_update((struct sha1_ctx *) ctx, size, data);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- sha1_digest((struct sha1_ctx *) ctx, 20, result);
- free(ctx);
- return 1;
-}
-
-#elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
-
-#include <gcrypt.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- static int init;
- gcry_md_hd_t h;
- gcry_error_t err;
-
- if (!init) {
- if (!gcry_check_version(NULL))
- return NULL;
- gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
- gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
- init = 1;
- }
-
- err = gcry_md_open(&h, GCRY_MD_SHA1, 0);
- if (err)
- return NULL;
- return (struct mesa_sha1 *) h;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- gcry_md_hd_t h = (gcry_md_hd_t) ctx;
-
- gcry_md_write(h, data, size);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- gcry_md_hd_t h = (gcry_md_hd_t) ctx;
-
- memcpy(result, gcry_md_read(h, GCRY_MD_SHA1), 20);
- gcry_md_close(h);
- return 1;
-}
-
-#elif defined(HAVE_SHA1_IN_LIBSHA1) /* Use libsha1 */
-
-#include <libsha1.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- sha1_ctx *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
- sha1_begin(ctx);
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- sha1_hash(data, size, (sha1_ctx *) ctx);
- return 1;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- sha1_end(result, (sha1_ctx *) ctx);
- free(ctx);
- return 1;
-}
-
-#else /* Use OpenSSL's libcrypto */
-
-#include <stddef.h> /* buggy openssl/sha.h wants size_t */
-#include <openssl/sha.h>
-
-struct mesa_sha1 *
-_mesa_sha1_init(void)
-{
- int ret;
- SHA_CTX *ctx = malloc(sizeof(*ctx));
-
- if (!ctx)
- return NULL;
- ret = SHA1_Init(ctx);
- if (!ret) {
- free(ctx);
- return NULL;
- }
- return (struct mesa_sha1 *) ctx;
-}
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
- int ret;
- SHA_CTX *sha_ctx = (SHA_CTX *) ctx;
-
- ret = SHA1_Update(sha_ctx, data, size);
- if (!ret)
- free(sha_ctx);
- return ret;
-}
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
- int ret;
- SHA_CTX *sha_ctx = (SHA_CTX *) ctx;
-
- ret = SHA1_Final(result, (SHA_CTX *) sha_ctx);
- free(sha_ctx);
- return ret;
-}
-
-#endif
-
-void
-_mesa_sha1_compute(const void *data, size_t size, unsigned char result[20])
-{
- struct mesa_sha1 *ctx;
-
- ctx = _mesa_sha1_init();
- _mesa_sha1_update(ctx, data, size);
- _mesa_sha1_final(ctx, result);
-}
-
-char *
-_mesa_sha1_format(char *buf, const unsigned char *sha1)
-{
- static const char hex_digits[] = "0123456789abcdef";
- int i;
-
- for (i = 0; i < 40; i += 2) {
- buf[i] = hex_digits[sha1[i >> 1] >> 4];
- buf[i + 1] = hex_digits[sha1[i >> 1] & 0x0f];
- }
- buf[i] = '\0';
-
- return buf;
-}
diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h
deleted file mode 100644
index 1599405..0000000
--- a/src/util/mesa-sha1.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright © 2014 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SHA1_H
-#define SHA1_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-
-struct mesa_sha1;
-
-struct mesa_sha1 *
-_mesa_sha1_init(void);
-
-int
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size);
-
-int
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20]);
-
-char *
-_mesa_sha1_format(char *buf, const unsigned char *sha1);
-
-void
-_mesa_sha1_compute(const void *data, size_t size, unsigned char result[20]);
-
-#ifdef __cplusplus
-} /* extern C */
-#endif
-
-#endif
commit d7bafcafd329d23ab0c76e3a6ae06277506f50f3
Author: Boyan Ding <boyan.j.ding@gmail.com>
Date: Fri Aug 21 21:44:36 2015 +0800
egl/wayland: define set_cloexec_or_close only when mkostemp is not present
Fixes a compiler warning of defined but not used function when
HAVE_MKOSTEMP is defined.
Fixes: eb3e2562a4b(configure.ac: check for mkostemp())
Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Thomas Helland <thomashelland90@gmail.com>
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index dabaf1eb..dbc64ba 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1227,6 +1227,8 @@ dri2_wl_swrast_get_stride_for_format(int format, int w)
* Taken from weston shared/os-compatibility.c
*/
+#ifndef HAVE_MKOSTEMP
+
static int
set_cloexec_or_close(int fd)
{
@@ -1249,6 +1251,8 @@ err:
return -1;
}
+#endif
+
/*
* Taken from weston shared/os-compatibility.c
*/
commit ec256eceedd0a00b41c2c94d5a32609f0e1870b2
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat Aug 22 12:58:03 2015 +0100
mapi: ship ARB_tessellation_shader.xml
Fixes: e2b59a39cbb(mapi: add ARB_tessellation_shader)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 7d9d1a6..86a9243 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -154,6 +154,7 @@ API_XML = \
ARB_shader_image_load_store.xml \
ARB_shader_subroutine.xml \
ARB_sync.xml \
+ ARB_tessellation_shader.xml \
ARB_texture_barrier.xml \
ARB_texture_buffer_object.xml \
ARB_texture_buffer_range.xml \
commit 79da1b262de0df61c1bf74a55c9b18cd6eeb2fc5
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat Aug 22 12:15:27 2015 +0100
nouveau: add codegen/unordered_set.h to the tarball
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/src/gallium/drivers/nouveau/Makefile.sources b/src/gallium/drivers/nouveau/Makefile.sources
index 3fae3bc..9346ea3 100644
--- a/src/gallium/drivers/nouveau/Makefile.sources
+++ b/src/gallium/drivers/nouveau/Makefile.sources
@@ -121,7 +121,8 @@ NV50_CODEGEN_SOURCES := \
codegen/nv50_ir_target_nv50.cpp \
codegen/nv50_ir_target_nv50.h \
codegen/nv50_ir_util.cpp \
- codegen/nv50_ir_util.h
+ codegen/nv50_ir_util.h \
+ codegen/unordered_set.h
NVC0_CODEGEN_SOURCES := \
codegen/nv50_ir_emit_gk110.cpp \
commit a8f451cd0e06278699fb7139213bbc6c98a9cc52
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri Aug 21 02:01:42 2015 +0100
winsys/sw/kms-dri: don't attempt to bundle the sconscript
The build/file was removed with an earlier commit while the EXTRA_DIST
was forgotten.
Reply to: