From 018b78ad649e88cc6d8b6b10aef1502075508515 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 13 Jan 2010 15:32:55 -0700 Subject: llvmpipe: check render targets before other textures --- src/gallium/drivers/llvmpipe/lp_setup.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/llvmpipe/lp_setup.c') diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index ce006bf618..649e97992b 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; } -- cgit v1.2.3