fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

more fixes and clean-up in intelCopyBuffer()

Browse source
This commit is contained in:
Brian Paul 2006-03-24 14:42:04 +00:00
parent 3500f2e3c4
commit 1854ebe77e
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/drivers/dri/i915/intel_blit.c
View file

@ -50,25 +50,22 @@
*/
void intelCopyBuffer( const __DRIdrawablePrivate *dPriv )
{
GET_CURRENT_CONTEXT(ctx);
struct intel_context *intel;
DBG("%s\n", __FUNCTION__);
assert(dPriv);
assert(dPriv->driContextPriv);
assert(dPriv->driContextPriv->driverPrivate);
#if 00
/* XXX This context may not be the current one! Leads to nested locking
* if threading.
/* We need a rendering context in order to issue the blit cmd.
* Use the current context.
* XXX need to fix this someday.
*/
intel = (struct intel_context *) dPriv->driContextPriv->driverPrivate;
#else
{
GET_CURRENT_CONTEXT(ctx);
intel = (struct intel_context *) ctx;
if (!ctx) {
_mesa_problem(NULL, "No current context in intelCopyBuffer()");
return;
}
#endif
intel = (struct intel_context *) ctx;
bmFinishFence(intel->bm, intel->last_swap_fence);
@ -81,8 +78,6 @@ void intelCopyBuffer( const __DRIdrawablePrivate *dPriv )
intel->driDrawable->numClipRects)
{
const intelScreenPrivate *intelScreen = intel->intelScreen;
/* XXX why are we declaring a new dPriv (already passed as param!) */
const __DRIdrawablePrivate *dPriv = intel->driDrawable;
struct gl_framebuffer *fb
= (struct gl_framebuffer *) dPriv->driverPrivate;
const struct intel_region *frontRegion
@ -92,7 +87,7 @@ void intelCopyBuffer( const __DRIdrawablePrivate *dPriv )
const int nbox = dPriv->numClipRects;
const drm_clip_rect_t *pbox = dPriv->pClipRects;
const int pitch = frontRegion->pitch;
const int cpp= frontRegion->cpp;
const int cpp = frontRegion->cpp;
int BR13, CMD;
int i;