From fb9a133071d05417e62136600f9fd351a9cbb364 Mon Sep 17 00:00:00 2001 From: Tom Fogal Date: Tue, 3 Aug 2010 12:33:30 -0600 Subject: [PATCH] radeon: fix some wine d3d9 tests Need to flush command stream before mapping texture image that is referenced by current cs. This is a manual application of ba03a0b5ba73bc8e79d0ffa6d1da623544716f74, which could not be cherry-picked directly due to refactoring. Acked-by: Maciej Cencora --- src/mesa/drivers/dri/radeon/radeon_texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index ff37fd3e86e..caa55d25667 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -1016,7 +1016,15 @@ radeon_get_tex_image(GLcontext * ctx, GLenum target, GLint level, __func__, ctx, texObj, image, compressed); if (image->mt) { + radeonContextPtr rmesa = RADEON_CONTEXT(ctx); /* Map the texture image read-only */ + if (radeon_bo_is_referenced_by_cs(image->mt->bo, rmesa->cmdbuf.cs)) { + radeon_print(RADEON_TEXTURE, RADEON_VERBOSE, + "%s: called for texture that is queued for GPU processing\n", + __func__); + radeon_firevertices(rmesa); + } + radeon_teximage_map(image, GL_FALSE); } else { /* Image hasn't been uploaded to a miptree yet */