OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aaf7ecf
5b64d94
)
Merge remote branch 'origin/mesa_7_7_branch'
author
José Fonseca
<jfonseca@vmware.com>
Wed, 6 Jan 2010 13:52:22 +0000
(13:52 +0000)
committer
José Fonseca
<jfonseca@vmware.com>
Wed, 6 Jan 2010 13:52:22 +0000
(13:52 +0000)
Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
1
2
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/drivers/svga/svga_context.h
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/drivers/svga/svga_pipe_vs.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/drivers/svga/svga_state_vs.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/state_tracker/st_mesa_to_tgsi.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index
a9375ab
,
1ee2bf9
..
ba6f7b1
---
1
/
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
---
2
/
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@@
-272,9
-274,7
+275,8
@@@
fenced_buffer_list_check_free_locked(st
fenced_buffer_remove_locked(fenced_list, fenced_buf);
pipe_mutex_unlock(fenced_buf->mutex);
- pb_reference((struct pb_buffer **)&fenced_buf, NULL);
+ pb_buf = &fenced_buf->base;
+ pb_reference(&pb_buf, NULL);
-
curr = next;
next = curr->next;
diff --cc
src/gallium/drivers/svga/svga_context.h
Simple merge
diff --cc
src/gallium/drivers/svga/svga_pipe_vs.c
Simple merge
diff --cc
src/gallium/drivers/svga/svga_state_vs.c
Simple merge
diff --cc
src/mesa/state_tracker/st_mesa_to_tgsi.c
Simple merge