Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xvmc: clean batch buffer finish

This commit is contained in:
Zhenyu Wang 2007-11-16 15:43:04 +08:00
parent a6e8f4ef04
commit 7bfbcb4dc7
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xvmc/i915_xvmc.c
View File

@ -1618,8 +1618,6 @@ static void i915_release_resource(Display *display, XvMCContext *context)
uniDRIDestroyContext(display, screen, pI915XvMC->id);
XUnlockDisplay(display);
intelDestroyBatchBuffer();
drmUnmap(xvmc_driver->sarea_address, xvmc_driver->sarea_size);
if (xvmc_driver->fd >= 0)

5
src/xvmc/intel_batchbuffer.c
View File

@ -82,7 +82,7 @@ void intelWaitIrq(int seq)
}
}
void intelDestroyBatchBuffer(void)
static void intelDestroyBatchBuffer(void)
{
if (xvmc_driver->alloc.offset) {
xvmc_driver->alloc.ptr = NULL;
@ -122,12 +122,11 @@ Bool intelInitBatchBuffer(void)
void intelFiniBatchBuffer(void)
{
intelFlushBatch(TRUE);
if (xvmc_driver->batchbuffer.map) {
drmUnmap(xvmc_driver->batchbuffer.map, xvmc_driver->batchbuffer.size);
xvmc_driver->batchbuffer.map = NULL;
}
intelDestroyBatchBuffer();
}
void intelBatchbufferRequireSpace(unsigned int sz)

3
src/xvmc/intel_batchbuffer.h
View File

@ -37,7 +37,6 @@ extern int VERBOSE;
extern void intelFlushBatch(Bool);
extern void intelBatchbufferData(const void *, unsigned, unsigned);
extern Bool intelInitBatchBuffer(void);
extern Bool intelFnitBatchBuffer(void);
extern void intelDestroyBatchBuffer(void);
extern void intelFiniBatchBuffer(void);
extern void intelCmdIoctl(char *, unsigned);
#endif /* _INTEL_BATCHBUFFER_H */