Mesa (lp-binning): llvmpipe: check render targets before other textures

[Brian Paul]

Module: Mesa
Branch: lp-binning
Commit: 018b78ad649e88cc6d8b6b10aef1502075508515
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=018b78ad649e88cc6d8b6b10aef1502075508515

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 13 15:32:55 2010 -0700

llvmpipe: check render targets before other textures

---

 src/gallium/drivers/llvmpipe/lp_setup.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index ce006bf..649e979 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -482,19 +482,22 @@ lp_setup_is_texture_referenced( const struct setup_context *setup,
                                 const struct pipe_texture *texture )
 {
    unsigned i;
-   for (i = 0; i < Elements(setup->scenes); i++) {
-      if (lp_scene_is_textured_referenced(setup->scenes[i], texture)) {
-         return PIPE_REFERENCED_FOR_READ;
-      }
-   }
 
    /* check the render targets */
    for (i = 0; i < setup->fb.nr_cbufs; i++) {
       if (setup->fb.cbufs[i]->texture == texture)
          return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
    }
-   if (setup->fb.zsbuf && setup->fb.zsbuf->texture == texture)
+   if (setup->fb.zsbuf && setup->fb.zsbuf->texture == texture) {
       return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
+   }
+
+   /* check textures referenced by the scene */
+   for (i = 0; i < Elements(setup->scenes); i++) {
+      if (lp_scene_is_textured_referenced(setup->scenes[i], texture)) {
+         return PIPE_REFERENCED_FOR_READ;
+      }
+   }
 
    return PIPE_UNREFERENCED;
 }