diff options
author | Eric Anholt <eric@anholt.net> | 2007-01-31 14:01:41 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-01-31 14:01:41 -0800 |
commit | 5238ff9c80718f9f8baa06123aa1bb6e3193fce6 (patch) | |
tree | d85791910a3ddd3fae9d1cff9b7d25d528aef0b7 /src/i830_exa.c | |
parent | c47210d94ed17ad9e8e489a1e1886732e6dc7220 (diff) |
Naming and formatting cleanup in Render acceleration code.
Diffstat (limited to 'src/i830_exa.c')
-rw-r--r-- | src/i830_exa.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index 8a1577af..97b4a98e 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -398,23 +398,25 @@ I830EXAInit(ScreenPtr pScreen) pI830->EXADriverPtr->DoneCopy = I830EXADoneCopy; /* Composite */ - 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)) { - pI830->EXADriverPtr->CheckComposite = I830EXACheckComposite; - pI830->EXADriverPtr->PrepareComposite = I830EXAPrepareComposite; - pI830->EXADriverPtr->Composite = IntelEXAComposite; - pI830->EXADriverPtr->DoneComposite = IntelEXADoneComposite; - } else if (IS_I965G(pI830)) { - pI830->EXADriverPtr->CheckComposite = I965EXACheckComposite; - pI830->EXADriverPtr->PrepareComposite = I965EXAPrepareComposite; - pI830->EXADriverPtr->Composite = I965EXAComposite; - pI830->EXADriverPtr->DoneComposite = IntelEXADoneComposite; + if (IS_I865G(pI830) || IS_I855(pI830) || + IS_845G(pI830) || IS_I830(pI830)) + { + pI830->EXADriverPtr->CheckComposite = i830_check_composite; + pI830->EXADriverPtr->PrepareComposite = i830_prepare_composite; + pI830->EXADriverPtr->Composite = i830_composite; + pI830->EXADriverPtr->DoneComposite = i830_done_composite; + } else if (IS_I915G(pI830) || IS_I915GM(pI830) || + IS_I945G(pI830) || IS_I945GM(pI830)) + { + pI830->EXADriverPtr->CheckComposite = i915_check_composite; + pI830->EXADriverPtr->PrepareComposite = i915_prepare_composite; + pI830->EXADriverPtr->Composite = i830_composite; + pI830->EXADriverPtr->DoneComposite = i830_done_composite; + } else { + pI830->EXADriverPtr->CheckComposite = i965_check_composite; + pI830->EXADriverPtr->PrepareComposite = i965_prepare_composite; + pI830->EXADriverPtr->Composite = i965_composite; + pI830->EXADriverPtr->DoneComposite = i830_done_composite; } if(!exaDriverInit(pScreen, pI830->EXADriverPtr)) { |