diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/drivers/i965 | |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/drivers/i965')
| -rw-r--r-- | src/gallium/drivers/i965/brw_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/i965/brw_context.c b/src/gallium/drivers/i965/brw_context.c index 3dbe2b9130..4bcdcdd17e 100644 --- a/src/gallium/drivers/i965/brw_context.c +++ b/src/gallium/drivers/i965/brw_context.c @@ -118,6 +118,7 @@ struct pipe_context *brw_create_context(struct pipe_screen *screen, brw->sws = brw_screen(screen)->sws; brw->chipset = brw_screen(screen)->chipset; + brw_tex_init( brw ); brw_pipe_blend_init( brw ); brw_pipe_depth_stencil_init( brw ); brw_pipe_framebuffer_init( brw ); |