diff options
| author | Jason Ekstrand <[email protected]> | 2016-03-24 17:30:14 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-03-24 17:30:14 -0700 |
| commit | 2c3f95d6aaab38cd66dd3dee1b089d5c91928eea (patch) | |
| tree | 43423daf0da9c45f4054c5763a87f33dbfc7c4d5 /src/gallium/drivers/r300/r300_context.c | |
| parent | a5dc3c0f02aa523d1d3d123b62b9a187821079fe (diff) | |
| parent | 22b343a8ec75a08dae6a6badbb261eab8437475d (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 6fa892089ec..d100a9df55b 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -385,7 +385,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, if (!r300->ctx) goto fail; - r300->cs = rws->cs_create(r300->ctx, RING_GFX, r300_flush_callback, r300, NULL); + r300->cs = rws->cs_create(r300->ctx, RING_GFX, r300_flush_callback, r300); if (r300->cs == NULL) goto fail; |