diff options
| author | Brian Paul <[email protected]> | 2010-04-19 08:45:20 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-04-19 08:45:20 -0600 |
| commit | 8f3bdeaad610d7d5a5c6e73e1e9c721219595754 (patch) | |
| tree | 3375ac7eb94edf1914da7faafcedea32a2bd505b /src/gallium/drivers/nv50 | |
| parent | f7c2d4fee3104008c21078879cbc5720d7bc1be6 (diff) | |
| parent | e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/drivers/llvmpipe/lp_context.c
Diffstat (limited to 'src/gallium/drivers/nv50')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index f543b3c504d..915a9254025 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -97,7 +97,7 @@ nv50_create(struct pipe_screen *pscreen, void *priv) nv50_init_query_functions(nv50); nv50_init_resource_functions(&nv50->pipe); - nv50->draw = draw_create(); + nv50->draw = draw_create(&nv50->pipe); assert(nv50->draw); draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50)); |