diff options
| author | Francisco Jerez <[email protected]> | 2018-02-13 14:16:03 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-03-20 16:57:24 +0000 |
| commit | 30a63012b4c027a47966740943632bb369fb0a0e (patch) | |
| tree | b16917e1049e75e4fcae3ae865f8708cfbe9a114 /src/mesa | |
| parent | 046145ae81c546e1410d9077700aebbbceb7b029 (diff) | |
i965: Fix KHR_blend_equation_advanced with some render targets.
This reverts two bogus and seemingly useless changes from the commits
referenced below, which broke KHR_blend_equation_advanced (and
EXT_shader_framebuffer_fetch_non_coherent which wasn't exposed yet)
for any kind of render target surface that would cause the
get_isl_surf() call in brw_emit_surface_state() to do anything useful
(notice how the result of get_isl_surf() is completely ignored by the
caller right now), as was the case while using those extensions with
1D array or 3D framebuffers in particular.
Fixes: f5859b45b1686e8116380d87 "i965/miptree: Switch remaining surfaces to isl"
Fixes: bf24c3539e4b6989512968ca "i965/miptree: Clean-up unused"
Cc: [email protected]
Reviewed-by: Plamena Manolova <[email protected]>
(cherry picked from commit 27c829da28ab3cfac0195d02ffb13afa8fe0e23d)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 611e85024d8..529e381e8fa 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -87,6 +87,8 @@ get_isl_surf(struct brw_context *brw, struct intel_mipmap_tree *mt, const enum isl_dim_layout dim_layout = get_isl_dim_layout(devinfo, mt->surf.tiling, target); + surf->dim = get_isl_surf_dim(target); + if (surf->dim_layout == dim_layout) return; @@ -182,7 +184,7 @@ brw_emit_surface_state(struct brw_context *brw, brw->isl_dev.ss.align, surf_offset); - isl_surf_fill_state(&brw->isl_dev, state, .surf = &mt->surf, .view = &view, + isl_surf_fill_state(&brw->isl_dev, state, .surf = &surf, .view = &view, .address = brw_state_reloc(&brw->batch, *surf_offset + brw->isl_dev.ss.addr_offset, mt->bo, offset, reloc_flags), |