diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-09 15:13:50 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-09 15:13:50 +0100 |
| commit | 1b54ee493fb96f944aa81e56fa6f00a8067f87fc (patch) | |
| tree | dbba3200222c9c60aa7b28c0bc9ca2266c3853b6 /src/i830_dri.c | |
| parent | e972265261c421268e4fb806e587378d0adec577 (diff) | |
| parent | 81722a21d232fa6cfb11fbe3d984abab50e89bcc (diff) | |
Merge remote branch 'origin/master' into i830-pageflip
Conflicts:
src/i830_dri.c
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 9931acc4..52935744 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -109,10 +109,6 @@ static void I830DRITransitionMultiToSingle3d(ScreenPtr pScreen); static void I830DRITransitionSingleToMulti3d(ScreenPtr pScreen); static void I830DRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num); -#if 0 -static void I830DRIShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf); -#endif - extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig * configs, void **configprivs); @@ -1418,10 +1414,6 @@ I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, * allocate and free 3d-specific memory on demand. */ - - - - /* Use the miext/shadow module to maintain a list of dirty rectangles. * These are blitted to the back buffer to keep both buffers clean * during page-flipping when the 3d application isn't fullscreen. |