diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
| commit | f02f63997ce65530788a6dfcb28f11790a14d938 (patch) | |
| tree | fc6aedb5256bfb84eb170cb82addd2b6605510f8 /src/gallium/drivers/i915simple/i915_surface.c | |
| parent | e95e76e1255a3ad0ce604271301d090337b2e82b (diff) | |
| parent | 9778731732b4753e79a1b786c65325a52392411d (diff) | |
Merge branch 'master' into r300-compiler
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_surface.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c index 09b2c499b8..ab8331f3e6 100644 --- a/src/gallium/drivers/i915simple/i915_surface.c +++ b/src/gallium/drivers/i915simple/i915_surface.c @@ -89,6 +89,6 @@ i915_surface_fill(struct pipe_context *pipe, void i915_init_surface_functions(struct i915_context *i915) { - i915->pipe.surface_copy = i915_surface_copy; - i915->pipe.surface_fill = i915_surface_fill; + i915->base.surface_copy = i915_surface_copy; + i915->base.surface_fill = i915_surface_fill; } |