Compare commits
167 Commits
ajax/upstr
...
master
Author | SHA1 | Date |
---|---|---|
Pete Walter | 6ce6c8d5e1 | |
Pete Walter | 691cc08a95 | |
Kalev Lember | bd392f431c | |
Pete Walter | a02bf61649 | |
Pete Walter | a3e188c7f1 | |
Pete Walter | def7df7fd0 | |
Pete Walter | 17714718d4 | |
Pete Walter | 244b45ba4e | |
Pete Walter | cb726e7752 | |
Tom Stellard | 2208aa87d7 | |
Tom Stellard | dfa8e8664d | |
Pete Walter | 88f2b16b7a | |
Pete Walter | 0860841e06 | |
Pete Walter | 78c38a46db | |
Pete Walter | c91c204f63 | |
Pete Walter | e252ca97bc | |
Pete Walter | e3793d2b0f | |
Pete Walter | 4d507c6840 | |
Pete Walter | c664beb5a6 | |
Pete Walter | feef06f322 | |
Pete Walter | d27097db94 | |
Peter Robinson | 08c3236612 | |
Peter Robinson | 3474d0a62b | |
Peter Robinson | 6e80d6369c | |
Pete Walter | af4fc7304b | |
Pete Walter | 155b1d1b2e | |
Peter Robinson | 7b0cc19117 | |
Gwyn Ciesla | bb914bd1b9 | |
Pete Walter | 9c21301809 | |
Pete Walter | 296e0ae82c | |
Adam Jackson | 5d0d2710aa | |
Pete Walter | 8acfe9ee28 | |
Pete Walter | c274ae1f8f | |
Adam Jackson | 6d6825429d | |
Peter Robinson | c5cbb9a96f | |
Peter Robinson | 9bab7bdf2e | |
Peter Robinson | 845287db52 | |
Peter Robinson | 79749b404c | |
Pete Walter | c3a6a26144 | |
Pete Walter | c7b1d0e96c | |
Pete Walter | 05bea87ce8 | |
Pete Walter | 788f3c1014 | |
Peter Robinson | 51d65ab670 | |
Igor Gnatenko | 7c81ae5911 | |
Pete Walter | 895029979f | |
Pete Walter | cff677c5dd | |
Dave Airlie | 552cdae9e6 | |
Adam Jackson | f5d1a45049 | |
Dave Airlie | 6b02ba7b6a | |
Dave Airlie | 1260598b62 | |
Peter Robinson | f2ad1e1493 | |
Adam Jackson | fbee2edeaf | |
Adam Jackson | e9969b5fec | |
Dave Airlie | 10c91826d2 | |
Dave Airlie | 76b6b251a7 | |
Dave Airlie | 5c279f473b | |
Dave Airlie | e83e90968f | |
Pete Walter | 01a131cfa9 | |
Adam Williamson | 0bea054b30 | |
Pete Walter | ec6c645d39 | |
Igor Gnatenko | 9786914605 | |
Adam Jackson | fd591dd76a | |
Igor Gnatenko | 878fbd1530 | |
Adam Jackson | 6fb4a533ef | |
Igor Gnatenko | 2ad0c6e76f | |
Igor Gnatenko | a8742f03dd | |
Peter Robinson | 3cee7e41af | |
Pete Walter | 70c61a8218 | |
Pete Walter | efe4f93dbb | |
Peter Robinson | 1e37af6af6 | |
Igor Gnatenko | 2835d9ff3b | |
Igor Gnatenko | 64d6a36ff8 | |
Igor Gnatenko | 9dcda4b1fa | |
Igor Gnatenko | bfa55eb65c | |
Pete Walter | a04754fe8e | |
Peter Robinson | f346245e43 | |
Peter Robinson | 0ab246e4d2 | |
Peter Robinson | c57bc5b9e8 | |
Igor Gnatenko | 7410444879 | |
Igor Gnatenko | a3f576ae07 | |
Adam Jackson | 0794d42c87 | |
Igor Gnatenko | 14fb58e0bd | |
Igor Gnatenko | b708cfc9f3 | |
Igor Gnatenko | d07e7ed999 | |
Igor Gnatenko | 9b0b893a3c | |
Igor Gnatenko | 2eeaa037c1 | |
Igor Gnatenko | 5f47246ad6 | |
Igor Gnatenko | b133108f50 | |
Peter Robinson | fa32bd11e2 | |
Igor Gnatenko | 8c69d04266 | |
Adam Jackson | 3e58ffc41c | |
Adam Jackson | 652f89b81e | |
Igor Gnatenko | dd7e950818 | |
Dave Airlie | fcab6854c8 | |
Adam Jackson | 1cfc765493 | |
Igor Gnatenko | 2c8c0e5810 | |
Peter Robinson | 197c2fd747 | |
Peter Robinson | 22363c157b | |
Adam Williamson | 0e8e5c44f3 | |
Peter Robinson | f41482932d | |
Hans de Goede | 1176e8c491 | |
Igor Gnatenko | 9c9ed483b3 | |
Peter Robinson | 8ce34a59a7 | |
Igor Gnatenko | b13b769fca | |
Igor Gnatenko | 7e16421963 | |
Igor Gnatenko | ee9fab44b6 | |
Igor Gnatenko | 9d940ed69e | |
Peter Robinson | 2457fa3358 | |
Dave Airlie | cc063efb30 | |
Dave Airlie | 2b73204e9d | |
Peter Robinson | 9f1ef7b836 | |
Fedora Release Engineering | 776f0ebed6 | |
Adam Jackson | 25b4e647d4 | |
Igor Gnatenko | 92972ffe7d | |
Peter Robinson | 37e222b99d | |
Adam Jackson | a3c47870c3 | |
Adam Jackson | 952eceed16 | |
Adam Jackson | 069b694dff | |
Adam Jackson | 09551adef2 | |
Peter Robinson | b3b089e268 | |
Adam Jackson | 20136eda59 | |
Adam Jackson | 7c4548d416 | |
Adam Jackson | 856ded30ba | |
Adam Jackson | 1c741b9561 | |
Adam Jackson | 866b3ee53d | |
Adam Jackson | 1e7a119168 | |
Adam Jackson | c0b70431cf | |
Adam Jackson | 29be30fb65 | |
Peter Robinson | 9a301bf631 | |
Peter Robinson | ebeaacc9ff | |
Peter Robinson | 16891760f9 | |
Peter Robinson | 898828fbda | |
Igor Gnatenko | 02fc13176f | |
Peter Robinson | 4ad788d784 | |
Peter Robinson | 6e7ae21362 | |
Jonas Ådahl | 2f02d35654 | |
Jonas Ådahl | 1b1acd32b2 | |
Adam Jackson | c8975107f9 | |
Adam Jackson | 8f740e5d72 | |
Kalev Lember | 5a0343c35c | |
Kalev Lember | 9f97135799 | |
Tom Stellard | 8d99dc695b | |
Tom Stellard | eee84703a2 | |
Tom Stellard | cfb94d114d | |
Peter Robinson | 0258306f9b | |
Adam Jackson | 5874b7ff91 | |
Igor Gnatenko | e750bd19e5 | |
Peter Robinson | 0202d9c9e5 | |
Adam Jackson | 7681f8885a | |
Igor Gnatenko | 309f7dd88b | |
Igor Gnatenko | 792e92b385 | |
Igor Gnatenko | 21e39c1c80 | |
Igor Gnatenko | a41f97859c | |
Igor Gnatenko | 5bcb836bb5 | |
Fedora Release Engineering | 9e1266e707 | |
Peter Robinson | 14dcbf6097 | |
Peter Robinson | 6fb8ed7a72 | |
Peter Robinson | d31e23e5de | |
Igor Gnatenko | 7a95aff696 | |
Igor Gnatenko | 4e4216637e | |
Igor Gnatenko | a9b186ccff | |
Tom Stellard | 1d7d2f8a1d | |
Igor Gnatenko | 6131d22481 | |
Igor Gnatenko | da246290ca | |
Peter Robinson | 9ef43a3813 | |
Peter Robinson | 54da506bb9 | |
Peter Robinson | 028106f748 |
|
@ -3,3 +3,6 @@
|
|||
.build*
|
||||
/mesa-*.tar.bz2
|
||||
/mesa-*.tar.xz
|
||||
x86_64/
|
||||
results_mesa/
|
||||
mesa-*/
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
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
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -1,250 +0,0 @@
|
|||
From 0d9f80a538a1d39206ac82c97f10253481595150 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue, 7 Nov 2017 10:42:08 -0500
|
||||
Subject: [PATCH] glx: Implement GLX_EXT_no_config_context (v2 squash)
|
||||
|
||||
This more or less ports EGL_KHR_no_config_context to GLX.
|
||||
|
||||
v2: Enable the extension only for those backends that support it.
|
||||
|
||||
Khronos: https://github.com/KhronosGroup/OpenGL-Registry/pull/102
|
||||
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
src/glx/create_context.c | 41 +++++++++++++++++++++++++++--------------
|
||||
src/glx/dri2_glx.c | 5 +++--
|
||||
src/glx/dri3_glx.c | 6 ++++--
|
||||
src/glx/drisw_glx.c | 5 +++--
|
||||
src/glx/glxcmds.c | 30 +++++++++++++++++-------------
|
||||
src/glx/glxextensions.c | 1 +
|
||||
src/glx/glxextensions.h | 1 +
|
||||
7 files changed, 56 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/src/glx/create_context.c b/src/glx/create_context.c
|
||||
index 38e949ab4c..eab6511ad8 100644
|
||||
--- a/src/glx/create_context.c
|
||||
+++ b/src/glx/create_context.c
|
||||
@@ -47,21 +47,11 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
|
||||
xcb_generic_error_t *err;
|
||||
xcb_void_cookie_t cookie;
|
||||
unsigned dummy_err = 0;
|
||||
+ int screen = -1;
|
||||
|
||||
-
|
||||
- if (dpy == NULL || cfg == NULL)
|
||||
- return NULL;
|
||||
-
|
||||
- /* This means that either the caller passed the wrong display pointer or
|
||||
- * one of the internal GLX data structures (probably the fbconfig) has an
|
||||
- * error. There is nothing sensible to do, so return an error.
|
||||
- */
|
||||
- psc = GetGLXScreenConfigs(dpy, cfg->screen);
|
||||
- if (psc == NULL)
|
||||
+ if (dpy == NULL)
|
||||
return NULL;
|
||||
|
||||
- assert(cfg->screen == psc->scr);
|
||||
-
|
||||
/* Count the number of attributes specified by the application. All
|
||||
* attributes appear in pairs, except the terminating None.
|
||||
*/
|
||||
@@ -70,6 +60,29 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
|
||||
/* empty */ ;
|
||||
}
|
||||
|
||||
+ if (cfg) {
|
||||
+ screen = cfg->screen;
|
||||
+ } else {
|
||||
+ int i;
|
||||
+ for (i = 0; i < num_attribs; i++) {
|
||||
+ if (attrib_list[i * 2] == GLX_SCREEN)
|
||||
+ screen = attrib_list[i * 2 + 1];
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* This means that either the caller passed the wrong display pointer or
|
||||
+ * one of the internal GLX data structures (probably the fbconfig) has an
|
||||
+ * error. There is nothing sensible to do, so return an error.
|
||||
+ */
|
||||
+ psc = GetGLXScreenConfigs(dpy, screen);
|
||||
+ if (psc == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ assert(screen == psc->scr);
|
||||
+
|
||||
+ if (!cfg && !__glXExtensionBitIsEnabled(psc, EXT_no_config_context_bit))
|
||||
+ return NULL;
|
||||
+
|
||||
if (direct && psc->vtable->create_context_attribs) {
|
||||
/* GLX drops the error returned by the driver. The expectation is that
|
||||
* an error will also be returned by the server. The server's error
|
||||
@@ -104,8 +117,8 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
|
||||
cookie =
|
||||
xcb_glx_create_context_attribs_arb_checked(c,
|
||||
gc->xid,
|
||||
- cfg->fbconfigID,
|
||||
- cfg->screen,
|
||||
+ cfg ? cfg->fbconfigID : 0,
|
||||
+ screen,
|
||||
gc->share_xid,
|
||||
gc->isDirect,
|
||||
num_attribs,
|
||||
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
|
||||
index e67a15f9da..eeec4f0d60 100644
|
||||
--- a/src/glx/dri2_glx.c
|
||||
+++ b/src/glx/dri2_glx.c
|
||||
@@ -278,7 +278,7 @@ dri2_create_context_attribs(struct glx_screen *base,
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
- if (!glx_context_init(&pcp->base, &psc->base, &config->base))
|
||||
+ if (!glx_context_init(&pcp->base, &psc->base, config_base))
|
||||
goto error_exit;
|
||||
|
||||
ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION;
|
||||
@@ -317,7 +317,7 @@ dri2_create_context_attribs(struct glx_screen *base,
|
||||
pcp->driContext =
|
||||
(*psc->dri2->createContextAttribs) (psc->driScreen,
|
||||
api,
|
||||
- config->driConfig,
|
||||
+ config ? config->driConfig : NULL,
|
||||
shared,
|
||||
num_ctx_attribs / 2,
|
||||
ctx_attribs,
|
||||
@@ -1129,6 +1129,7 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
|
||||
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context");
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile");
|
||||
+ __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context");
|
||||
|
||||
if ((mask & ((1 << __DRI_API_GLES) |
|
||||
(1 << __DRI_API_GLES2) |
|
||||
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
|
||||
index d613073994..4470d1ef68 100644
|
||||
--- a/src/glx/dri3_glx.c
|
||||
+++ b/src/glx/dri3_glx.c
|
||||
@@ -263,7 +263,7 @@ dri3_create_context_attribs(struct glx_screen *base,
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
- if (!glx_context_init(&pcp->base, &psc->base, &config->base))
|
||||
+ if (!glx_context_init(&pcp->base, &psc->base, config_base))
|
||||
goto error_exit;
|
||||
|
||||
ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION;
|
||||
@@ -297,7 +297,8 @@ dri3_create_context_attribs(struct glx_screen *base,
|
||||
pcp->driContext =
|
||||
(*psc->image_driver->createContextAttribs) (psc->driScreen,
|
||||
api,
|
||||
- config->driConfig,
|
||||
+ config ? config->driConfig
|
||||
+ : NULL,
|
||||
shared,
|
||||
num_ctx_attribs / 2,
|
||||
ctx_attribs,
|
||||
@@ -718,6 +719,7 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
|
||||
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context");
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile");
|
||||
+ __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context");
|
||||
|
||||
if ((mask & ((1 << __DRI_API_GLES) |
|
||||
(1 << __DRI_API_GLES2) |
|
||||
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
||||
index a471856634..1f86ac2d4c 100644
|
||||
--- a/src/glx/drisw_glx.c
|
||||
+++ b/src/glx/drisw_glx.c
|
||||
@@ -455,7 +455,7 @@ drisw_create_context_attribs(struct glx_screen *base,
|
||||
if (pcp == NULL)
|
||||
return NULL;
|
||||
|
||||
- if (!glx_context_init(&pcp->base, &psc->base, &config->base)) {
|
||||
+ if (!glx_context_init(&pcp->base, &psc->base, config_base)) {
|
||||
free(pcp);
|
||||
return NULL;
|
||||
}
|
||||
@@ -483,7 +483,7 @@ drisw_create_context_attribs(struct glx_screen *base,
|
||||
pcp->driContext =
|
||||
(*psc->swrast->createContextAttribs) (psc->driScreen,
|
||||
api,
|
||||
- config->driConfig,
|
||||
+ config ? config->driConfig : 0,
|
||||
shared,
|
||||
num_ctx_attribs / 2,
|
||||
ctx_attribs,
|
||||
@@ -630,6 +630,7 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
|
||||
if (psc->swrast->base.version >= 3) {
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context");
|
||||
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile");
|
||||
+ __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context");
|
||||
|
||||
/* DRISW version >= 2 implies support for OpenGL ES.
|
||||
*/
|
||||
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
|
||||
index 10c7c2c3eb..c707d0cedf 100644
|
||||
--- a/src/glx/glxcmds.c
|
||||
+++ b/src/glx/glxcmds.c
|
||||
@@ -235,19 +235,23 @@ Bool
|
||||
validate_renderType_against_config(const struct glx_config *config,
|
||||
int renderType)
|
||||
{
|
||||
- switch (renderType) {
|
||||
- case GLX_RGBA_TYPE:
|
||||
- return (config->renderType & GLX_RGBA_BIT) != 0;
|
||||
- case GLX_COLOR_INDEX_TYPE:
|
||||
- return (config->renderType & GLX_COLOR_INDEX_BIT) != 0;
|
||||
- case GLX_RGBA_FLOAT_TYPE_ARB:
|
||||
- return (config->renderType & GLX_RGBA_FLOAT_BIT_ARB) != 0;
|
||||
- case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT:
|
||||
- return (config->renderType & GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT) != 0;
|
||||
- default:
|
||||
- break;
|
||||
- }
|
||||
- return 0;
|
||||
+ /* GLX_EXT_no_config_context supports any render type */
|
||||
+ if (!config)
|
||||
+ return True;
|
||||
+
|
||||
+ switch (renderType) {
|
||||
+ case GLX_RGBA_TYPE:
|
||||
+ return (config->renderType & GLX_RGBA_BIT) != 0;
|
||||
+ case GLX_COLOR_INDEX_TYPE:
|
||||
+ return (config->renderType & GLX_COLOR_INDEX_BIT) != 0;
|
||||
+ case GLX_RGBA_FLOAT_TYPE_ARB:
|
||||
+ return (config->renderType & GLX_RGBA_FLOAT_BIT_ARB) != 0;
|
||||
+ case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT:
|
||||
+ return (config->renderType & GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT) != 0;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
_X_HIDDEN Bool
|
||||
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
|
||||
index af6ffbf660..4853ad534e 100644
|
||||
--- a/src/glx/glxextensions.c
|
||||
+++ b/src/glx/glxextensions.c
|
||||
@@ -146,6 +146,7 @@ static const struct extension_info known_glx_extensions[] = {
|
||||
{ GLX(EXT_fbconfig_packed_float), VER(0,0), Y, Y, N, N },
|
||||
{ GLX(EXT_framebuffer_sRGB), VER(0,0), Y, Y, N, N },
|
||||
{ GLX(EXT_import_context), VER(0,0), Y, Y, N, N },
|
||||
+ { GLX(EXT_no_config_context), VER(0,0), Y, N, N, N },
|
||||
{ GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N },
|
||||
{ GLX(EXT_visual_info), VER(0,0), Y, Y, N, N },
|
||||
{ GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N },
|
||||
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
|
||||
index d73128bd0e..07cd3af0ff 100644
|
||||
--- a/src/glx/glxextensions.h
|
||||
+++ b/src/glx/glxextensions.h
|
||||
@@ -50,6 +50,7 @@ enum
|
||||
EXT_fbconfig_packed_float_bit,
|
||||
EXT_framebuffer_sRGB_bit,
|
||||
EXT_import_context_bit,
|
||||
+ EXT_no_config_context_bit,
|
||||
EXT_texture_from_pixmap_bit,
|
||||
EXT_visual_info_bit,
|
||||
EXT_visual_rating_bit,
|
||||
--
|
||||
2.14.3
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 0116b90743..4f5c8e31da 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2646,7 +2646,7 @@ detect_old_buggy_llvm() {
|
||||
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
|
File diff suppressed because it is too large
Load Diff
|
@ -1,50 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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@
|
3
sources
3
sources
|
@ -1,2 +1 @@
|
|||
SHA512 (mesa-17.2.4.tar.xz) = 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085
|
||||
SHA512 (mesa-17.3.0-devel.tar.xz) = 5ea482ad85d93cc0fd18ba96539fc7b4cf26da225a39d5c66e5f8e0cb9f2e468333ff655ec8f28480720a35b38508463069add04843d5170b62a0ddc73ae5cd2
|
||||
SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
|
||||
index 5743e13045..b39cc744e6 100644
|
||||
--- a/src/gallium/drivers/vc4/vc4_screen.c
|
||||
+++ b/src/gallium/drivers/vc4/vc4_screen.c
|
||||
@@ -549,25 +549,30 @@ vc4_screen_query_dmabuf_modifiers(struct pipe_screen *pscreen,
|
||||
unsigned int *external_only,
|
||||
int *count)
|
||||
{
|
||||
+ int m, i;
|
||||
+ uint64_t available_modifiers[] = {
|
||||
+ DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
|
||||
+ DRM_FORMAT_MOD_LINEAR,
|
||||
+ };
|
||||
+ struct vc4_screen *screen = vc4_screen(pscreen);
|
||||
+ int num_modifiers = screen->has_tiling_ioctl ? 2 : 1;
|
||||
+
|
||||
if (!modifiers) {
|
||||
- *count = 2;
|
||||
+ *count = num_modifiers;
|
||||
return;
|
||||
}
|
||||
|
||||
- *count = MIN2(max, 2);
|
||||
-
|
||||
+ *count = MIN2(max, num_modifiers);
|
||||
+ m = screen->has_tiling_ioctl ? 0 : 1;
|
||||
/* We support both modifiers (tiled and linear) for all sampler
|
||||
- * formats.
|
||||
+ * formats, but if we don't have the DRM_VC4_GET_TILING ioctl
|
||||
+ * we shouldn't advertise the tiled formats.
|
||||
*/
|
||||
- modifiers[0] = DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED;
|
||||
- if (external_only)
|
||||
- external_only[0] = false;
|
||||
- if (max < 2)
|
||||
- return;
|
||||
-
|
||||
- modifiers[1] = DRM_FORMAT_MOD_LINEAR;
|
||||
- if (external_only)
|
||||
- external_only[1] = false;
|
||||
+ for (i = 0; i < *count; i++) {
|
||||
+ modifiers[i] = available_modifiers[m++];
|
||||
+ if (external_only)
|
||||
+ external_only[i] = false;
|
||||
+ }
|
||||
}
|
||||
|
||||
#define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
|
20
vl_decoder.c
20
vl_decoder.c
|
@ -1,20 +0,0 @@
|
|||
#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;
|
||||
}
|
|
@ -1,7 +0,0 @@
|
|||
#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