diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-08 11:02:41 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-08 11:02:41 -0700 |
| commit | 2b7602847aa7ae9b4e88fbea070710695d2cb8a4 (patch) | |
| tree | d6349b602d1d4682e6d1df4f58679cb1ea823564 /src/i830_exa.c | |
| parent | e4cdc42a98dd1be74e5c2bf5d9566f7449523b14 (diff) | |
| parent | b45f4b54b189a496255ddae12af38fc4c4408a51 (diff) | |
Merge branch 'exa-origin' into exa
Conflicts:
src/i915_exa_render.c
Diffstat (limited to 'src/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index 230c8a7f..2544760d 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -504,12 +504,14 @@ I830EXAInit(ScreenPtr pScreen) pI830->EXADriverPtr->DoneCopy = I830EXADoneCopy; /* Composite */ - if (IS_I9XX(pI830)) { + if (IS_I915G(pI830) || IS_I915GM(pI830) || + IS_I945G(pI830) || IS_I945GM(pI830)) { pI830->EXADriverPtr->CheckComposite = I915EXACheckComposite; pI830->EXADriverPtr->PrepareComposite = I915EXAPrepareComposite; pI830->EXADriverPtr->Composite = IntelEXAComposite; pI830->EXADriverPtr->DoneComposite = IntelEXADoneComposite; - } else if (IS_I865G(pI830) || IS_I855(pI830) || IS_845G(pI830) || IS_I830(pI830)) { + } else if (IS_I865G(pI830) || IS_I855(pI830) || + IS_845G(pI830) || IS_I830(pI830)) { pI830->EXADriverPtr->CheckComposite = I830EXACheckComposite; pI830->EXADriverPtr->PrepareComposite = I830EXAPrepareComposite; pI830->EXADriverPtr->Composite = IntelEXAComposite; |