Accepting request 198228 from home:tobijk:X11:XOrg
remove upstreamed patches OBS-URL: https://build.opensuse.org/request/show/198228 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=318
This commit is contained in:
Git OBS Bridge
parent
f40122da29
commit
33ee3c1779
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 10 13:02:29 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
|
||||||
|
|
||||||
|
- Drop upstreamed patches as proposed by Johannes Obermayr:
|
||||||
|
+ Patch14: u_mesa-glapi_dispatch.patch
|
||||||
|
Upstream: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ea43e6
|
||||||
|
+ Patch17: u_mesa-9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch
|
||||||
|
Upstream: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dfea55
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 9 09:59:50 UTC 2013 - duwe@suse.com
|
Mon Sep 9 09:59:50 UTC 2013 - duwe@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -107,13 +107,10 @@ Source6: %name-rpmlintrc
|
|||||||
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
|
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
|
||||||
# Patch from Fedora, fix 16bpp in llvmpipe
|
# Patch from Fedora, fix 16bpp in llvmpipe
|
||||||
Patch13: u_mesa-8.0.1-fix-16bpp.patch
|
Patch13: u_mesa-8.0.1-fix-16bpp.patch
|
||||||
# Patch to fix glapi_dispatch include
|
|
||||||
Patch14: u_mesa-glapi_dispatch.patch
|
|
||||||
# Patch from Fedora, use shmget when available, under llvmpipe
|
# Patch from Fedora, use shmget when available, under llvmpipe
|
||||||
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
|
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
|
||||||
# PATCH-FIX-UPSTREAM gallium-egl-gbm-use-wayland-cflags.patch -- use pkgconfig for finding wayland
|
# PATCH-FIX-UPSTREAM gallium-egl-gbm-use-wayland-cflags.patch -- use pkgconfig for finding wayland
|
||||||
Patch16: u_gallium-egl-gbm-use-wayland-cflags.patch
|
Patch16: u_gallium-egl-gbm-use-wayland-cflags.patch
|
||||||
Patch17: u_mesa-9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch
|
|
||||||
Patch18: u_wayland-egl-pc-require-wayland.patch
|
Patch18: u_wayland-egl-pc-require-wayland.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -533,12 +530,10 @@ poor video quality, choppy videos and artefacts all over.
|
|||||||
rm -rf docs/README.{VMS,WIN32,OS2}
|
rm -rf docs/README.{VMS,WIN32,OS2}
|
||||||
#%patch11 -p1
|
#%patch11 -p1
|
||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
%patch14 -p1
|
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%if %egl_gallium
|
%if %egl_gallium
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch17 -p1
|
|
||||||
%patch18 -p1
|
%patch18 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|||||||
@ -1,81 +0,0 @@
|
|||||||
From 1547bb37e97c8d7069d5be4e8b9b0d34ac28f7e1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= <marcheu@chromium.org>
|
|
||||||
Date: Tue, 17 Apr 2012 18:17:35 -0700
|
|
||||||
Subject: [PATCH 2/2] i965: Make sure we do render between two hiz flushes
|
|
||||||
|
|
||||||
Hiz flushes touch the URB allocation, which doesn't work if you don't
|
|
||||||
draw in between. This includes on startup where the GPU hasn't been
|
|
||||||
used and we lockup. To avoid this situation make sure that some
|
|
||||||
primitives get rendered before every hiz flush.
|
|
||||||
---
|
|
||||||
src/mesa/drivers/dri/i965/brw_context.c | 1 +
|
|
||||||
src/mesa/drivers/dri/i965/brw_context.h | 1 +
|
|
||||||
src/mesa/drivers/dri/i965/brw_draw.c | 12 +++++++++---
|
|
||||||
3 files changed, 11 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
Index: mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_context.c
|
|
||||||
===================================================================
|
|
||||||
--- mesa-9.1.98.01.orig/src/mesa/drivers/dri/i965/brw_context.c
|
|
||||||
+++ mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_context.c
|
|
||||||
@@ -410,6 +410,7 @@ brwCreateContext(int api,
|
|
||||||
brw->urb.max_gs_entries = 256;
|
|
||||||
}
|
|
||||||
brw->urb.gen6_gs_previously_active = false;
|
|
||||||
+ brw->urb.prims_since_last_flush = 0;
|
|
||||||
} else if (brw->gen == 5) {
|
|
||||||
brw->urb.size = 1024;
|
|
||||||
brw->max_vs_threads = 72;
|
|
||||||
Index: mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_context.h
|
|
||||||
===================================================================
|
|
||||||
--- mesa-9.1.98.01.orig/src/mesa/drivers/dri/i965/brw_context.h
|
|
||||||
+++ mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_context.h
|
|
||||||
@@ -1000,6 +1000,7 @@ struct brw_context
|
|
||||||
* URB space for the GS.
|
|
||||||
*/
|
|
||||||
bool gen6_gs_previously_active;
|
|
||||||
+ int prims_since_last_flush;
|
|
||||||
} urb;
|
|
||||||
|
|
||||||
|
|
||||||
Index: mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_draw.c
|
|
||||||
===================================================================
|
|
||||||
--- mesa-9.1.98.01.orig/src/mesa/drivers/dri/i965/brw_draw.c
|
|
||||||
+++ mesa-9.1.98.01/src/mesa/drivers/dri/i965/brw_draw.c
|
|
||||||
@@ -294,10 +294,14 @@ static void brw_merge_inputs( struct brw
|
|
||||||
* Resolve the depth buffer's HiZ buffer and resolve the depth buffer of each
|
|
||||||
* enabled depth texture.
|
|
||||||
*
|
|
||||||
+ * We don't resolve the depth buffer's HiZ if no primitives have been drawn
|
|
||||||
+ * since the last flush. This avoids a case where we lockup the GPU on boot
|
|
||||||
+ * when this is the first thing we do.
|
|
||||||
+ *
|
|
||||||
* (In the future, this will also perform MSAA resolves).
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
-brw_predraw_resolve_buffers(struct brw_context *brw)
|
|
||||||
+brw_predraw_resolve_buffers(struct brw_context *brw, int nr_prims)
|
|
||||||
{
|
|
||||||
struct gl_context *ctx = &brw->ctx;
|
|
||||||
struct intel_renderbuffer *depth_irb;
|
|
||||||
@@ -305,9 +309,11 @@ brw_predraw_resolve_buffers(struct brw_c
|
|
||||||
|
|
||||||
/* Resolve the depth buffer's HiZ buffer. */
|
|
||||||
depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH);
|
|
||||||
- if (depth_irb)
|
|
||||||
+ if (depth_irb && brw->urb.prims_since_last_flush > 0 )
|
|
||||||
intel_renderbuffer_resolve_hiz(brw, depth_irb);
|
|
||||||
|
|
||||||
+ brw->urb.prims_since_last_flush = nr_prims;
|
|
||||||
+
|
|
||||||
/* Resolve depth buffer of each enabled depth texture, and color buffer of
|
|
||||||
* each fast-clear-enabled color texture.
|
|
||||||
*/
|
|
||||||
@@ -390,7 +396,7 @@ static bool brw_try_draw_prims( struct g
|
|
||||||
* and finalizing textures but before setting up any hardware state for
|
|
||||||
* this draw call.
|
|
||||||
*/
|
|
||||||
- brw_predraw_resolve_buffers(brw);
|
|
||||||
+ brw_predraw_resolve_buffers(brw, nr_prims);
|
|
||||||
|
|
||||||
/* Bind all inputs, derive varying and size information:
|
|
||||||
*/
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
commit f00ab2e655d442c2004cb9e3ba6cec1cfe812f9b
|
|
||||||
Author: Dinar Valeev <dvaleev@suse.com>
|
|
||||||
Date: Thu Mar 21 17:31:35 2013 +0100
|
|
||||||
|
|
||||||
fix #bfo56710 glapi_dispatch inclide
|
|
||||||
|
|
||||||
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=56710
|
|
||||||
Patch by Matt Turner (mattst88 at gmail.com)
|
|
||||||
|
|
||||||
diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
|
|
||||||
index be65ebe..5a0897e 100644
|
|
||||||
--- a/src/mapi/glapi/glapi_dispatch.c
|
|
||||||
+++ b/src/mapi/glapi/glapi_dispatch.c
|
|
||||||
@@ -86,7 +86,7 @@
|
|
||||||
#ifdef GLX_INDIRECT_RENDERING
|
|
||||||
/* those link to libglapi.a should provide the entry points */
|
|
||||||
#define _GLAPI_SKIP_PROTO_ENTRY_POINTS
|
|
||||||
-#endif
|
|
||||||
#include "glapi/glapitemp.h"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#endif /* USE_X86_ASM */
|
|
||||||
Loading…
Reference in New Issue
Block a user