From 683155917770af9e63a938bc450df25d1904d567 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 8 May 2014 00:18:25 +0200 Subject: xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014 xserver commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415 xkeyboard-config commit 3e54f31b1f118f00c240f59d72d7ddb685c6db79 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 91f32ce961bc85f98b3372b95681ad8918d24b18 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 399db42a151687f1181ae23d28a76d31125a2853 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit 9ced3fc649ec04710a5f5c855bfb582b898cff83 --- mesalib/SConstruct | 6 - mesalib/VERSION | 2 +- mesalib/common.py | 2 +- mesalib/configure.ac | 19 +- mesalib/docs/GL3.txt | 11 +- mesalib/docs/index.html | 6 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.1.2.html | 179 ++++ mesalib/docs/relnotes/10.2.html | 6 +- mesalib/docs/relnotes/10.3.html | 63 ++ mesalib/include/GL/gl_mangle.h | 371 ++++++++- mesalib/scons/gallium.py | 10 +- mesalib/src/gallium/Automake.inc | 13 +- mesalib/src/gallium/auxiliary/util/u_debug_flush.c | 5 +- mesalib/src/gallium/auxiliary/util/u_math.h | 5 + mesalib/src/glsl/Makefile.am | 11 +- mesalib/src/glsl/ast_to_hir.cpp | 80 ++ mesalib/src/glsl/builtin_types.cpp | 2 +- mesalib/src/glsl/builtin_variables.cpp | 63 +- mesalib/src/glsl/glcpp/glcpp-parse.y | 5 +- mesalib/src/glsl/glsl_parser.yy | 15 +- mesalib/src/glsl/glsl_parser_extras.cpp | 82 +- mesalib/src/glsl/glsl_parser_extras.h | 116 ++- mesalib/src/glsl/ir.cpp | 2 +- mesalib/src/glsl/ir_optimization.h | 4 +- mesalib/src/glsl/link_varyings.cpp | 368 ++++++-- mesalib/src/glsl/linker.cpp | 190 ++++- mesalib/src/glsl/lower_instructions.cpp | 58 ++ mesalib/src/glsl/lower_packed_varyings.cpp | 39 +- mesalib/src/glsl/main.cpp | 6 + mesalib/src/glsl/opt_dead_builtin_varyings.cpp | 7 +- mesalib/src/mapi/glapi/gen/ARB_multi_bind.xml | 53 ++ .../mapi/glapi/gen/EXT_separate_shader_objects.xml | 279 ++++++- .../src/mapi/glapi/gen/INTEL_performance_query.xml | 93 +++ mesalib/src/mapi/glapi/gen/Makefile.am | 2 + mesalib/src/mapi/glapi/gen/gl_API.xml | 6 + mesalib/src/mesa/drivers/common/meta.c | 328 +++++--- mesalib/src/mesa/drivers/common/meta.h | 5 +- mesalib/src/mesa/drivers/common/meta_blit.c | 2 +- .../src/mesa/drivers/common/meta_generate_mipmap.c | 2 +- mesalib/src/mesa/main/bufferobj.c | 923 ++++++++++++++++++++- mesalib/src/mesa/main/bufferobj.h | 21 + mesalib/src/mesa/main/config.h | 8 + mesalib/src/mesa/main/dd.h | 6 +- mesalib/src/mesa/main/dlist.c | 920 +++++++++++++++++++- mesalib/src/mesa/main/errors.c | 6 + mesalib/src/mesa/main/errors.h | 3 + mesalib/src/mesa/main/extensions.c | 7 +- mesalib/src/mesa/main/ff_fragment_shader.cpp | 2 +- mesalib/src/mesa/main/format_unpack.c | 105 +++ mesalib/src/mesa/main/format_unpack.h | 10 +- mesalib/src/mesa/main/get.c | 2 +- mesalib/src/mesa/main/get_hash_params.py | 8 +- mesalib/src/mesa/main/hash.c | 89 +- mesalib/src/mesa/main/hash.h | 9 + mesalib/src/mesa/main/imports.h | 4 +- mesalib/src/mesa/main/mtypes.h | 38 +- mesalib/src/mesa/main/performance_monitor.c | 614 ++++++++++++++ mesalib/src/mesa/main/performance_monitor.h | 43 +- mesalib/src/mesa/main/pipelineobj.c | 13 +- mesalib/src/mesa/main/pipelineobj.h | 4 + mesalib/src/mesa/main/samplerobj.c | 121 +++ mesalib/src/mesa/main/samplerobj.h | 2 + mesalib/src/mesa/main/shader_query.cpp | 71 +- mesalib/src/mesa/main/shaderapi.c | 152 +--- mesalib/src/mesa/main/shaderimage.c | 143 ++++ mesalib/src/mesa/main/shaderimage.h | 3 + mesalib/src/mesa/main/texgetimage.c | 18 +- mesalib/src/mesa/main/texobj.c | 175 +++- mesalib/src/mesa/main/texobj.h | 13 + mesalib/src/mesa/main/texstate.c | 3 + mesalib/src/mesa/main/texstore.c | 174 ++-- mesalib/src/mesa/main/transformfeedback.c | 10 +- mesalib/src/mesa/main/transformfeedback.h | 14 + mesalib/src/mesa/main/uniforms.h | 2 +- mesalib/src/mesa/main/varray.c | 128 ++- mesalib/src/mesa/main/varray.h | 20 + mesalib/src/mesa/state_tracker/st_atom_texture.c | 4 + mesalib/src/mesa/state_tracker/st_extensions.c | 12 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 + mesalib/src/mesa/tnl/t_vertex.c | 14 +- mesalib/src/mesa/vbo/vbo_attrib_tmp.h | 45 +- mesalib/src/mesa/vbo/vbo_rebase.c | 23 +- 83 files changed, 5686 insertions(+), 815 deletions(-) create mode 100644 mesalib/docs/relnotes/10.1.2.html create mode 100644 mesalib/docs/relnotes/10.3.html create mode 100644 mesalib/src/mapi/glapi/gen/ARB_multi_bind.xml create mode 100644 mesalib/src/mapi/glapi/gen/INTEL_performance_query.xml (limited to 'mesalib') diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 0e10818ba..ef71ab69c 100644 --- a/mesalib/SConstruct +++ b/mesalib/SConstruct @@ -80,9 +80,6 @@ env.Append(CPPPATH = [ '#/src/gallium/winsys', ]) -if env['msvc']: - env.Append(CPPPATH = ['#include/c99']) - # for debugging #print env.Dump() @@ -115,9 +112,6 @@ if env['crosscompile'] and not env['embedded']: host_env['hostonly'] = True assert host_env['crosscompile'] == False - if host_env['msvc']: - host_env.Append(CPPPATH = ['#include/c99']) - target_env = env env = host_env Export('env') diff --git a/mesalib/VERSION b/mesalib/VERSION index 6d4f9f483..75a04c3e0 100644 --- a/mesalib/VERSION +++ b/mesalib/VERSION @@ -1 +1 @@ -10.2.0-devel +10.3.0-devel diff --git a/mesalib/common.py b/mesalib/common.py index d6e621545..1d2d586a8 100644 --- a/mesalib/common.py +++ b/mesalib/common.py @@ -101,4 +101,4 @@ def AddOptions(opts): opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes')) opts.Add(BoolOption('texture_float', 'enable floating-point textures and renderbuffers', 'no')) if host_platform == 'windows': - opts.Add(EnumOption('MSVC_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0', '10.0', '11.0', '12.0'))) + opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version') diff --git a/mesalib/configure.ac b/mesalib/configure.ac index bf543c2d0..d6f21ea87 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -28,7 +28,7 @@ AC_SUBST([OSMESA_VERSION]) dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.38 -LIBDRM_RADEON_REQUIRED=2.4.53 +LIBDRM_RADEON_REQUIRED=2.4.54 LIBDRM_INTEL_REQUIRED=2.4.52 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41" @@ -1744,6 +1744,19 @@ gallium_require_drm_loader() { fi } +require_egl_drm() { + case "$with_egl_platforms" in + *drm*) + ;; + *) + AC_MSG_ERROR([--with-egl-platforms=drm is required to build the $1 driver.]) + ;; + esac + if test "x$enable_gbm" != xyes; then + AC_MSG_ERROR([--enable-gbm is required to build the $1 driver.]) + fi +} + radeon_llvm_check() { if test "x$enable_gallium_llvm" != "xyes"; then AC_MSG_ERROR([--enable-gallium-llvm is required when building $1]) @@ -1835,6 +1848,7 @@ if test -n "$with_gallium_drivers"; then gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" radeon_llvm_check "radeonsi" + require_egl_drm "radeonsi" gallium_check_st "radeon/drm" "radeonsi/dri" "" "" "radeonsi/vdpau" "radeonsi/omx" DRICOMMON_NEED_LIBDRM=yes ;; @@ -1843,7 +1857,7 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau" - gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau" "vdpau-nouveau" + gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau" "vdpau-nouveau" "omx-nouveau" DRICOMMON_NEED_LIBDRM=yes ;; xfreedreno) @@ -2086,6 +2100,7 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/xa/Makefile src/gallium/targets/xa/xatracker.pc + src/gallium/targets/omx-nouveau/Makefile src/gallium/targets/osmesa/Makefile src/gallium/targets/osmesa/osmesa.pc src/gallium/targets/pipe-loader/Makefile diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index d8a8894c0..c360f2cb7 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -112,12 +112,13 @@ GL 4.0: - Geometry shader multiple streams not started - Enhanced per-sample shading DONE - Interpolation functions started + - New overload resolution rules not started GL_ARB_gpu_shader_fp64 not started GL_ARB_sample_shading DONE (i965, nv50, nvc0) GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader not started GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, softpipe) - GL_ARB_texture_cube_map_array DONE (i965, nv50, nvc0, r600, softpipe) + GL_ARB_texture_cube_map_array DONE (i965, nv50, nvc0, r600, radeonsi, softpipe) GL_ARB_texture_gather DONE (i965, nv50, nvc0) GL_ARB_transform_feedback2 DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_transform_feedback3 DONE (i965, nv50, nvc0, r600, radeonsi) @@ -128,7 +129,7 @@ GL 4.1: GLSL 4.1 not started GL_ARB_ES2_compatibility DONE (i965, nv50, nvc0, r300, r600, radeonsi) GL_ARB_get_program_binary DONE (0 binary formats) - GL_ARB_separate_shader_objects started (Ian Romanick, Gregory Hainaut) + GL_ARB_separate_shader_objects DONE (all drivers) GL_ARB_shader_precision not started GL_ARB_vertex_attrib_64bit not started GL_ARB_viewport_array DONE (i965, nv50, r600) @@ -169,7 +170,7 @@ GL 4.3: GL_ARB_robust_buffer_access_behavior not started GL_ARB_shader_image_size not started GL_ARB_shader_storage_buffer_object not started - GL_ARB_stencil_texturing DONE (i965/gen8+) + GL_ARB_stencil_texturing DONE (i965/gen8+, nv50, nvc0, r600, radeonsi) GL_ARB_texture_buffer_range DONE (nv50, nvc0, i965, r600, radeonsi) GL_ARB_texture_query_levels DONE (i965) GL_ARB_texture_storage_multisample DONE (all drivers that support GL_ARB_texture_multisample) @@ -181,10 +182,10 @@ GL 4.4: GLSL 4.4 not started GL_MAX_VERTEX_ATTRIB_STRIDE not started - GL_ARB_buffer_storage DONE (i965, r300, r600, radeonsi) + GL_ARB_buffer_storage DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi) GL_ARB_clear_texture not started GL_ARB_enhanced_layouts not started - GL_ARB_multi_bind started (Fredrik Höglund) + GL_ARB_multi_bind DONE (all drivers) GL_ARB_query_buffer_object not started GL_ARB_texture_mirror_clamp_to_edge DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi, swrast) GL_ARB_texture_stencil8 not started diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 186bda28c..cb1846a8f 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,12 @@

News

+

May 5, 2014

+

+Mesa 10.1.2 is released. +This is a bug-fix release. +

+

April 18, 2014

Mesa 10.1.1 is released. diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index b63391879..8ef7bbb81 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.