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] i965_drv_video: make VADriverContext.vtable a pointer.

---
 i965_drv_video/i965_drv_video.c | 85 +++++++++++++++++++++--------------------
 1 file 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);
-- 
2.11.0