Mesa (master): freedreno: fix crash in fd_invalidate_resource()
Rob Clark
robclark at kemper.freedesktop.org
Fri Jul 10 15:58:21 UTC 2015
Module: Mesa
Branch: master
Commit: 422296e38d04789cc4ca336b46979b44abd19b5d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=422296e38d04789cc4ca336b46979b44abd19b5d
Author: Rob Clark <robclark at freedesktop.org>
Date: Thu Jul 2 18:15:43 2015 -0400
freedreno: fix crash in fd_invalidate_resource()
Signed-off-by: Rob Clark <robclark at freedesktop.org>
---
src/gallium/drivers/freedreno/freedreno_resource.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 95f79df..2049577 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -72,11 +72,11 @@ fd_invalidate_resource(struct fd_context *ctx, struct pipe_resource *prsc)
/* Textures */
for (i = 0; i < ctx->verttex.num_textures && !(ctx->dirty & FD_DIRTY_VERTTEX); i++) {
- if (ctx->verttex.textures[i]->texture == prsc)
+ if (ctx->verttex.textures[i] && (ctx->verttex.textures[i]->texture == prsc))
ctx->dirty |= FD_DIRTY_VERTTEX;
}
for (i = 0; i < ctx->fragtex.num_textures && !(ctx->dirty & FD_DIRTY_FRAGTEX); i++) {
- if (ctx->fragtex.textures[i]->texture == prsc)
+ if (ctx->fragtex.textures[i] && (ctx->fragtex.textures[i]->texture == prsc))
ctx->dirty |= FD_DIRTY_FRAGTEX;
}
}
More information about the mesa-commit
mailing list