diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-11 10:04:07 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-11 10:04:07 -0700 |
| commit | a087eb590d780cb82b49464e05ffc85123adce7e (patch) | |
| tree | a2ac3ec2cc0b9001b350664d6e7915aba5e087a9 /src/gallium/auxiliary | |
| parent | cb640c8d40c4ee34160a14d646c244f44a5013f6 (diff) | |
| parent | e128cc205e30540597ecd57849060a6bf4714d9f (diff) | |
| download | external_mesa3d-a087eb590d780cb82b49464e05ffc85123adce7e.zip external_mesa3d-a087eb590d780cb82b49464e05ffc85123adce7e.tar.gz external_mesa3d-a087eb590d780cb82b49464e05ffc85123adce7e.tar.bz2 | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/rbug/rbug_connection.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/rbug/rbug_connection.c b/src/gallium/auxiliary/rbug/rbug_connection.c index 52acb70..ae4e27f 100644 --- a/src/gallium/auxiliary/rbug/rbug_connection.c +++ b/src/gallium/auxiliary/rbug/rbug_connection.c @@ -87,6 +87,7 @@ rbug_get_message(struct rbug_connection *c, uint32_t *serial) if (!data) { return NULL; } + data->opcode = 0; do { uint8_t *ptr = ((uint8_t*)data) + read; |