From: Chris Forbes Date: Wed, 8 Jan 2014 21:01:13 +0000 (+1300) Subject: i965/Gen7: Only emit cube face enables for cubes. X-Git-Tag: upstream/10.1.2~701 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=566e0ddfd01dbadd75462fed5a3f141b9f494028;p=platform%2Fupstream%2Fmesa.git i965/Gen7: Only emit cube face enables for cubes. This is not observed to actually fix anything, but the PRM says this field must be zero for other surface types. Signed-off-by: Chris Forbes Reviewed-by: Kenneth Graunke Reviewed-by: Jordan Justen --- diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c index 761bc3b..bda09a0 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -298,8 +298,11 @@ gen7_update_texture_surface(struct gl_context *ctx, surf[0] = translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT | tex_format << BRW_SURFACE_FORMAT_SHIFT | - gen7_surface_tiling_mode(mt->region->tiling) | - BRW_SURFACE_CUBEFACE_ENABLES; + gen7_surface_tiling_mode(mt->region->tiling); + + /* mask of faces present in cube map; for other surfaces MBZ. */ + if (tObj->Target == GL_TEXTURE_CUBE_MAP || tObj->Target == GL_TEXTURE_CUBE_MAP_ARRAY) + surf[0] |= BRW_SURFACE_CUBEFACE_ENABLES; if (mt->align_h == 4) surf[0] |= GEN7_SURFACE_VALIGN_4;