Skip to contentSkip to conversation

mesa3d: Add temporary fixes for etnaviv rendering

PATCH New Fabio Estevam 2 participants 2 messages Mar 19, 2017

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 mesa3d: Add temporary fixes for etnaviv rendering

Currently when running Qt5_CinematicExperience demo from Qt5.8 the covers of the movies appear with a black box instead of showing the actual art cover.

Also, the fonts are incorrectly displayed in many cases.

Fix these issues by applying temporary patches to etnaviv.

According to Christian Gmeiner and Wladimir J. van der Laan the correct solution to this problem is to use shader variants [1].

Use these temporary patches until the correct solution appears in mesa mainline, so that etaniv users can run Qt successfully for the time being.

[1] https://lists.freedesktop.org/archives/mesa-dev/2017-March/147948.html

Tested on imx6q-sabresd board.

Signed-off-by Fabio Estevam <[email protected]>
---
 ...naviv-Cannot-render-to-rb-swapped-formats.patch | 35 ++++++++++++++++++
 ...ect-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch | 41 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 package/mesa3d/0006-Revert-etnaviv-Cannot-render-to-rb-swapped-formats.patch
 create mode 100644 package/mesa3d/0007-Revert-Subject-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch
package/mesa3d/0006-Revert-etnaviv-Cannot-render-to-rb-swapped-formats.patch new file +35 -0
new file mode 100644
index 0000000..c919fc4
@@ -0,0 +1,35 @@
+From 309d4f0f11bac24a0b487404c51564735ac2c9ed Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <[email protected]>
+Date: Tue, 14 Mar 2017 09:51:23 -0300
+Subject: [PATCH 1/2] Revert "etnaviv: Cannot render to rb-swapped formats"
+Organization: O.S. Systems Software LTDA.
+
+This reverts commit 6c89a728d9e5d072cb504453e73077564c6523d3.
+
+Signed-off-by: Otavio Salvador <[email protected]>
+Signed-off-by: Fabio Estevam <[email protected]>
+---
+ src/gallium/drivers/etnaviv/etnaviv_screen.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
+index 28db9b95bf..2298936f51 100644
+--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
++++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
+@@ -469,11 +469,8 @@ etna_screen_is_format_supported(struct pipe_screen *pscreen,
+       return FALSE;
+ 
+    if (usage & PIPE_BIND_RENDER_TARGET) {
+-      /* If render target, must be RS-supported format that is not rb swapped.
+-       * Exposing rb swapped (or other swizzled) formats for rendering would
+-       * involve swizzing in the pixel shader.
+-       */
+-      if (translate_rs_format(format) != ETNA_NO_MATCH && !translate_rs_format_rb_swap(format)) {
++      /* if render target, must be RS-supported format */
++      if (translate_rs_format(format) != ETNA_NO_MATCH) {
+          /* Validate MSAA; number of samples must be allowed, and render target
+           * must have MSAA'able format. */
+          if (sample_count > 1) {
+-- 
+2.12.0
+
package/mesa3d/0007-Revert-Subject-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 mesa3d: Add temporary fixes for etnaviv rendering

Hello,

Quoted 19 lines · Fabio Estevam

Currently when running Qt5_CinematicExperience demo from Qt5.8 the covers of the movies appear with a black box instead of showing the actual art cover.

Also, the fonts are incorrectly displayed in many cases.

Fix these issues by applying temporary patches to etnaviv.

According to Christian Gmeiner and Wladimir J. van der Laan the correct solution to this problem is to use shader variants [1].

Use these temporary patches until the correct solution appears in mesa mainline, so that etaniv users can run Qt successfully for the time being.

[1] https://lists.freedesktop.org/archives/mesa-dev/2017-March/147948.html

Tested on imx6q-sabresd board.

Quoted 7 lines
Signed-off-by Fabio Estevam <[email protected]>
---
 ...naviv-Cannot-render-to-rb-swapped-formats.patch | 35 ++++++++++++++++++
 ...ect-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch | 41 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 package/mesa3d/0006-Revert-etnaviv-Cannot-render-to-rb-swapped-formats.patch
 create mode 100644 package/mesa3d/0007-Revert-Subject-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com