From: Roland Scheidegger Date: Mon, 5 Mar 2018 19:12:32 +0000 (+0100) Subject: r600: fix color export mask X-Git-Tag: android-x86-8.1-r1~5044 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=434523cf2a6738b0250de2a0e36e93b13f88832a;p=android-x86%2Fexternal-mesa.git r600: fix color export mask The r600 code (not the eg one) forgot to copy the ps_color_export_mask in commit 5b14e06d8b42e2b08ebc52b6c314ef8647d87a1f when updating the pixel state, leading to misrenderings (probably with MRT). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105262 Tested-by: LoneVVolf Tested-by: Pavel Vinogradov --- diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 7f6da1a3ed2..923817119f7 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -2525,6 +2525,7 @@ void r600_update_ps_state(struct pipe_context *ctx, struct r600_pipe_shader *sha } shader->nr_ps_color_outputs = num_cout; + shader->ps_color_export_mask = rshader->ps_color_export_mask; spi_ps_in_control_0 = S_0286CC_NUM_INTERP(rshader->ninput) | S_0286CC_PERSP_GRADIENT_ENA(1)|