diff options
| author | Brian Paul <[email protected]> | 2010-01-08 08:21:12 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-08 08:21:12 -0700 |
| commit | fd70841121475d7aad98812d6bf9c9c67567b89a (patch) | |
| tree | 13f7eef837abc0151dc663a2b6fed04d7f2cc578 /src/gallium/drivers | |
| parent | a1de400e8de06a80ab140bb0fa950e990607572d (diff) | |
| parent | 674c76310fe93dd3d7a15af0f72bb9f04351d09f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_query.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_fs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c index 5d9e18218ae..5a4ab3508b8 100644 --- a/src/gallium/drivers/nv50/nv50_query.c +++ b/src/gallium/drivers/nv50/nv50_query.c @@ -111,7 +111,7 @@ nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq, if (!q->ready) { ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD | - wait ? 0 : NOUVEAU_BO_NOWAIT); + (wait ? 0 : NOUVEAU_BO_NOWAIT)); if (ret) return false; q->result = ((uint32_t *)q->bo->map)[1]; diff --git a/src/gallium/drivers/svga/svga_state_fs.c b/src/gallium/drivers/svga/svga_state_fs.c index bba80a93a56..d29f3762d2b 100644 --- a/src/gallium/drivers/svga/svga_state_fs.c +++ b/src/gallium/drivers/svga/svga_state_fs.c @@ -72,7 +72,7 @@ static enum pipe_error compile_fs( struct svga_context *svga, struct svga_shader_result **out_result ) { struct svga_shader_result *result; - enum pipe_error ret; + enum pipe_error ret = PIPE_ERROR; result = svga_translate_fragment_program( fs, key ); if (result == NULL) { |