diff options
| author | Stéphane Marchesin <marcheu@chromium.org> | 2011-08-26 17:37:25 -0700 |
|---|---|---|
| committer | Stéphane Marchesin <marcheu@chromium.org> | 2011-08-26 17:37:25 -0700 |
| commit | f8e6d19f3f40931be741b44d3edf210c38e13f0f (patch) | |
| tree | e99e4c619901412ac6448534b0f57ce1c4295c6b /src/gallium/drivers/softpipe/sp_query.c | |
| parent | 974c49ed176de55aadb335a2956ef5dfec774a23 (diff) | |
| parent | e3b0e3776646d0367206e4544229622eb22fe9f8 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_query.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_query.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c index 4ae69c1c2bd..88f42572f19 100644 --- a/src/gallium/drivers/softpipe/sp_query.c +++ b/src/gallium/drivers/softpipe/sp_query.c @@ -157,7 +157,7 @@ softpipe_get_query_result(struct pipe_context *pipe, /*os_get_time is in microseconds*/ td.frequency = 1000000; td.disjoint = FALSE; - memcpy(vresult, &sq->so, + memcpy(vresult, &td, sizeof(struct pipe_query_data_timestamp_disjoint)); } break; |