diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-04 20:50:20 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-03-04 14:33:39 -0800 |
| commit | 066d9b64ee243e0d255d7e12c2134951eef4ade7 (patch) | |
| tree | 0f30d24172ce026042c9e9b2dea36567ca398ed7 /src | |
| parent | 7b7c724da97f358f5d2d4d4dae75cfc85bde2c62 (diff) | |
i915 XvMC: kill dead code
This kills one wip remnant from my i830_memory cleanup and the last
remainings of the subpicture support.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'src')
| -rw-r--r-- | src/i915_hwmc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c index 8ba122be..457c89b0 100644 --- a/src/i915_hwmc.c +++ b/src/i915_hwmc.c @@ -231,26 +231,6 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn, int ret; if (FOURCC_XVMC == id) { -#if 0 - switch (xvmc_cmd->command) { - case INTEL_XVMC_COMMAND_DISPLAY: - if ((xvmc_cmd->srfNo >= I915_XVMC_MAX_SURFACES) || - !pXvMC->surfaces[xvmc_cmd->srfNo] || - !pXvMC->sfprivs[xvmc_cmd->srfNo]) { - xf86DrvMsg(scrn->scrnIndex, X_ERROR, - "[XvMC] i915 put image: Invalid parameters!\n"); - return 1; - } - - /* use char *buf to hold our surface offset...hacky! */ - buf = - (unsigned char *)pXvMC->sfprivs[xvmc_cmd->srfNo]-> - surface->bo->offset; - break; - default: - return 0; - } -#endif /* Pass the GEM object name through the pointer arg. */ buf = (void *)(uintptr_t)xvmc_cmd->handle; } @@ -295,10 +275,6 @@ static XF86MCAdaptorRec pAdapt = { .name = "Intel(R) Textured Video", .num_surfaces = ARRAY_SIZE(ppSI), .surfaces = ppSI, -#if 0 - .num_subpictures = ARRARY_SIZE(i915_subpicture_list), - .subpictures = i915_subpicture_list, -#endif .num_subpictures = 0, .subpictures = NULL, .CreateContext = |