- new version 1.0.11

* obsoletes patch
    - i965_dri_video: don't try to render an invalid surface

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=4
This commit is contained in:
Kshitij Kulshreshtha 2011-03-28 17:25:25 +00:00 committed by Git OBS Bridge
parent fdda702266
commit 53c6132662
6 changed files with 11 additions and 145 deletions

View File

@ -1,115 +0,0 @@
From 2b7850b35a51c59a6692781d5e40e4bb608b6344 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Thu, 27 Jan 2011 10:41:24 +0100
Subject: [PATCH 1/2] i965_drv_video: make VADriverContext.vtable a pointer.
---
i965_drv_video/i965_drv_video.c | 85 ++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 303e090..5baa0ff 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1839,6 +1839,7 @@ i965_Terminate(VADriverContextP ctx)
VAStatus
VA_DRIVER_INIT_FUNC( VADriverContextP ctx )
{
+ struct VADriverVTable * const vtable = ctx->vtable;
struct i965_driver_data *i965;
int result;
@@ -1852,48 +1853,48 @@ VA_DRIVER_INIT_FUNC( VADriverContextP ctx )
ctx->max_display_attributes = I965_MAX_DISPLAY_ATTRIBUTES;
ctx->str_vendor = I965_STR_VENDOR;
- ctx->vtable.vaTerminate = i965_Terminate;
- ctx->vtable.vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints;
- ctx->vtable.vaQueryConfigProfiles = i965_QueryConfigProfiles;
- ctx->vtable.vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints;
- ctx->vtable.vaQueryConfigAttributes = i965_QueryConfigAttributes;
- ctx->vtable.vaCreateConfig = i965_CreateConfig;
- ctx->vtable.vaDestroyConfig = i965_DestroyConfig;
- ctx->vtable.vaGetConfigAttributes = i965_GetConfigAttributes;
- ctx->vtable.vaCreateSurfaces = i965_CreateSurfaces;
- ctx->vtable.vaDestroySurfaces = i965_DestroySurfaces;
- ctx->vtable.vaCreateContext = i965_CreateContext;
- ctx->vtable.vaDestroyContext = i965_DestroyContext;
- ctx->vtable.vaCreateBuffer = i965_CreateBuffer;
- ctx->vtable.vaBufferSetNumElements = i965_BufferSetNumElements;
- ctx->vtable.vaMapBuffer = i965_MapBuffer;
- ctx->vtable.vaUnmapBuffer = i965_UnmapBuffer;
- ctx->vtable.vaDestroyBuffer = i965_DestroyBuffer;
- ctx->vtable.vaBeginPicture = i965_BeginPicture;
- ctx->vtable.vaRenderPicture = i965_RenderPicture;
- ctx->vtable.vaEndPicture = i965_EndPicture;
- ctx->vtable.vaSyncSurface = i965_SyncSurface;
- ctx->vtable.vaQuerySurfaceStatus = i965_QuerySurfaceStatus;
- ctx->vtable.vaPutSurface = i965_PutSurface;
- ctx->vtable.vaQueryImageFormats = i965_QueryImageFormats;
- ctx->vtable.vaCreateImage = i965_CreateImage;
- ctx->vtable.vaDeriveImage = i965_DeriveImage;
- ctx->vtable.vaDestroyImage = i965_DestroyImage;
- ctx->vtable.vaSetImagePalette = i965_SetImagePalette;
- ctx->vtable.vaGetImage = i965_GetImage;
- ctx->vtable.vaPutImage = i965_PutImage;
- ctx->vtable.vaQuerySubpictureFormats = i965_QuerySubpictureFormats;
- ctx->vtable.vaCreateSubpicture = i965_CreateSubpicture;
- ctx->vtable.vaDestroySubpicture = i965_DestroySubpicture;
- ctx->vtable.vaSetSubpictureImage = i965_SetSubpictureImage;
- ctx->vtable.vaSetSubpictureChromakey = i965_SetSubpictureChromakey;
- ctx->vtable.vaSetSubpictureGlobalAlpha = i965_SetSubpictureGlobalAlpha;
- ctx->vtable.vaAssociateSubpicture = i965_AssociateSubpicture;
- ctx->vtable.vaDeassociateSubpicture = i965_DeassociateSubpicture;
- ctx->vtable.vaQueryDisplayAttributes = i965_QueryDisplayAttributes;
- ctx->vtable.vaGetDisplayAttributes = i965_GetDisplayAttributes;
- ctx->vtable.vaSetDisplayAttributes = i965_SetDisplayAttributes;
-// ctx->vtable.vaDbgCopySurfaceToBuffer = i965_DbgCopySurfaceToBuffer;
+ vtable->vaTerminate = i965_Terminate;
+ vtable->vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints;
+ vtable->vaQueryConfigProfiles = i965_QueryConfigProfiles;
+ vtable->vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints;
+ vtable->vaQueryConfigAttributes = i965_QueryConfigAttributes;
+ vtable->vaCreateConfig = i965_CreateConfig;
+ vtable->vaDestroyConfig = i965_DestroyConfig;
+ vtable->vaGetConfigAttributes = i965_GetConfigAttributes;
+ vtable->vaCreateSurfaces = i965_CreateSurfaces;
+ vtable->vaDestroySurfaces = i965_DestroySurfaces;
+ vtable->vaCreateContext = i965_CreateContext;
+ vtable->vaDestroyContext = i965_DestroyContext;
+ vtable->vaCreateBuffer = i965_CreateBuffer;
+ vtable->vaBufferSetNumElements = i965_BufferSetNumElements;
+ vtable->vaMapBuffer = i965_MapBuffer;
+ vtable->vaUnmapBuffer = i965_UnmapBuffer;
+ vtable->vaDestroyBuffer = i965_DestroyBuffer;
+ vtable->vaBeginPicture = i965_BeginPicture;
+ vtable->vaRenderPicture = i965_RenderPicture;
+ vtable->vaEndPicture = i965_EndPicture;
+ vtable->vaSyncSurface = i965_SyncSurface;
+ vtable->vaQuerySurfaceStatus = i965_QuerySurfaceStatus;
+ vtable->vaPutSurface = i965_PutSurface;
+ vtable->vaQueryImageFormats = i965_QueryImageFormats;
+ vtable->vaCreateImage = i965_CreateImage;
+ vtable->vaDeriveImage = i965_DeriveImage;
+ vtable->vaDestroyImage = i965_DestroyImage;
+ vtable->vaSetImagePalette = i965_SetImagePalette;
+ vtable->vaGetImage = i965_GetImage;
+ vtable->vaPutImage = i965_PutImage;
+ vtable->vaQuerySubpictureFormats = i965_QuerySubpictureFormats;
+ vtable->vaCreateSubpicture = i965_CreateSubpicture;
+ vtable->vaDestroySubpicture = i965_DestroySubpicture;
+ vtable->vaSetSubpictureImage = i965_SetSubpictureImage;
+ vtable->vaSetSubpictureChromakey = i965_SetSubpictureChromakey;
+ vtable->vaSetSubpictureGlobalAlpha = i965_SetSubpictureGlobalAlpha;
+ vtable->vaAssociateSubpicture = i965_AssociateSubpicture;
+ vtable->vaDeassociateSubpicture = i965_DeassociateSubpicture;
+ vtable->vaQueryDisplayAttributes = i965_QueryDisplayAttributes;
+ vtable->vaGetDisplayAttributes = i965_GetDisplayAttributes;
+ vtable->vaSetDisplayAttributes = i965_SetDisplayAttributes;
+// vtable->vaDbgCopySurfaceToBuffer = i965_DbgCopySurfaceToBuffer;
i965 = (struct i965_driver_data *)calloc(1, sizeof(*i965));
assert(i965);
--
1.7.4.1

View File

@ -1,26 +0,0 @@
From 3739a5e19700f508eac0b874856d08a06ea9ff45 Mon Sep 17 00:00:00 2001
From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 24 Feb 2011 15:22:46 +0800
Subject: [PATCH 2/2] i965_dri_video: don't try to render an invalid surface
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---
i965_drv_video/i965_drv_video.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 5baa0ff..0f09d8a 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1736,7 +1736,7 @@ i965_PutSurface(VADriverContextP ctx,
* will get here
*/
obj_surface = SURFACE(surface);
- if (obj_surface->bo == NULL)
+ if (!obj_surface || !obj_surface->bo)
return VA_STATUS_SUCCESS;
dri_drawable = dri_get_drawable(ctx, (Drawable)draw);
--
1.7.4.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71c77a3a2f4f6cd65974932d4acb9b4f9749ed0103fa2495720d48ffdeb50798
size 459100

3
libva-1.0.11.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3022fa269ac3b8bbef8a88d87abed6d80ce0502bb9b161188a382cf0a97bb2f
size 461478

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 28 17:23:25 UTC 2011 - kkhere.geo@gmail.com
- new version 1.0.11
* obsoletes patch
- i965_dri_video: don't try to render an invalid surface
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 3 15:02:06 UTC 2011 - kkhere.geo@gmail.com Thu Mar 3 15:02:06 UTC 2011 - kkhere.geo@gmail.com

View File

@ -1,5 +1,5 @@
Name: libva Name: libva
Version: 1.0.10 Version: 1.0.11
Release: 1 Release: 1
License: MIT License: MIT
Summary: Video Acceleration (VA) API for Linux Summary: Video Acceleration (VA) API for Linux