rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 314401 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/314401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=244
This commit is contained in:
Stephan Kulow 2015-07-05 15:58:30 +00:00 committed by Git OBS Bridge
commit b417ae1618
8 changed files with 117 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Mesa.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Mon Jun 29 14:13:43 UTC 2015 - mimi.vx@gmail.com
- adjust libdrm dependencies
-------------------------------------------------------------------
Mon Jun 29 10:09:24 UTC 2015 - sndirsch@suse.com
- Update to version 10.6.1
* This release includes core mesa and glsl patches (amonst which
a Dota2 Reborn bugfix) affecting all dri drivers, nouveau specific
fixes and a selection of shared-glapi commits - from build fixes, to
ones ensuring that the dri modules can be loaded.
-------------------------------------------------------------------
Tue Jun 23 14:26:17 UTC 2015 - sndirsch@suse.com
- n_Fixed-build-against-wayland-1.2.1.patch
* required to fix build with wayland on openSUSE 13.1
-------------------------------------------------------------------
Mon Jun 15 14:19:06 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
- Update to version 10.6.0:
- New GL/EGL Features:
+ GL_AMD_pinned_memory on r600, radeonsi
+ GL_ARB_clip_control on i965
+ GL_ARB_depth_buffer_float on freedreno
+ GL_ARB_depth_clamp on freedreno
+ GL_ARB_direct_state_access on all drivers for Core GL contexts.
+ GL_ARB_draw_indirect, GL_ARB_multi_draw_indirect on r600
+ GL_ARB_draw_instanced on freedreno
+ GL_ARB_gpu_shader_fp64 on nvc0, softpipe
+ GL_ARB_gpu_shader5 on i965/gen8+
+ GL_ARB_instanced_arrays on freedreno
+ GL_ARB_pipeline_statistics_query on i965, nv50, nvc0, r600, radeonsi, softpipe
+ GL_ARB_program_interface_query (all drivers)
+ GL_ARB_texture_stencil8 on nv50, nvc0, r600, radeonsi, softpipe
+ GL_ARB_texture_view on llvmpipe, softpipe
+ GL_ARB_uniform_buffer_object on freedreno
+ GL_ARB_vertex_attrib_64bit on nvc0, softpipe
+ GL_ARB_viewport_array, GL_AMD_vertex_shader_viewport_index on i965/gen6
+ GL_EXT_draw_buffers2 on freedreno
+ GL_OES_EGL_sync on all drivers
+ EGL_KHR_fence_sync on i965, freedreno, nv50, nvc0, r600, radeonsi
+ EGL_KHR_wait_sync on i965, freedreno, nv50, nvc0, r600, radeonsi
+ EGL_KHR_cl_event2 on freedreno, nv50, nvc0, r600, radeonsi
+ GL_AMD_performance_monitor on nvc0
- Changes to package:
+ add --enable-shader-cache to configure options
+ remove Patch100: U_0001_gallium_include_util_macros.patch
+ remove Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch
+ remove Patch102: U_0003_fix_build_after_macro_include.patch
-------------------------------------------------------------------
Mon Jun 8 23:10:43 UTC 2015 - zaitor@opensuse.org

23
Mesa.spec
View File

@ -18,7 +18,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 10.5.7
%define _version 10.6.1
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
%define gallium_loader 1
%else
@ -37,7 +37,7 @@
%define with_nine 1
%endif
Name: Mesa
Version: 10.5.7
Version: 10.6.1
Release: 0
Summary: System for rendering interactive 3-D graphics
License: MIT
@ -48,15 +48,14 @@ Source2: baselibs.conf
Source3: README.updates
Source4: manual-pages.tar.bz2
Source6: %{name}-rpmlintrc
# required for building against wayland of openSUSE 13.1
Patch0: n_Fixed-build-against-wayland-1.2.1.patch
# to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# Patch from Fedora, fix 16bpp in llvmpipe
Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
Patch100: U_0001_gallium_include_util_macros.patch
Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch
Patch102: U_0003_fix_build_after_macro_include.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison
@ -75,11 +74,12 @@ BuildRequires: python-xml
BuildRequires: pkgconfig(dri2proto)
BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(libdrm) >= 2.4.30
BuildRequires: pkgconfig(libdrm) >= 2.4.38
BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.41
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56
BuildRequires: pkgconfig(libkms) >= 1.0.0
BuildRequires: pkgconfig(libudev) > 151
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(presentproto)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
@ -109,7 +109,7 @@ BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.57
%endif
%ifarch x86_64 %ix86
BuildRequires: libelf-devel
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.52
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.60
%endif
%if 0%{?suse_version} >= 1310
BuildRequires: pkgconfig(wayland-client)
@ -511,16 +511,16 @@ This package contains the VDPAU state tracker for radeonsi.
%setup -q -n %{_name_archive}-%{_version} -b4
# remove some docs
rm -rf docs/README.{VMS,WIN32,OS2}
%if 0%{?suse_version} < 1320
# required for building against wayland of openSUSE 13.1
%patch0 -p1
%endif
### disabled, but not dropped yet; these still need investigation in
### order to figure out whether the issue is still reproducable and
### hence a fix is required
#%patch11 -p1
#%patch15 -p1
#%patch13 -p1
###
%patch100 -p1
%patch101 -p1
%patch102 -p1
%build
%if 0%{?suse_version} >= 1310
@ -540,6 +540,7 @@ autoreconf -fvi
--enable-texture-float \
--enable-osmesa \
--enable-dri3 \
--enable-shader-cache \
%{?with_nine:--enable-nine} \
%if %{glamor}
--enable-gbm \

89
U_0001_gallium_include_util_macros.patch
View File

@ -1,89 +0,0 @@
From 984f3069370cd4a347cb38269d430b428385affd Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Thu, 12 Feb 2015 18:31:40 +0100
Subject: gallium: include util/macros.h
The most common macros are defined there, no use to duplicate these
Clean up the already redefinded macros
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index fb018bf..cc4f444 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -33,6 +33,8 @@
#include "p_config.h"
+#include "util/macros.h"
+
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
@@ -204,61 +206,6 @@ void _ReadWriteBarrier(void);
#endif
-
-/* You should use these macros to mark if blocks where the if condition
- * is either likely to be true, or unlikely to be true.
- *
- * This will inform human readers of this fact, and will also inform
- * the compiler, who will in turn inform the CPU.
- *
- * CPUs often start executing code inside the if or the else blocks
- * without knowing whether the condition is true or not, and will have
- * to throw the work away if they find out later they executed the
- * wrong part of the if.
- *
- * If these macros are used, the CPU is more likely to correctly predict
- * the right path, and will avoid speculatively executing the wrong branch,
- * thus not throwing away work, resulting in better performance.
- *
- * In light of this, it is also a good idea to mark as "likely" a path
- * which is not necessarily always more likely, but that will benefit much
- * more from performance improvements since it is already much faster than
- * the other path, or viceversa with "unlikely".
- *
- * Example usage:
- * if(unlikely(do_we_need_a_software_fallback()))
- * do_software_fallback();
- * else
- * render_with_gpu();
- *
- * The macros follow the Linux kernel convention, and more examples can
- * be found there.
- *
- * Note that profile guided optimization can offer better results, but
- * needs an appropriate coverage suite and does not inform human readers.
- */
-#ifndef likely
-# if defined(__GNUC__)
-# define likely(x) __builtin_expect(!!(x), 1)
-# define unlikely(x) __builtin_expect(!!(x), 0)
-# else
-# define likely(x) (x)
-# define unlikely(x) (x)
-# endif
-#endif
-
-
-/**
- * Static (compile-time) assertion.
- * Basically, use COND to dimension an array. If COND is false/zero the
- * array size will be -1 and we'll get a compilation error.
- */
-#define STATIC_ASSERT(COND) \
- do { \
- (void) sizeof(char [1 - 2*!(COND)]); \
- } while (0)
-
-
#if defined(__cplusplus)
}
#endif
--
cgit v0.10.2

24
U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch
View File

@ -1,24 +0,0 @@
From 98ae01c82294882b1fddcd03adf24101b4f24d4f Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Thu, 12 Feb 2015 18:31:41 +0100
Subject: st/nine: Mark end of non-void function unreachable
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h
index 17844d5..b8e728e 100644
--- a/src/gallium/state_trackers/nine/nine_pipe.h
+++ b/src/gallium/state_trackers/nine/nine_pipe.h
@@ -222,7 +222,7 @@ d3d9_get_pipe_depth_format_bindings(D3DFORMAT format)
case D3DFMT_DF24:
case D3DFMT_INTZ:
return PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_SAMPLER_VIEW;
- default: assert(0);
+ default: unreachable("Unexpected format");
}
}
--
cgit v0.10.2

24
U_0003_fix_build_after_macro_include.patch
View File

@ -1,24 +0,0 @@
From 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Feb 2015 13:47:58 +0000
Subject: r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd
Same as for the CLAMP macro, undef it before including a header file that
tries to make fields with that name.
diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h
index 6d3dc4d..072d8f8 100644
--- a/src/gallium/drivers/r600/sb/sb_bc.h
+++ b/src/gallium/drivers/r600/sb/sb_bc.h
@@ -784,7 +784,7 @@ public: \
// CLAMP macro defined elsewhere interferes with bytecode field name
#undef CLAMP
-
+#undef ARRAY_SIZE
#include "sb_bc_fmt_def.inc"
#undef BC_FORMAT_BEGIN
--
cgit v0.10.2

3
mesa-10.5.7.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04d06890cd69af8089d6ca76f40e46dcf9cacfe4a9788b32be620574d4638818
size 6992848

3
mesa-10.6.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb
size 7035216

48
n_Fixed-build-against-wayland-1.2.1.patch Normal file
View File

@ -0,0 +1,48 @@
From 968a11158031d5d51e63f18cf4cddea7ae23177f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Tue, 23 Jun 2015 16:43:51 +0200
Subject: [PATCH] Fixed build against wayland 1.2.1
Wayland 1.2.1 still lacks definition of WL_SHM_FORMAT_RGB565 format.
---
src/egl/drivers/dri2/platform_wayland.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index ea2f9f2..4351e08 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1236,9 +1236,6 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp)
static int
dri2_wl_swrast_get_stride_for_format(int format, int w)
{
- if (format == WL_SHM_FORMAT_RGB565)
- return 2 * w;
- else /* ARGB8888 || XRGB8888 */
return 4 * w;
}
@@ -1672,9 +1669,7 @@ dri2_wl_swrast_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list))
goto cleanup_surf;
- if (conf->RedSize == 5)
- dri2_surf->format = WL_SHM_FORMAT_RGB565;
- else if (conf->AlphaSize == 0)
+ if (conf->AlphaSize == 0)
dri2_surf->format = WL_SHM_FORMAT_XRGB8888;
else
dri2_surf->format = WL_SHM_FORMAT_ARGB8888;
@@ -1728,9 +1723,6 @@ shm_handle_format(void *data, struct wl_shm *shm, uint32_t format)
case WL_SHM_FORMAT_XRGB8888:
dri2_dpy->formats |= HAS_XRGB8888;
break;
- case WL_SHM_FORMAT_RGB565:
- dri2_dpy->formats |= HAS_RGB565;
- break;
}
}
--
1.8.4.5