diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-12-02 22:26:21 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-12-02 22:26:21 -0500 |
| commit | ca74ebf8813b7fab8d08465ef9600f001c948e94 (patch) | |
| tree | f3eb4ee04a1ac0f48621dcd4d8c40905da8500e5 /src/radeon_exa_render.c | |
| parent | fc079c5267baf431bbecee7744e484783d393152 (diff) | |
move 3d state init after RADEON_SWITCH_TO_3D()
Diffstat (limited to 'src/radeon_exa_render.c')
| -rw-r--r-- | src/radeon_exa_render.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index 68a7a768..c75c6a52 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -527,9 +527,6 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, TRACE; - if (!info->accel_state->XInited3D) - RADEONInit3DEngine(pScrn); - if (!RADEONGetDestFormat(pDstPicture, &dst_format)) return FALSE; @@ -561,6 +558,9 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, RADEON_SWITCH_TO_3D(); + if (!info->accel_state->XInited3D) + RADEONInit3DEngine(pScrn); + if (!FUNC_NAME(R100TextureSetup)(pSrcPicture, pSrc, 0)) return FALSE; pp_cntl = RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE; @@ -830,9 +830,6 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, TRACE; - if (!info->accel_state->XInited3D) - RADEONInit3DEngine(pScrn); - if (!RADEONGetDestFormat(pDstPicture, &dst_format)) return FALSE; @@ -862,6 +859,9 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, RADEON_SWITCH_TO_3D(); + if (!info->accel_state->XInited3D) + RADEONInit3DEngine(pScrn); + if (!FUNC_NAME(R200TextureSetup)(pSrcPicture, pSrc, 0)) return FALSE; pp_cntl = RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE; @@ -1194,9 +1194,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, TRACE; - if (!info->accel_state->XInited3D) - RADEONInit3DEngine(pScrn); - if (!R300GetDestFormat(pDstPicture, &dst_format)) return FALSE; @@ -1226,6 +1223,9 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, RADEON_SWITCH_TO_3D(); + if (!info->accel_state->XInited3D) + RADEONInit3DEngine(pScrn); + if (!FUNC_NAME(R300TextureSetup)(pSrcPicture, pSrc, 0)) return FALSE; txenable = R300_TEX_0_ENABLE; |