diff options
| author | Christian König <[email protected]> | 2011-01-21 21:51:24 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-21 21:51:24 +0100 |
| commit | 86e5b79a274ad4ed5c169aa5626106331273311c (patch) | |
| tree | 31bc98df0e79c453c5ff143ac8e6ddaa846799c1 /src/gallium/drivers/i915/i915_state_fpc.c | |
| parent | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (diff) | |
| parent | 8af583f6e844ef2d173eb3c5c2e378cd1da018a8 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/drivers/i915/i915_state_fpc.c')
| -rw-r--r-- | src/gallium/drivers/i915/i915_state_fpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915/i915_state_fpc.c b/src/gallium/drivers/i915/i915_state_fpc.c index ec7cec0e471..1959a24691d 100644 --- a/src/gallium/drivers/i915/i915_state_fpc.c +++ b/src/gallium/drivers/i915/i915_state_fpc.c @@ -40,7 +40,7 @@ static void update_hw_constants(struct i915_context *i915) struct i915_tracked_state i915_hw_constants = { "hw_constants", update_hw_constants, - I915_NEW_CONSTANTS | I915_NEW_FS + I915_NEW_FS_CONSTANTS | I915_NEW_FS }; |