Mesa (10.4): freedreno: move fb state copy after checking for size change

Emil Velikov evelikov at kemper.freedesktop.org
Thu Mar 12 13:11:38 UTC 2015


Module: Mesa
Branch: 10.4
Commit: 4db4f705467cfb7ec9c1955c1db782497a8bcf67
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4db4f705467cfb7ec9c1955c1db782497a8bcf67

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Mon Mar  2 21:22:27 2015 -0500

freedreno: move fb state copy after checking for size change

Fixes: 1f3ca56b ("freedreno: use util_copy_framebuffer_state()")
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Rob Clark <robclark at freedesktop.org>
Cc: "10.4 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f3dfe6513c26d1ce50b3b0fc830d4d8ff7f6b922)

---

 src/gallium/drivers/freedreno/freedreno_state.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 6293f43..77aa4f2 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -123,12 +123,12 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
 
 	fd_context_render(pctx);
 
-	util_copy_framebuffer_state(cso, framebuffer);
-
 	if ((cso->width != framebuffer->width) ||
 			(cso->height != framebuffer->height))
 		ctx->needs_rb_fbd = true;
 
+	util_copy_framebuffer_state(cso, framebuffer);
+
 	ctx->dirty |= FD_DIRTY_FRAMEBUFFER;
 
 	ctx->disabled_scissor.minx = 0;




More information about the mesa-commit mailing list