Przeglądaj źródła

intel: fix potential segfault error at intel_(un)map_texture_image

intel_image->mt might be NULL, say with border width set. It then would
trigger a segfault at intel_map/unmap_texture_image function.

This would fix the oglc misctest(basic.textureBorderIgnore) fail.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
tags/mesa-8.0-rc1
Yuanhan Liu 14 lat temu
rodzic
commit
455a19b1b3
1 zmienionych plików z 3 dodań i 2 usunięć
  1. 3
    2
      src/mesa/drivers/dri/intel/intel_tex.c

+ 3
- 2
src/mesa/drivers/dri/intel/intel_tex.c Wyświetl plik

@@ -113,7 +113,7 @@ intel_map_texture_image(struct gl_context *ctx,
* row of blocks. intel_miptree_get_image_offset() already does
* the divide.
*/
_mesa_get_format_block_size(mt->format, &bw, &bh);
_mesa_get_format_block_size(tex_image->TexFormat, &bw, &bh);
assert(y % bh == 0);
y /= bh;

@@ -150,7 +150,8 @@ intel_unmap_texture_image(struct gl_context *ctx,
struct intel_context *intel = intel_context(ctx);
struct intel_texture_image *intel_image = intel_texture_image(tex_image);

intel_region_unmap(intel, intel_image->mt->region);
if (intel_image->mt)
intel_region_unmap(intel, intel_image->mt->region);

if (intel_image->stencil_rb) {
/*

Ładowanie…
Anuluj
Zapisz