diff options
| author | Tom Fogal <tfogal@alumni.unh.edu> | 2010-08-03 12:33:30 -0600 |
|---|---|---|
| committer | Tom Fogal <tfogal@alumni.unh.edu> | 2010-08-04 16:08:10 -0600 |
| commit | fb9a133071d05417e62136600f9fd351a9cbb364 (patch) | |
| tree | 105c78513b12bc49908b5e33ccb31ab1cc4fe845 | |
| parent | 886019125e20d7ca8c284928a939dbc7a9c64ce5 (diff) | |
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 <m.cencora@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index ff37fd3e86..caa55d2566 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 */ |