revert
This commit is contained in:
parent
d50a756fdd
commit
1063a9768a
@ -1,27 +0,0 @@
|
|||||||
From 808c054a42fd24a1aaefaeb1d95195fea9fb6e84 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dave Airlie <airlied@redhat.com>
|
|
||||||
Date: Wed, 7 Dec 2022 05:11:47 +1000
|
|
||||||
Subject: [PATCH] glx: fix xshm check to init xshm_opcode.
|
|
||||||
|
|
||||||
Found and proposed by Ray Strode (halfline)
|
|
||||||
|
|
||||||
Fixes: 68e89401140d ("glx/drisw: use xcb instead of X to query connection")
|
|
||||||
---
|
|
||||||
src/glx/drisw_glx.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
|
||||||
index c0d1e85fdc4..d7658eaf7c1 100644
|
|
||||||
--- a/src/glx/drisw_glx.c
|
|
||||||
+++ b/src/glx/drisw_glx.c
|
|
||||||
@@ -874,6 +874,7 @@ check_xshm(Display *dpy)
|
|
||||||
|
|
||||||
shm_cookie = xcb_query_extension(c, 7, "MIT-SHM");
|
|
||||||
shm_reply = xcb_query_extension_reply(c, shm_cookie, NULL);
|
|
||||||
+ xshm_opcode = shm_reply->major_opcode;
|
|
||||||
|
|
||||||
has_mit_shm = shm_reply->present;
|
|
||||||
free(shm_reply);
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
VERSION ?= 22.3.0
|
|
||||||
SANITIZE ?= 1
|
|
||||||
|
|
||||||
DIRNAME = mesa-${VERSION}
|
|
||||||
|
|
||||||
all: archive
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -rf $(DIRNAME)/
|
|
||||||
rm -f mesa-${VERSION}.tar.xz
|
|
||||||
|
|
||||||
clone: clean
|
|
||||||
curl -O https://archive.mesa3d.org/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}
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
|
|
||||||
Subject: RE: Question about Mesa MLAA license
|
|
||||||
From: Jorge Jimenez <iryoku@gmail.com>
|
|
||||||
Date: 01/08/2013 12:50 PM
|
|
||||||
To: Tom Callaway <tcallawa@redhat.com>
|
|
||||||
CC: "jorge@iryoku.com" <jorge@iryoku.com>
|
|
||||||
|
|
||||||
Yes to both questions.
|
|
||||||
|
|
||||||
Thanks,
|
|
||||||
Jorge
|
|
||||||
|
|
||||||
From: Tom Callaway <tcallawa@redhat.com>
|
|
||||||
Sent: January 8, 2013 6:49 PM
|
|
||||||
To: Jorge Jimenez <iryoku@gmail.com>
|
|
||||||
CC: jorge@iryoku.com
|
|
||||||
Subject: Re: Question about Mesa MLAA license
|
|
||||||
|
|
||||||
On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
|
|
||||||
> Hi Tom,
|
|
||||||
>
|
|
||||||
> What we meant with that is that we made an exception for clause 2.
|
|
||||||
> Instead of clause 2, in the case of the Mesa project, you have to name
|
|
||||||
> the technique Jimenez's MLAA in the config options of Mesa. We did that
|
|
||||||
> just to allow them to solve license issues. This exception should be for
|
|
||||||
> the Mesa project, and any project using Mesa, like Fedora.
|
|
||||||
>
|
|
||||||
> We want to widespread usage of our MLAA, so we want to avoid any kind of
|
|
||||||
> license complications. Hope current one is good for Fedora, if not
|
|
||||||
> please tell, and we'll see what we can do!
|
|
||||||
|
|
||||||
Okay, a few more questions:
|
|
||||||
|
|
||||||
* If Fedora decides to simply reproduce the quoted statement:
|
|
||||||
"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
|
|
||||||
Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
|
|
||||||
|
|
||||||
Specifically, if this is done as part of documentation included with
|
|
||||||
Mesa, is that sufficient to meet clause 2 even if the Mesa config option
|
|
||||||
is not set as described in your exception?
|
|
||||||
|
|
||||||
* Currently, the Mesa config option for MLAA says: "Morphological
|
|
||||||
anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
|
|
||||||
quality". Is this in compliance with your exception?
|
|
||||||
|
|
||||||
Thanks again,
|
|
||||||
|
|
||||||
~tom
|
|
||||||
|
|
||||||
==
|
|
||||||
Fedora Project
|
|
||||||
|
|
||||||
Subject: RE: Question about Mesa MLAA license
|
|
||||||
From: Jorge Jimenez <iryoku@gmail.com>
|
|
||||||
Date: 01/08/2013 12:39 PM
|
|
||||||
To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
|
|
||||||
|
|
||||||
Hi Tom,
|
|
||||||
|
|
||||||
What we meant with that is that we made an exception for clause 2.
|
|
||||||
Instead of clause 2, in the case of the Mesa project, you have to name
|
|
||||||
the technique Jimenez's MLAA in the config options of Mesa. We did that
|
|
||||||
just to allow them to solve license issues. This exception should be for
|
|
||||||
the Mesa project, and any project using Mesa, like Fedora.
|
|
||||||
|
|
||||||
We want to widespread usage of our MLAA, so we want to avoid any kind of
|
|
||||||
license complications. Hope current one is good for Fedora, if not
|
|
||||||
please tell, and we'll see what we can do!
|
|
||||||
|
|
||||||
Cheers,
|
|
||||||
Jorge
|
|
||||||
|
|
||||||
From: Tom Callaway <tcallawa@redhat.com>
|
|
||||||
Sent: January 8, 2013 6:30 PM
|
|
||||||
To: jorge@iryoku.com
|
|
||||||
Subject: Question about Mesa MLAA license
|
|
||||||
|
|
||||||
Jorge,
|
|
||||||
|
|
||||||
Thanks for all of your fantastic graphics work! I have been auditing
|
|
||||||
Fedora (a popular distribution of Linux) for license compliance and I
|
|
||||||
came across your MLAA code in Mesa.
|
|
||||||
|
|
||||||
The license says:
|
|
||||||
|
|
||||||
* 2. Redistributions in binary form must reproduce the following
|
|
||||||
statement:
|
|
||||||
*
|
|
||||||
* "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
|
|
||||||
* Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
|
|
||||||
*
|
|
||||||
* Only for use in the Mesa project, this point 2 is filled by naming the
|
|
||||||
* technique Jimenez's MLAA in the Mesa config options.
|
|
||||||
|
|
||||||
That wording is unclear. When you say "Only for use in the Mesa
|
|
||||||
project...", it seems like you could either be saying:
|
|
||||||
|
|
||||||
- This code may only be used as part of Mesa.
|
|
||||||
|
|
||||||
OR
|
|
||||||
|
|
||||||
- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
|
|
||||||
MLAA" in the Mesa config options.
|
|
||||||
|
|
||||||
*****
|
|
||||||
|
|
||||||
If the first item is true, then we may have to remove the MLAA code from
|
|
||||||
Fedora's copy of Mesa. However, looking at the license on your SMAA
|
|
||||||
code, I do not believe it to be the case. Please let me know either way!
|
|
||||||
|
|
||||||
Thanks in advance,
|
|
||||||
|
|
||||||
Tom Callaway
|
|
||||||
Fedora Legal
|
|
||||||
|
|
||||||
==
|
|
||||||
Fedora Project
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
|
|
||||||
--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000
|
|
||||||
+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000
|
|
||||||
@@ -653,6 +653,7 @@ TODO: document the other workarounds.
|
|
||||||
<application name="gnome-shell" executable="gnome-shell">
|
|
||||||
<option name="adaptive_sync" value="false" />
|
|
||||||
<option name="v3d_nonmsaa_texture_size_limit" value="true" />
|
|
||||||
+ <option name="mesa_glthread" value="false"/>
|
|
||||||
</application>
|
|
||||||
<application name="Desktop — Plasma" executable="plasmashell">
|
|
||||||
<option name="adaptive_sync" value="false" />
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c
|
|
||||||
--- mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma 2021-11-18 06:16:20.000000000 +1000
|
|
||||||
+++ mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c 2021-11-18 07:03:17.652283186 +1000
|
|
||||||
@@ -213,6 +213,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_Creat
|
|
||||||
if (pAllocator == NULL)
|
|
||||||
pAllocator = vk_default_allocator();
|
|
||||||
|
|
||||||
+ if (!getenv("RH_SW_VULKAN"))
|
|
||||||
+ return VK_ERROR_INITIALIZATION_FAILED;
|
|
||||||
+
|
|
||||||
instance = vk_zalloc(pAllocator, sizeof(*instance), 8,
|
|
||||||
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
|
|
||||||
if (!instance)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
|
|
||||||
--- mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma 2023-01-25 06:17:54.993167334 +1000
|
|
||||||
+++ mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h 2023-01-25 06:17:57.363203425 +1000
|
|
||||||
@@ -1,7 +1,6 @@
|
|
||||||
// DriConf options specific to radeonsi
|
|
||||||
DRI_CONF_SECTION_PERFORMANCE
|
|
||||||
DRI_CONF_ADAPTIVE_SYNC(true)
|
|
||||||
-DRI_CONF_MESA_GLTHREAD(true)
|
|
||||||
DRI_CONF_SECTION_END
|
|
||||||
|
|
||||||
DRI_CONF_SECTION_DEBUG
|
|
||||||
@ -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;
|
|
||||||
}
|
|
||||||
1381
SPECS/mesa.spec
1381
SPECS/mesa.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user