diff options
| author | Ben Skeggs <[email protected]> | 2008-09-12 23:21:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-12 23:21:41 +1000 |
| commit | d37e6f9a7fcdf741bf1afa1d2a555710230500a3 (patch) | |
| tree | b0bbd4ebb72e69dacff36f51a5880455cc9ac1d0 /src/gallium | |
| parent | 63c49bee3a2ce0ca62555da052e57a2d206da07d (diff) | |
| parent | 3df06470275573f7d1d6eb6ce690f2e7ffa4ced7 (diff) | |
Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/winsys/drm/intel/dri/intel_swapbuffers.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/winsys/drm/intel/dri/intel_swapbuffers.c b/src/gallium/winsys/drm/intel/dri/intel_swapbuffers.c index 8a18bfd9a43..34ad7eebe1c 100644 --- a/src/gallium/winsys/drm/intel/dri/intel_swapbuffers.c +++ b/src/gallium/winsys/drm/intel/dri/intel_swapbuffers.c @@ -94,7 +94,6 @@ intelDisplaySurface(__DRIdrawablePrivate *dPriv, int i; ASSERT(surf->buffer); - ASSERT(surf->cpp == cpp); DBG(SWAP, "screen pitch %d src surface pitch %d\n", pitch, surf->stride); |