Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
bff988e34f | ||
|
ab5198c488 | ||
|
f51509ea6c | ||
|
5f56b187c2 | ||
|
ed15998ee1 | ||
|
682526a660 | ||
|
2ee17c410d |
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,6 +3,3 @@
|
||||
.build*
|
||||
/mesa-*.tar.bz2
|
||||
/mesa-*.tar.xz
|
||||
x86_64/
|
||||
results_mesa/
|
||||
mesa-*/
|
||||
|
26
0001-Fix-linkage-against-shared-glapi.patch
Normal file
26
0001-Fix-linkage-against-shared-glapi.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed, 12 Oct 2016 13:41:33 -0400
|
||||
Subject: [PATCH] Fix linkage against shared glapi
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
src/gallium/targets/osmesa/Makefile.am | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
|
||||
index 5d39486..04add87 100644
|
||||
--- a/src/gallium/targets/osmesa/Makefile.am
|
||||
+++ b/src/gallium/targets/osmesa/Makefile.am
|
||||
@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
|
||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
|
||||
- $(top_builddir)/src/mapi/glapi/libglapi.la \
|
||||
+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
|
||||
$(SHARED_GLAPI_LIB) \
|
||||
$(OSMESA_LIB_DEPS) \
|
||||
$(CLOCK_LIB) \
|
||||
--
|
||||
2.9.3
|
||||
|
@ -1,37 +0,0 @@
|
||||
From c9987fca1fa611e48f85644493edd8d5a30cf403 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Fri, 13 Dec 2019 17:42:17 +0000
|
||||
Subject: [PATCH] Link with libclang-cpp
|
||||
|
||||
---
|
||||
src/gallium/targets/opencl/meson.build | 14 +-------------
|
||||
1 file changed, 1 insertion(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
|
||||
index 907cc74337d..031d35b9716 100644
|
||||
--- a/src/gallium/targets/opencl/meson.build
|
||||
+++ b/src/gallium/targets/opencl/meson.build
|
||||
@@ -43,19 +43,7 @@ libopencl = shared_library(
|
||||
dependencies : [
|
||||
idep_mesautil,
|
||||
dep_clock, dep_dl, dep_unwind, dep_elf,
|
||||
- cpp.find_library('clangCodeGen', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangFrontend', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangDriver', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangSerialization', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangParse', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangSema', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangAnalysis', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangAST', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangEdit', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangLex', dirs : llvm_libdir),
|
||||
- cpp.find_library('clangBasic', dirs : llvm_libdir),
|
||||
+ cpp.find_library('clang-cpp', dirs : llvm_libdir),
|
||||
],
|
||||
version : '@0@.0.0'.format(opencl_version),
|
||||
install : true,
|
||||
--
|
||||
2.20.1
|
||||
|
26
0001-llvm-SONAME-without-version.patch
Normal file
26
0001-llvm-SONAME-without-version.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From c2b4d93a5e4796ca53361c61d7e31edc24241932 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 13:26:25 +0100
|
||||
Subject: [PATCH 1/4] llvm SONAME without version
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5f75c60..d77f907 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2645,7 +2645,7 @@
|
||||
dnl ourselves.
|
||||
dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
|
||||
dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
|
||||
- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
|
||||
+ LLVM_SO_NAME=LLVM
|
||||
AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
|
||||
|
||||
if test "x$llvm_have_one_so" = xyes; then
|
||||
--
|
||||
2.7.4
|
||||
|
131
0001-loader_dri3-glx-egl-Reinstate-the-loader_dri3_vtable.patch
Normal file
131
0001-loader_dri3-glx-egl-Reinstate-the-loader_dri3_vtable.patch
Normal file
@ -0,0 +1,131 @@
|
||||
From 0c40f56438f0712f8da62cd8fd1a3c1d8ef3f21a Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Hellstrom <thellstrom@vmware.com>
|
||||
Date: Fri, 9 Feb 2018 09:37:19 +0100
|
||||
Subject: [PATCH] loader_dri3/glx/egl: Reinstate the loader_dri3_vtable
|
||||
get_dri_screen callback
|
||||
|
||||
Removing this callback caused rendering corruption in some multi-screen cases,
|
||||
so it is reinstated but without the drawable argument which was never used
|
||||
by implementations and was confusing since the drawable could have been
|
||||
created with another screen.
|
||||
|
||||
Cc: "17.3 18.0" mesa-stable@lists.freedesktop.org
|
||||
Fixes: 5198e48a0d (loader_dri3/glx/egl: Remove the loader_dri3_vtable get_dri_screen callback)
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105013
|
||||
Reported-by: Daniel van Vugt <daniel.van.vugt@canonical.com>
|
||||
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
|
||||
Reviewed-by: Brian Paul <brianp@vmware.com>
|
||||
(cherry picked from commit f386776ea55f86d0288c955cf4cf877a1b4a027d)
|
||||
---
|
||||
src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
|
||||
src/glx/dri3_glx.c | 11 +++++++++++
|
||||
src/loader/loader_dri3_helper.c | 12 +++++++++++-
|
||||
src/loader/loader_dri3_helper.h | 1 +
|
||||
4 files changed, 35 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
|
||||
index eadd37141e..854b03c7fd 100644
|
||||
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
|
||||
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
|
||||
@@ -75,6 +75,17 @@ egl_dri3_get_dri_context(struct loader_dri3_drawable *draw)
|
||||
return dri2_ctx->dri_context;
|
||||
}
|
||||
|
||||
+static __DRIscreen *
|
||||
+egl_dri3_get_dri_screen(void)
|
||||
+{
|
||||
+ _EGLContext *ctx = _eglGetCurrentContext();
|
||||
+ struct dri2_egl_context *dri2_ctx;
|
||||
+ if (!ctx)
|
||||
+ return NULL;
|
||||
+ dri2_ctx = dri2_egl_context(ctx);
|
||||
+ return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
|
||||
{
|
||||
@@ -88,6 +99,7 @@ static const struct loader_dri3_vtable egl_dri3_vtable = {
|
||||
.set_drawable_size = egl_dri3_set_drawable_size,
|
||||
.in_current_context = egl_dri3_in_current_context,
|
||||
.get_dri_context = egl_dri3_get_dri_context,
|
||||
+ .get_dri_screen = egl_dri3_get_dri_screen,
|
||||
.flush_drawable = egl_dri3_flush_drawable,
|
||||
.show_fps = NULL,
|
||||
};
|
||||
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
|
||||
index 53202e53f6..b9f8698b92 100644
|
||||
--- a/src/glx/dri3_glx.c
|
||||
+++ b/src/glx/dri3_glx.c
|
||||
@@ -116,6 +116,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
|
||||
return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
|
||||
}
|
||||
|
||||
+static __DRIscreen *
|
||||
+glx_dri3_get_dri_screen(void)
|
||||
+{
|
||||
+ struct glx_context *gc = __glXGetCurrentContext();
|
||||
+ struct dri3_context *pcp = (struct dri3_context *) gc;
|
||||
+ struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
|
||||
+
|
||||
+ return (gc != &dummyContext && psc) ? psc->driScreen : NULL;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
|
||||
{
|
||||
@@ -150,6 +160,7 @@ static const struct loader_dri3_vtable glx_dri3_vtable = {
|
||||
.set_drawable_size = glx_dri3_set_drawable_size,
|
||||
.in_current_context = glx_dri3_in_current_context,
|
||||
.get_dri_context = glx_dri3_get_dri_context,
|
||||
+ .get_dri_screen = glx_dri3_get_dri_screen,
|
||||
.flush_drawable = glx_dri3_flush_drawable,
|
||||
.show_fps = glx_dri3_show_fps,
|
||||
};
|
||||
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
|
||||
index fffcb9f0bc..b4c458201a 100644
|
||||
--- a/src/loader/loader_dri3_helper.c
|
||||
+++ b/src/loader/loader_dri3_helper.c
|
||||
@@ -1309,6 +1309,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
|
||||
xcb_sync_fence_t sync_fence;
|
||||
struct xshmfence *shm_fence;
|
||||
int fence_fd;
|
||||
+ __DRIscreen *cur_screen;
|
||||
|
||||
if (buffer)
|
||||
return buffer;
|
||||
@@ -1339,8 +1340,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
|
||||
if (!bp_reply)
|
||||
goto no_image;
|
||||
|
||||
+ /* Get the currently-bound screen or revert to using the drawable's screen if
|
||||
+ * no contexts are currently bound. The latter case is at least necessary for
|
||||
+ * obs-studio, when using Window Capture (Xcomposite) as a Source.
|
||||
+ */
|
||||
+ cur_screen = draw->vtable->get_dri_screen();
|
||||
+ if (!cur_screen) {
|
||||
+ cur_screen = draw->dri_screen;
|
||||
+ }
|
||||
+
|
||||
buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format,
|
||||
- draw->dri_screen, draw->ext->image,
|
||||
+ cur_screen, draw->ext->image,
|
||||
buffer);
|
||||
if (!buffer->image)
|
||||
goto no_image;
|
||||
diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
|
||||
index 0dd37e9171..790f784276 100644
|
||||
--- a/src/loader/loader_dri3_helper.h
|
||||
+++ b/src/loader/loader_dri3_helper.h
|
||||
@@ -99,6 +99,7 @@ struct loader_dri3_vtable {
|
||||
void (*set_drawable_size)(struct loader_dri3_drawable *, int, int);
|
||||
bool (*in_current_context)(struct loader_dri3_drawable *);
|
||||
__DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *);
|
||||
+ __DRIscreen *(*get_dri_screen)(void);
|
||||
void (*flush_drawable)(struct loader_dri3_drawable *, unsigned);
|
||||
void (*show_fps)(struct loader_dri3_drawable *, uint64_t);
|
||||
};
|
||||
--
|
||||
2.16.2
|
||||
|
50
0002-hardware-gloat.patch
Normal file
50
0002-hardware-gloat.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 00bcd599310dc7fce4fe336ffd85902429051a0c Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 13:27:04 +0100
|
||||
Subject: [PATCH 2/4] hardware gloat
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++
|
||||
src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++
|
||||
2 files changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
index 4f61de8..3b0ec77 100644
|
||||
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
|
||||
if (!format_desc)
|
||||
return FALSE;
|
||||
|
||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
||||
+ util_format_is_float(format)) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
assert(target == PIPE_BUFFER ||
|
||||
target == PIPE_TEXTURE_1D ||
|
||||
target == PIPE_TEXTURE_1D_ARRAY ||
|
||||
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
|
||||
index 031602b..c279120 100644
|
||||
--- a/src/gallium/drivers/softpipe/sp_screen.c
|
||||
+++ b/src/gallium/drivers/softpipe/sp_screen.c
|
||||
@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
|
||||
if (!format_desc)
|
||||
return FALSE;
|
||||
|
||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
||||
+ util_format_is_float(format)) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
if (sample_count > 1)
|
||||
return FALSE;
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
27
0004-bigendian-assert.patch
Normal file
27
0004-bigendian-assert.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 6ccae713acc457d7df6ab15e124a7d77c5093213 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 13:28:07 +0100
|
||||
Subject: [PATCH 4/4] bigendian assert
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
src/gallium/auxiliary/util/u_math.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
|
||||
index ecb1d63..90ada14 100644
|
||||
--- a/src/gallium/auxiliary/util/u_math.h
|
||||
+++ b/src/gallium/auxiliary/util/u_math.h
|
||||
@@ -59,6 +59,9 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#ifdef PIPE_ARCH_BIG_ENDIAN
|
||||
+#include <assert.h>
|
||||
+#endif
|
||||
|
||||
#ifndef M_SQRT2
|
||||
#define M_SQRT2 1.41421356237309504880
|
||||
--
|
||||
2.7.4
|
||||
|
23
Makefile
Normal file
23
Makefile
Normal file
@ -0,0 +1,23 @@
|
||||
VERSION ?= 17.3.5
|
||||
SANITIZE ?= 1
|
||||
|
||||
DIRNAME = mesa-${VERSION}
|
||||
|
||||
all: archive
|
||||
|
||||
clean:
|
||||
rm -rf $(DIRNAME)/
|
||||
rm -f mesa-${VERSION}.tar.xz
|
||||
|
||||
clone: clean
|
||||
curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz
|
||||
tar xf mesa-${VERSION}.tar.xz
|
||||
|
||||
sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
|
||||
ifdef SANITIZE
|
||||
cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
|
||||
endif
|
||||
|
||||
archive: clone sanitize
|
||||
tar caf ${DIRNAME}.tar.xz ${DIRNAME}
|
12
glvnd-fix-gl-dot-pc.patch
Normal file
12
glvnd-fix-gl-dot-pc.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
|
||||
--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500
|
||||
+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
|
||||
@@ -7,7 +7,7 @@ Name: gl
|
||||
Description: Mesa OpenGL library
|
||||
Requires.private: @GL_PC_REQ_PRIV@
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Libs: -L${libdir} -l@GL_LIB@
|
||||
+Libs: -L${libdir} -lGL
|
||||
Libs.private: @GL_PC_LIB_PRIV@
|
||||
Cflags: -I${includedir} @GL_PC_CFLAGS@
|
||||
glx_tls: @GLX_TLS@
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab
|
||||
SHA512 (mesa-17.3.6.tar.xz) = 2e56cd8954b9229a0ddb67d96d7880f91fa3affe836bec58f7ee820e34aecd9965c570b61bca3f3641ed0f8e5e986e9f482f6013927af5c09efd08c4b9fcf626
|
||||
|
20
vl_decoder.c
Normal file
20
vl_decoder.c
Normal file
@ -0,0 +1,20 @@
|
||||
#include "vl_decoder.h"
|
||||
bool
|
||||
vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
|
||||
enum pipe_video_entrypoint entrypoint)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int
|
||||
vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct pipe_video_codec *
|
||||
vl_create_decoder(struct pipe_context *pipe,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
7
vl_mpeg12_decoder.c
Normal file
7
vl_mpeg12_decoder.c
Normal file
@ -0,0 +1,7 @@
|
||||
#include "vl_mpeg12_decoder.h"
|
||||
struct pipe_video_codec *
|
||||
vl_create_mpeg12_decoder(struct pipe_context *context,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
Loading…
Reference in New Issue
Block a user