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

xvmc: Get rid of unused variables. 

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Cyril Brulebois 2011-01-31 06:22:35 +01:00 committed by Chris Wilson
parent 8bd6a7149f
commit ae8877e307
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xvmc/i915_xvmc.c
View File

@ -391,7 +391,6 @@ static void i915_mc_static_indirect_state_set(XvMCContext * context,
i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
struct intel_xvmc_surface *intel_surf = dest->privData;
struct i915_mc_static_indirect_state_buffer *buffer_info;
unsigned int w = dest->width;
drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo);
buffer_info = pI915XvMC->sis_bo->virtual;
@ -688,7 +687,7 @@ static void i915_mc_load_indirect_render_emit(XvMCContext * context)
{
i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
int mem_select;
uint32_t load_indirect, buffer_address;
uint32_t load_indirect;
BATCH_LOCALS;
BEGIN_BATCH(5);

2
src/xvmc/intel_batchbuffer.c
View File

@ -64,8 +64,6 @@ static void i965_end_batch(void)
Bool intelInitBatchBuffer(void)
{
int i;
if ((xvmc_driver->batch.buf =
drm_intel_bo_alloc(xvmc_driver->bufmgr,
"batch buffer", BATCH_SIZE, 0x1000)) == NULL) {

13
src/xvmc/intel_xvmc.c
View File

@ -105,8 +105,6 @@ unsigned int mb_bytes_420[] = {
void LOCK_HARDWARE(drm_context_t ctx)
{
char __ret = 0;
PPTHREAD_MUTEX_LOCK();
assert(!xvmc_driver->locked);
@ -218,11 +216,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
int error_base;
int event_base;
int priv_count;
int isCapable;
int screen = DefaultScreen(display);
intel_xvmc_context_ptr intel_ctx;
int fd;
char *driverName = NULL, *deviceName = NULL;
/* Verify Obvious things first */
if (!display || !context)
@ -482,7 +475,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context,
unsigned int num_blocks,
XvMCBlockArray * block)
{
Status ret;
if (!display || !context || !num_blocks || !block)
return BadValue;
@ -505,7 +497,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context,
*/
_X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block)
{
Status ret;
if (!display || !block)
return BadValue;
@ -679,7 +670,6 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface,
_X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
{
Status ret;
int stat = 0;
if (!display || !surface)
return XvMCBadSurface;
@ -739,9 +729,6 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface,
*/
_X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
{
int stat = 0;
Status ret;
if (!display || !surface)
return XvMCBadSurface;

1
src/xvmc/xvmc_vld.c
View File

@ -785,7 +785,6 @@ static Status begin_surface(Display * display, XvMCContext * context,
XvMCSurface * future,
const XvMCMpegControl * control)
{
struct i965_xvmc_contex *i965_ctx;
struct intel_xvmc_surface *priv_target, *priv_past, *priv_future;
intel_xvmc_context_ptr intel_ctx = context->privData;
Status ret;