diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2015-09-04 15:30:41 +0300 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2015-12-09 15:12:59 +0200 |
| commit | 595c8180714da1d97be445b9a66affa1dfea39f6 (patch) | |
| tree | 9d1f8c7ec281ff3ec99e08354abcb1b14b4d0390 | |
| parent | 3dc97a158662d59b5b9163b34f0245bcf86219f4 (diff) | |
i965: Resolve color and flush for all active shader images in intel_update_state().
Fixes arb_shader_image_load_store/execution/load-from-cleared-image.shader_test.
Couldn't reproduce any significant FPS regression in CPU-bound
benchmarks from the Finnish benchmarking system on neither VLV nor BSW
after 30 runs with 95% confidence level.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92849
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
Tested-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 7d7643ca66b..88be907620a 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -197,6 +197,24 @@ intel_update_state(struct gl_context * ctx, GLuint new_state) brw_render_cache_set_check_flush(brw, tex_obj->mt->bo); } + /* Resolve color for each active shader image. */ + for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { + const struct gl_shader *shader = ctx->_Shader->CurrentProgram[i] ? + ctx->_Shader->CurrentProgram[i]->_LinkedShaders[i] : NULL; + + if (unlikely(shader && shader->NumImages)) { + for (unsigned j = 0; j < shader->NumImages; j++) { + struct gl_image_unit *u = &ctx->ImageUnits[shader->ImageUnits[j]]; + tex_obj = intel_texture_object(u->TexObj); + + if (tex_obj && tex_obj->mt) { + intel_miptree_resolve_color(brw, tex_obj->mt); + brw_render_cache_set_check_flush(brw, tex_obj->mt->bo); + } + } + } + } + _mesa_lock_context_textures(ctx); } |