Attachment 100627 Details for Bug 79752 – fixes xbmc from crashing

[patch] fixes xbmc from crashing

intel_i965_2.patch (text/plain), 2.26 KB, created by Hugh Greenberg on 2014-06-08 01:39:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hugh Greenberg

Created: 2014-06-08 01:39:43 UTC

Size: 2.26 KB

patch

obsolete

>Index: mesa-10.1.3/src/mesa/drivers/dri/i965/brw_blorp.cpp
>===================================================================
>--- mesa-10.1.3.orig/src/mesa/drivers/dri/i965/brw_blorp.cpp	2014-06-07 16:40:15.568820108 -0600
>+++ mesa-10.1.3/src/mesa/drivers/dri/i965/brw_blorp.cpp	2014-06-07 16:40:15.560820108 -0600
>@@ -68,8 +68,8 @@
>    this->mt = mt;
>    this->level = level;
>    this->layer = layer;
>-   this->width = mt->level[level].width;
>-   this->height = mt->level[level].height;
>+   this->width = mt ? mt->level[level].width : 0;
>+   this->height = mt ? mt->level[level].height : 0;
> 
>    intel_miptree_get_image_offset(mt, level, layer, &x_offset, &y_offset);
> }
>@@ -81,6 +81,10 @@
>                             bool is_render_target)
> {
>    brw_blorp_mip_info::set(mt, level, layer);
>+   if (!mt) {
>+     return;
>+   }
>+
>    this->num_samples = mt->num_samples;
>    this->array_spacing_lod0 = mt->array_spacing_lod0;
>    this->map_stencil_as_y_tiled = false;
>Index: mesa-10.1.3/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
>===================================================================
>--- mesa-10.1.3.orig/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp	2014-06-07 16:40:15.568820108 -0600
>+++ mesa-10.1.3/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp	2014-06-07 16:40:15.560820108 -0600
>@@ -192,6 +192,10 @@
> 
>    dst.set(brw, irb->mt, irb->mt_level, layer, true);
> 
>+   if (!irb->mt) {
>+     return;
>+   }
>+
>    /* Override the surface format according to the context's sRGB rules. */
>    mesa_format format = _mesa_get_render_format(ctx, irb->mt->format);
>    dst.brw_surfaceformat = brw->render_target_format[format];
>Index: mesa-10.1.3/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
>===================================================================
>--- mesa-10.1.3.orig/src/mesa/drivers/dri/i965/intel_mipmap_tree.c	2014-05-09 08:15:37.000000000 -0600
>+++ mesa-10.1.3/src/mesa/drivers/dri/i965/intel_mipmap_tree.c	2014-06-07 17:40:23.560755496 -0600
>@@ -1013,8 +1013,13 @@
> {
>    assert(slice < mt->level[level].depth);
> 
>-   *x = mt->level[level].slice[slice].x_offset;
>-   *y = mt->level[level].slice[slice].y_offset;
>+   if (mt) {
>+     *x = mt->level[level].slice[slice].x_offset;
>+     *y = mt->level[level].slice[slice].y_offset;
>+   } else {
>+     *x = 0;
>+     *y = 0;
>+   }
> }
> 
> /**

Actions: View | Splinter Review

Attachments on bug 79752: 100569 | 100570 | 100623 | 100624 | 100627

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.