<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Nov 6, 2017 at 2:02 PM, Louis-Francis Ratté-Boulianne <span dir="ltr"><<a href="mailto:lfrb@collabora.com" target="_blank">lfrb@collabora.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The planar_format image property was always set even for<br>
non-planar formats. This was breaking CCS support as<br>
intel_from_planar is now making sure we can't have both<br>
a modifier and an planar format.<br></blockquote><div><br></div><div>This patch is incorrect. planar_format is badly named, we set it even for single-plane images and some stuff relies on that. Really, we just need to change the intel_from_planar to check n_planes == 1.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Louis-Francis Ratté-Boulianne <<a href="mailto:lfrb@collabora.com">lfrb@collabora.com</a>><br>
Reviewed-by: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>><br>
---<br>
src/mesa/drivers/dri/i965/<wbr>intel_screen.c | 6 ++++--<br>
1 file changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_screen.c b/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
index 10064c3236..b87ccab0a8 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
@@ -913,7 +913,8 @@ intel_create_image_from_names(<wbr>__DRIscreen *dri_screen,<br>
if (image == NULL)<br>
return NULL;<br>
<br>
- image->planar_format = f;<br>
+ if (f->nplanes > 1)<br>
+ image->planar_format = f;<br>
for (i = 0; i < f->nplanes; i++) {<br>
index = f->planes[i].buffer_index;<br>
image->offsets[index] = offsets[index];<br>
@@ -961,7 +962,8 @@ intel_create_image_from_fds_<wbr>common(__DRIscreen *dri_screen,<br>
image->height = height;<br>
image->pitch = strides[0];<br>
<br>
- image->planar_format = f;<br>
+ if (f->nplanes > 1)<br>
+ image->planar_format = f;<br>
<br>
image->bo = brw_bo_gem_create_from_prime(<wbr>screen->bufmgr, fds[0]);<br>
if (image->bo == NULL) {<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.13.0<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>