From 2eea1714fdffbd665a2076c7b8fed7b264a42968 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Thu, 22 Apr 2010 18:06:05 +0100 Subject: llvmpipe: Fix resource_is_texture. It was missing PIPE_BIND_RENDER_TARGET, causing assertion failures for pure render targets. Also bind flags are too variable and complex for a good assessment for whether the resource is a texture or not. Target is more concise. --- src/gallium/drivers/llvmpipe/lp_texture.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/gallium/drivers/llvmpipe') diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index cee170ec83..4fce02ac71 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -55,14 +55,18 @@ static INLINE boolean resource_is_texture(const struct pipe_resource *resource) { - const unsigned tex_binds = (PIPE_BIND_DISPLAY_TARGET | - PIPE_BIND_SCANOUT | - PIPE_BIND_SHARED | - PIPE_BIND_DEPTH_STENCIL | - PIPE_BIND_SAMPLER_VIEW); - const struct llvmpipe_resource *lpr = llvmpipe_resource_const(resource); - - return (lpr->base.bind & tex_binds) ? TRUE : FALSE; + switch (resource->target) { + case PIPE_BUFFER: + return FALSE; + case PIPE_TEXTURE_1D: + case PIPE_TEXTURE_2D: + case PIPE_TEXTURE_3D: + case PIPE_TEXTURE_CUBE: + return TRUE; + default: + assert(0); + return FALSE; + } } -- cgit v1.2.3