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/llvmpipe/lp_context.c | |
| 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/llvmpipe/lp_context.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index 868e112ba3f..900740e02fa 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -163,9 +163,9 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv ) * Create drawing context and plug our rendering stage into it. */ #if USE_DRAW_LLVM - llvmpipe->draw = draw_create_with_llvm(); + llvmpipe->draw = draw_create_with_llvm(&llvmpipe->pipe); #else - llvmpipe->draw = draw_create(); + llvmpipe->draw = draw_create(&llvmpipe->pipe); #endif if (!llvmpipe->draw) goto fail; |