OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
070f280
)
Fix texrect upload conflicts.
author
Aapo Tahkola
<aet@rasterburn.org>
Mon, 20 Mar 2006 13:37:28 +0000
(13:37 +0000)
committer
Aapo Tahkola
<aet@rasterburn.org>
Mon, 20 Mar 2006 13:37:28 +0000
(13:37 +0000)
src/mesa/drivers/dri/r300/r300_texmem.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r300/r300_texmem.c
b/src/mesa/drivers/dri/r300/r300_texmem.c
index
d78ec3b
..
90d8b2f
100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/
src/mesa/drivers/dri/r300/r300_texmem.c
@@
-56,6
+56,10
@@
SOFTWARE.
#include "r300_ioctl.h"
#include <unistd.h> /* for usleep() */
+#ifdef USER_BUFFERS
+#include "radeon_mm.h"
+#endif
+
/**
* Destroy any device-dependent state associated with the texture. This may
* include NULLing out hardware state that points to the texture.
@@
-268,6
+272,9
@@
static void r300UploadRectSubImage(r300ContextPtr rmesa,
width, lines);
r300EmitWait(rmesa, R300_WAIT_2D);
+#ifdef USER_BUFFERS
+ radeon_mm_use(rmesa, region.buf->id);
+#endif
r300ReleaseDmaRegion(rmesa, ®ion, __FUNCTION__);
done += lines;