cirros-testvm/src-cirros/buildroot-2015.05/package/qt/0002-eglwsegl-use-system.patch

   1 Patch to remove obsolete powervr headers and instead use the headers provided
   2 on the system.
   3
   4 Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
   5 ---
   6 Index: qt-4.8.5/src/3rdparty/powervr/pvr2d.h
   7 ===================================================================
   8 --- qt-4.8.5.orig/src/3rdparty/powervr/pvr2d.h  2013-07-08 11:24:33.010516867 -0500
   9 +++ /dev/null   1970-01-01 00:00:00.000000000 +0000
  10 @@ -1,502 +0,0 @@
  11 -/*!****************************************************************************
  12 -@File          pvr2d.h
  13 -@Title         PVR2D external header file
  14 -@Author        Imagination Technologies
  15 -@Copyright     Copyright (c) by Imagination Technologies Limited.
  16 -                               This specification is protected by copyright laws and contains
  17 -                               material proprietary to Imagination Technologies Limited.
  18 -                               You may use and distribute this specification free of charge for implementing
  19 -                               the functionality therein, without altering or removing any trademark, copyright,
  20 -                               or other notice from the specification.
  21 -@Platform      Generic
  22 -@Description   PVR2D definitions for PVR2D clients
  23 -******************************************************************************/
  24 -
  25 -
  26 -/******************************************************************************
  27 -Modifications :-
  28 -$Log: pvr2d.h $
  29 -******************************************************************************/
  30 -
  31 -#ifndef _PVR2D_H_
  32 -#define _PVR2D_H_
  33 -
  34 -#ifdef __cplusplus
  35 -extern "C" {
  36 -#endif
  37 -
  38 -/* PVR2D Platform-specific definitions */
  39 -#define PVR2D_EXPORT
  40 -#define PVR2D_IMPORT
  41 -
  42 -
  43 -#define PVR2D_REV_MAJOR                2
  44 -#define PVR2D_REV_MINOR                1
  45 -
  46 -typedef enum
  47 -{
  48 -       PVR2D_FALSE = 0,
  49 -       PVR2D_TRUE
  50 -} PVR2D_BOOL;
  51 -
  52 -
  53 -/* error codes */
  54 -typedef enum
  55 -{
  56 -       PVR2D_OK = 0,
  57 -       PVR2DERROR_INVALID_PARAMETER = -1,
  58 -       PVR2DERROR_DEVICE_UNAVAILABLE = -2,
  59 -       PVR2DERROR_INVALID_CONTEXT = -3,
  60 -       PVR2DERROR_MEMORY_UNAVAILABLE = -4,
  61 -       PVR2DERROR_DEVICE_NOT_PRESENT = -5,
  62 -       PVR2DERROR_IOCTL_ERROR = -6,
  63 -       PVR2DERROR_GENERIC_ERROR = -7,
  64 -       PVR2DERROR_BLT_NOTCOMPLETE = -8,
  65 -       PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,
  66 -       PVR2DERROR_NOT_YET_IMPLEMENTED = -10,
  67 -       PVR2DERROR_MAPPING_FAILED = -11
  68 -}PVR2DERROR;
  69 -
  70 -
  71 -/* pixel formats */
  72 -typedef enum
  73 -{
  74 -       PVR2D_1BPP = 0,
  75 -       PVR2D_RGB565,
  76 -       PVR2D_ARGB4444,
  77 -       PVR2D_RGB888,
  78 -       PVR2D_ARGB8888,
  79 -       PVR2D_ARGB1555,
  80 -       PVR2D_ALPHA8,
  81 -       PVR2D_ALPHA4,
  82 -       PVR2D_PAL2,
  83 -       PVR2D_PAL4,
  84 -       PVR2D_PAL8,
  85 -       PVR2D_VGAEMU
  86 -
  87 -}PVR2DFORMAT;
  88 -
  89 -
  90 -/* wrap surface type */
  91 -typedef enum
  92 -{
  93 -       PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
  94 -       PVR2D_WRAPFLAG_CONTIGUOUS = 1,
  95 -
  96 -}PVR2DWRAPFLAGS;
  97 -
  98 -/* flags for control information of additional blits */
  99 -typedef enum
 100 -{
 101 -       PVR2D_BLIT_DISABLE_ALL                                  = 0x0000,       /* disable all additional controls */
 102 -       PVR2D_BLIT_CK_ENABLE                                    = 0x0001,       /* enable colour key */
 103 -       PVR2D_BLIT_GLOBAL_ALPHA_ENABLE                  = 0x0002,       /* enable standard global alpha */
 104 -       PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE   = 0x0004,       /* enable per-pixel alpha bleding */
 105 -       PVR2D_BLIT_PAT_SURFACE_ENABLE                   = 0x0008,       /* enable pattern surf (disable fill) */
 106 -       PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE = 0x0010,       /* enable fully specified alpha */
 107 -       PVR2D_BLIT_ROT_90                                               = 0x0020,       /* apply 90 degree rotation to the blt */
 108 -       PVR2D_BLIT_ROT_180                                              = 0x0040,       /* apply 180 degree rotation to the blt */
 109 -       PVR2D_BLIT_ROT_270                                              = 0x0080,       /* apply 270 degree rotation to the blt */
 110 -       PVR2D_BLIT_COPYORDER_TL2BR                              = 0x0100,       /* copy order overrides */
 111 -       PVR2D_BLIT_COPYORDER_BR2TL                              = 0x0200,
 112 -       PVR2D_BLIT_COPYORDER_TR2BL                              = 0x0400,
 113 -       PVR2D_BLIT_COPYORDER_BL2TR                              = 0x0800,
 114 -       PVR2D_BLIT_COLKEY_SOURCE                                = 0x1000,       /* Key colour is on the source surface */
 115 -       PVR2D_BLIT_COLKEY_DEST                                  = 0x2000        /* Key colour is on the destination surface */
 116 -
 117 -} PVR2DBLITFLAGS;
 118 -
 119 -/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */
 120 -typedef enum
 121 -{
 122 -       PVR2D_ALPHA_OP_SRC_DSTINV = 1,  /* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */
 123 -       PVR2D_ALPHA_OP_SRCP_DSTINV = 2  /* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */
 124 -} PVR2D_ALPHABLENDFUNC;
 125 -
 126 -/* blend ops for fully specified alpha */
 127 -typedef enum
 128 -{
 129 -       PVR2D_BLEND_OP_ZERO = 0,
 130 -       PVR2D_BLEND_OP_ONE = 1,
 131 -       PVR2D_BLEND_OP_SRC = 2,
 132 -       PVR2D_BLEND_OP_DST = 3,
 133 -       PVR2D_BLEND_OP_GLOBAL = 4,
 134 -       PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,
 135 -       PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6
 136 -}PVR2D_BLEND_OP;
 137 -
 138 -
 139 -typedef void* PVR2D_HANDLE;
 140 -
 141 -
 142 -/* Fully specified alpha blend :       pAlpha field of PVR2DBLTINFO structure                                  */
 143 -/* a fully specified Alpha Blend operation is defined as                                                                       */
 144 -/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA))                                                     */
 145 -/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB))                                                         */
 146 -/* if the pre-multiplication stage is enabled then the equations become the following:         */
 147 -/* PRE_MUL     = ((SRC(A)) * (Global Alpha Value))                                                                                     */
 148 -/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA))                                                     */
 149 -/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB))                                                         */
 150 -/* if the transparent source alpha stage is enabled then a source alpha of zero forces the     */
 151 -/* source to be transparent for that pixel regardless of the blend equation being used.                */
 152 -typedef struct _PVR2D_ALPHABLT
 153 -{
 154 -       PVR2D_BLEND_OP  eAlpha1;
 155 -       PVR2D_BOOL              bAlpha1Invert;
 156 -       PVR2D_BLEND_OP  eAlpha2;
 157 -       PVR2D_BOOL              bAlpha2Invert;
 158 -       PVR2D_BLEND_OP  eAlpha3;
 159 -       PVR2D_BOOL              bAlpha3Invert;
 160 -       PVR2D_BLEND_OP  eAlpha4;
 161 -       PVR2D_BOOL              bAlpha4Invert;
 162 -       PVR2D_BOOL              bPremulAlpha;                   /* enable pre-multiplication stage */
 163 -       PVR2D_BOOL              bTransAlpha;                    /* enable transparent source alpha stage */
 164 -       PVR2D_BOOL              bUpdateAlphaLookup;             /* enable and update the 1555-Lookup alpha table */
 165 -       unsigned char   uAlphaLookup0;                  /* 8 bit alpha when A=0 in a 1555-Lookup surface */
 166 -       unsigned char   uAlphaLookup1;                  /* 8 bit alpha when A=1 in a 1555-Lookup surface */
 167 -       unsigned char   uGlobalRGB;                             /* Global Alpha Value for RGB, 0=transparent 255=opaque */
 168 -       unsigned char   uGlobalA;                               /* Global Alpha Value for Alpha */
 169 -
 170 -} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;
 171 -
 172 -
 173 -/* surface memory info structure */
 174 -typedef struct _PVR2DMEMINFO
 175 -{
 176 -       void                            *pBase;
 177 -       unsigned long           ui32MemSize;
 178 -       unsigned long           ui32DevAddr;
 179 -       unsigned long           ulFlags;
 180 -       void                            *hPrivateData;
 181 -       void                            *hPrivateMapData;
 182 -
 183 -}PVR2DMEMINFO, *PPVR2DMEMINFO;
 184 -
 185 -
 186 -#define PVR2D_MAX_DEVICE_NAME 20
 187 -
 188 -typedef struct _PVR2DDEVICEINFO
 189 -{
 190 -       unsigned long   ulDevID;
 191 -       char                    szDeviceName[PVR2D_MAX_DEVICE_NAME];
 192 -}PVR2DDEVICEINFO;
 193 -
 194 -
 195 -typedef struct _PVR2DISPLAYINFO
 196 -{
 197 -       unsigned long   ulMaxFlipChains;
 198 -       unsigned long   ulMaxBuffersInChain;
 199 -       PVR2DFORMAT             eFormat;
 200 -       unsigned long   ulWidth;
 201 -       unsigned long   ulHeight;
 202 -       long                    lStride;
 203 -       unsigned long   ulMinFlipInterval;
 204 -       unsigned long   ulMaxFlipInterval;
 205 -
 206 -}PVR2DDISPLAYINFO;
 207 -
 208 -
 209 -typedef struct _PVR2DBLTINFO
 210 -{
 211 -       unsigned long   CopyCode;                       /* rop code  */
 212 -       unsigned long   Colour;                         /* fill colour */
 213 -       unsigned long   ColourKey;                      /* colour key */
 214 -       unsigned char   GlobalAlphaValue;       /* global alpha blending */
 215 -       unsigned char   AlphaBlendingFunc;      /* per-pixel alpha-blending function */
 216 -
 217 -       PVR2DBLITFLAGS  BlitFlags;                      /* additional blit control information */
 218 -
 219 -       PVR2DMEMINFO    *pDstMemInfo;           /* destination memory */
 220 -       unsigned long   DstOffset;                      /* byte offset from start of allocation to destination surface pixel 0,0 */
 221 -       long                    DstStride;                      /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
 222 -       long                    DstX, DstY;                     /* pixel offset from start of dest surface to start of blt rectangle */
 223 -       long                    DSizeX,DSizeY;          /* blt size */
 224 -       PVR2DFORMAT             DstFormat;                      /* dest format */
 225 -       unsigned long   DstSurfWidth;           /* size of dest surface in pixels */
 226 -       unsigned long   DstSurfHeight;          /* size of dest surface in pixels */
 227 -
 228 -       PVR2DMEMINFO    *pSrcMemInfo;           /* source mem, (source fields are also used for patterns) */
 229 -       unsigned long   SrcOffset;                      /* byte offset from start of allocation to src/pat surface pixel 0,0 */
 230 -       long                    SrcStride;                      /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
 231 -       long                    SrcX, SrcY;                     /* pixel offset from start of surface to start of source rectangle */
 232 -                                                                               /* for patterns this is the start offset within the pattern */
 233 -       long                    SizeX,SizeY;            /* source rectangle size or pattern size in pixels */
 234 -       PVR2DFORMAT             SrcFormat;                      /* source/pattern format */
 235 -       PVR2DMEMINFO    *pPalMemInfo;           /* source/pattern palette memory containing argb8888 colour table */
 236 -       unsigned long   PalOffset;                      /* byte offset from start of allocation to start of palette */
 237 -       unsigned long   SrcSurfWidth;           /* size of source surface in pixels */
 238 -       unsigned long   SrcSurfHeight;          /* size of source surface in pixels */
 239 -
 240 -       PVR2DMEMINFO    *pMaskMemInfo;          /* mask memory, 1bpp format implied */
 241 -       unsigned long   MaskOffset;                     /* byte offset from start of allocation to mask surface pixel 0,0 */
 242 -       long                    MaskStride;                     /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
 243 -       long                    MaskX, MaskY;           /* mask rect top left (mask size = blt size) */
 244 -       unsigned long   MaskSurfWidth;          /* size of mask surface in pixels */
 245 -       unsigned long   MaskSurfHeight;         /* size of mask surface in pixels */
 246 -
 247 -       PPVR2D_ALPHABLT pAlpha;                         /* fully specified alpha blend */
 248 -
 249 -}PVR2DBLTINFO, *PPVR2DBLTINFO;
 250 -
 251 -typedef struct _PVR2DRECT
 252 -{
 253 -       long left, top;
 254 -       long right, bottom;
 255 -} PVR2DRECT;
 256 -
 257 -typedef struct
 258 -{
 259 -       PVR2DMEMINFO    *pSurfMemInfo;          /* surface memory */
 260 -       unsigned long   SurfOffset;                     /* byte offset from start of allocation to destination surface pixel 0,0 */
 261 -       long                    Stride;                         /* signed stride */
 262 -       PVR2DFORMAT             Format;
 263 -       unsigned long   SurfWidth;                      /* surface size in pixels */
 264 -       unsigned long   SurfHeight;
 265 -
 266 -} PVR2D_SURFACE, *PPVR2D_SURFACE;
 267 -
 268 -typedef struct
 269 -{
 270 -       unsigned long   *pUseCode;                                      /* USSE code */
 271 -       unsigned long   UseCodeSize;                            /* usse code size in bytes */
 272 -
 273 -} PVR2D_USECODE, *PPVR2D_USECODE;
 274 -
 275 -typedef struct
 276 -{
 277 -       PVR2D_SURFACE                   sDst;                           /* destination surface */
 278 -       PVR2D_SURFACE                   sSrc;                           /* source surface */
 279 -       PVR2DRECT                               rcDest;                         /* destination rectangle */
 280 -       PVR2DRECT                               rcSource;                       /* source rectangle */
 281 -       PVR2D_HANDLE                    hUseCode;                       /* custom USE code (NULL implies source copy) */
 282 -       unsigned long                   UseParams[2];           /* per-blt params for use code */
 283 -
 284 -} PVR2D_3DBLT, *PPVR2D_3DBLT;
 285 -
 286 -
 287 -#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)
 288 -
 289 -typedef void* PVR2DCONTEXTHANDLE;
 290 -typedef void* PVR2DFLIPCHAINHANDLE;
 291 -
 292 -
 293 -// CopyCode field of PVR2DBLTINFO structure:
 294 -// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.
 295 -// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern
 296 -// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask
 297 -// common rop3 codes are defined below
 298 -// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0
 299 -// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.
 300 -// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.
 301 -// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.
 302 -// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3
 303 -// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's
 304 -// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0
 305 -#define PVR2DROP4(rop3b, rop3a)                        ((rop3b<<8)|rop3a)
 306 -
 307 -/* common rop codes */
 308 -#define PVR2DROPclear                          0x00       /* 0 (whiteness) */
 309 -#define PVR2DROPset                                    0xFF       /* 1 (blackness) */
 310 -#define PVR2DROPnoop                           0xAA       /* dst (used for masked blts) */
 311 -
 312 -/* source and  dest rop codes */
 313 -#define PVR2DROPand                                    0x88       /* src AND dst */
 314 -#define PVR2DROPandReverse                     0x44       /* src AND NOT dst */
 315 -#define PVR2DROPcopy                           0xCC       /* src (used for source copy and alpha blts) */
 316 -#define PVR2DROPandInverted                    0x22       /* NOT src AND dst */
 317 -#define PVR2DROPxor                                    0x66       /* src XOR dst */
 318 -#define PVR2DROPor                                     0xEE       /* src OR dst */
 319 -#define PVR2DROPnor                                    0x11       /* NOT src AND NOT dst */
 320 -#define PVR2DROPequiv                          0x99       /* NOT src XOR dst */
 321 -#define PVR2DROPinvert                         0x55       /* NOT dst */
 322 -#define PVR2DROPorReverse                      0xDD       /* src OR NOT dst */
 323 -#define PVR2DROPcopyInverted           0x33       /* NOT src */
 324 -#define PVR2DROPorInverted                     0xBB       /* NOT src OR dst */
 325 -#define PVR2DROPnand                           0x77       /* NOT src OR NOT dst */
 326 -
 327 -/* pattern rop codes */
 328 -#define PVR2DPATROPand                         0xA0       /* pat AND dst */
 329 -#define PVR2DPATROPandReverse          0x50       /* pat AND NOT dst */
 330 -#define PVR2DPATROPcopy                                0xF0       /* pat (used for solid color fills and pattern blts) */
 331 -#define PVR2DPATROPandInverted         0x0A       /* NOT pat AND dst */
 332 -#define PVR2DPATROPxor                         0x5A       /* pat XOR dst */
 333 -#define PVR2DPATROPor                          0xFA       /* pat OR dst */
 334 -#define PVR2DPATROPnor                         0x05       /* NOT pat AND NOT dst */
 335 -#define PVR2DPATROPequiv                       0xA5       /* NOT pat XOR dst */
 336 -#define PVR2DPATROPinvert                      0x55       /* NOT dst */
 337 -#define PVR2DPATROPorReverse           0xF5       /* pat OR NOT dst */
 338 -#define PVR2DPATROPcopyInverted                0x0F       /* NOT pat */
 339 -#define PVR2DPATROPorInverted          0xAF       /* NOT pat OR dst */
 340 -#define PVR2DPATROPnand                                0x5F       /* NOT pat OR NOT dst */
 341 -
 342 -/* common rop4 codes */
 343 -#define PVR2DROP4MaskedCopy              PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy)          /* masked source copy blt (used for rounded window corners etc) */
 344 -#define PVR2DROP4MaskedFill              PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy)       /* masked colour fill blt (used for text) */
 345 -
 346 -/* Legacy support */
 347 -#define PVR2DROP3_PATMASK                      PVR2DPATROPcopy
 348 -#define PVR2DROP3_SRCMASK                      PVR2DROPcopy
 349 -
 350 -/* pixmap memory alignment */
 351 -#define PVR2D_ALIGNMENT_4                      4                       /* DWORD alignment */
 352 -#define PVR2D_ALIGNMENT_ANY                    0                       /* no alignment    */
 353 -#define PVR2D_ALIGNMENT_PALETTE                16                      /* 16 byte alignment is required for palettes */
 354 -
 355 -/* Heap number for PVR2DGetFrameBuffer */
 356 -#define PVR2D_FB_PRIMARY_SURFACE 0
 357 -
 358 -#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE       (1 << 0)
 359 -#define PVR2D_PRESENT_PROPERTY_DSTSIZE         (1 << 1)
 360 -#define PVR2D_PRESENT_PROPERTY_DSTPOS          (1 << 2)
 361 -#define PVR2D_PRESENT_PROPERTY_CLIPRECTS       (1 << 3)
 362 -#define PVR2D_PRESENT_PROPERTY_INTERVAL                (1 << 4)
 363 -
 364 -
 365 -#define PVR2D_CREATE_FLIPCHAIN_SHARED          (1 << 0)
 366 -#define PVR2D_CREATE_FLIPCHAIN_QUERY           (1 << 1)
 367 -
 368 -/* Functions that the library exports */
 369 -
 370 -PVR2D_IMPORT
 371 -int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
 372 -
 373 -PVR2D_IMPORT
 374 -PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID,
 375 -                                                                       PVR2DCONTEXTHANDLE* phContext,
 376 -                                                                       unsigned long ulFlags);
 377 -
 378 -PVR2D_IMPORT
 379 -PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);
 380 -
 381 -PVR2D_IMPORT
 382 -PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,
 383 -                                                         PVR2DDISPLAYINFO *pDisplayInfo);
 384 -
 385 -PVR2D_IMPORT
 386 -PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,
 387 -                                                         PVR2DFORMAT *pFormat,
 388 -                                                         long *plWidth,
 389 -                                                         long *plHeight,
 390 -                                                         long *plStride,
 391 -                                                         int *piRefreshRate);
 392 -
 393 -PVR2D_IMPORT
 394 -PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,
 395 -                                                          int nHeap,
 396 -                                                          PVR2DMEMINFO **ppsMemInfo);
 397 -
 398 -PVR2D_IMPORT
 399 -PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,
 400 -                                                unsigned long ulBytes,
 401 -                                                unsigned long ulAlign,
 402 -                                                unsigned long ulFlags,
 403 -                                                PVR2DMEMINFO **ppsMemInfo);
 404 -
 405 -PVR2D_IMPORT
 406 -PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,
 407 -                                               void *pMem,
 408 -                                               unsigned long ulFlags,
 409 -                                               unsigned long ulBytes,
 410 -                                               unsigned long alPageAddress[],
 411 -                                               PVR2DMEMINFO **ppsMemInfo);
 412 -
 413 -PVR2D_IMPORT
 414 -PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,
 415 -                                               unsigned long ulFlags,
 416 -                                               void *hPrivateMapData,
 417 -                                               PVR2DMEMINFO **ppsDstMem);
 418 -
 419 -PVR2D_IMPORT
 420 -PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,
 421 -                                               PVR2DMEMINFO *psMemInfo);
 422 -
 423 -PVR2D_IMPORT
 424 -PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,
 425 -                                       PVR2DBLTINFO *pBltInfo);
 426 -
 427 -PVR2D_IMPORT
 428 -PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,
 429 -                                                  PVR2DBLTINFO *pBltInfo,
 430 -                                                  unsigned long ulNumClipRects,
 431 -                                                  PVR2DRECT *pClipRects);
 432 -
 433 -PVR2D_IMPORT
 434 -PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,
 435 -                                                                  PVR2DMEMINFO *pMemInfo,
 436 -                                                                  unsigned int uiWaitForComplete);
 437 -
 438 -PVR2D_IMPORT
 439 -PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,
 440 -                                                                               unsigned long ulPropertyMask,
 441 -                                                                               long lSrcStride,
 442 -                                                                               unsigned long ulDstWidth,
 443 -                                                                               unsigned long ulDstHeight,
 444 -                                                                               long lDstXPos,
 445 -                                                                               long lDstYPos,
 446 -                                                                               unsigned long ulNumClipRects,
 447 -                                                                               PVR2DRECT *pClipRects,
 448 -                                                                               unsigned long ulSwapInterval);
 449 -
 450 -PVR2D_IMPORT
 451 -PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,
 452 -                                                  PVR2DMEMINFO *pMemInfo,
 453 -                                                  long lRenderID);
 454 -
 455 -PVR2D_IMPORT
 456 -PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,
 457 -                                                               unsigned long ulFlags,
 458 -                                                               unsigned long ulNumBuffers,
 459 -                                                               unsigned long ulWidth,
 460 -                                                               unsigned long ulHeight,
 461 -                                                               PVR2DFORMAT eFormat,
 462 -                                                               long *plStride,
 463 -                                                               unsigned long *pulFlipChainID,
 464 -                                                               PVR2DFLIPCHAINHANDLE *phFlipChain);
 465 -
 466 -PVR2D_IMPORT
 467 -PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,
 468 -                                                                PVR2DFLIPCHAINHANDLE hFlipChain);
 469 -
 470 -PVR2D_IMPORT
 471 -PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,
 472 -                                                                       PVR2DFLIPCHAINHANDLE hFlipChain,
 473 -                                                                       unsigned long *pulNumBuffers,
 474 -                                                                       PVR2DMEMINFO *psMemInfo[]);
 475 -
 476 -PVR2D_IMPORT
 477 -PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
 478 -                                                                                PVR2DFLIPCHAINHANDLE hFlipChain,
 479 -                                                                                unsigned long ulPropertyMask,
 480 -                                                                                long lDstXPos,
 481 -                                                                                long lDstYPos,
 482 -                                                                                unsigned long ulNumClipRects,
 483 -                                                                                PVR2DRECT *pClipRects,
 484 -                                                                                unsigned long ulSwapInterval);
 485 -
 486 -PVR2D_IMPORT
 487 -PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,
 488 -                                                       PVR2DFLIPCHAINHANDLE hFlipChain,
 489 -                                                       PVR2DMEMINFO *psMemInfo,
 490 -                                                       long lRenderID);
 491 -
 492 -PVR2D_IMPORT
 493 -PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor);
 494 -
 495 -PVR2D_IMPORT
 496 -PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char    *pUseCode,
 497 -                                                                       const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);
 498 -PVR2D_IMPORT
 499 -PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);
 500 -
 501 -PVR2D_IMPORT
 502 -PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);
 503 -
 504 -#ifdef __cplusplus
 505 -}
 506 -#endif
 507 -
 508 -#endif /* _PVR2D_H_ */
 509 -
 510 -/******************************************************************************
 511 - End of file (pvr2d.h)
 512 -******************************************************************************/
 513 Index: qt-4.8.5/src/3rdparty/powervr/wsegl.h
 514 ===================================================================
 515 --- qt-4.8.5.orig/src/3rdparty/powervr/wsegl.h  2013-07-08 11:24:33.010516867 -0500
 516 +++ /dev/null   1970-01-01 00:00:00.000000000 +0000
 517 @@ -1,240 +0,0 @@
 518 -/******************************************************************************
 519 - Name         : wsegl.h
 520 - Copyright    :        Copyright (c) Imagination Technologies Limited.
 521 -                               This specification is protected by copyright laws and contains
 522 -                               material proprietary to Imagination Technologies Limited.
 523 -                               You may use and distribute this specification free of charge for implementing
 524 -                               the functionality therein, without altering or removing any trademark, copyright,
 525 -                               or other notice from the specification.
 526 - Platform     : ANSI
 527 -*****************************************************************************/
 528 -
 529 -
 530 -#if !defined(__WSEGL_H__)
 531 -#define __WSEGL_H__
 532 -
 533 -#ifdef __cplusplus
 534 -extern "C" {
 535 -#endif
 536 -
 537 -/*
 538 -// WSEGL Platform-specific definitions
 539 -*/
 540 -#define WSEGL_EXPORT
 541 -#define WSEGL_IMPORT
 542 -
 543 -/*
 544 -// WSEGL API Version Number
 545 -*/
 546 -
 547 -#define WSEGL_VERSION 1
 548 -#define WSEGL_DEFAULT_DISPLAY 0
 549 -#define WSEGL_DEFAULT_NATIVE_ENGINE 0
 550 -
 551 -#define WSEGL_FALSE            0
 552 -#define WSEGL_TRUE             1
 553 -#define WSEGL_NULL             0
 554 -
 555 -#define        WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)
 556 -
 557 -/*
 558 -// WSEGL handles
 559 -*/
 560 -typedef void *WSEGLDisplayHandle;
 561 -typedef void *WSEGLDrawableHandle;
 562 -
 563 -/*
 564 -// Display capability type
 565 -*/
 566 -typedef enum WSEGLCapsType_TAG
 567 -{
 568 -       WSEGL_NO_CAPS = 0,
 569 -       WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */
 570 -       WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */
 571 -       WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
 572 -       WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
 573 -
 574 -} WSEGLCapsType;
 575 -
 576 -/*
 577 -// Display capability
 578 -*/
 579 -typedef struct WSEGLCaps_TAG
 580 -{
 581 -       WSEGLCapsType eCapsType;
 582 -       unsigned long ui32CapsValue;
 583 -
 584 -} WSEGLCaps;
 585 -
 586 -/*
 587 -// Drawable type
 588 -*/
 589 -#define WSEGL_NO_DRAWABLE                      0x0
 590 -#define WSEGL_DRAWABLE_WINDOW          0x1
 591 -#define WSEGL_DRAWABLE_PIXMAP          0x2
 592 -
 593 -
 594 -/*
 595 -// Pixel format of display/drawable
 596 -*/
 597 -typedef enum WSEGLPixelFormat_TAG
 598 -{
 599 -       WSEGL_PIXELFORMAT_565 = 0,
 600 -       WSEGL_PIXELFORMAT_4444 = 1,
 601 -       WSEGL_PIXELFORMAT_8888 = 2,
 602 -       WSEGL_PIXELFORMAT_1555 = 3
 603 -
 604 -} WSEGLPixelFormat;
 605 -
 606 -/*
 607 -// Transparent of display/drawable
 608 -*/
 609 -typedef enum WSEGLTransparentType_TAG
 610 -{
 611 -       WSEGL_OPAQUE = 0,
 612 -       WSEGL_COLOR_KEY = 1,
 613 -
 614 -} WSEGLTransparentType;
 615 -
 616 -/*
 617 -// Display/drawable configuration
 618 -*/
 619 -typedef struct WSEGLConfig_TAG
 620 -{
 621 -       /*
 622 -       // Type of drawables this configuration applies to -
 623 -       // OR'd values of drawable types.
 624 -       */
 625 -       unsigned long ui32DrawableType;
 626 -
 627 -       /* Pixel format */
 628 -       WSEGLPixelFormat ePixelFormat;
 629 -
 630 -       /* Native Renderable  - set to WSEGL_TRUE if native renderable */
 631 -       unsigned long ulNativeRenderable;
 632 -
 633 -       /* FrameBuffer Level Parameter */
 634 -       unsigned long ulFrameBufferLevel;
 635 -
 636 -       /* Native Visual ID */
 637 -       unsigned long ulNativeVisualID;
 638 -
 639 -       /* Native Visual */
 640 -       void *hNativeVisual;
 641 -
 642 -       /* Transparent Type */
 643 -       WSEGLTransparentType eTransparentType;
 644 -
 645 -       /* Transparent Color - only used if transparent type is COLOR_KEY */
 646 -       unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
 647 -
 648 -
 649 -} WSEGLConfig;
 650 -
 651 -/*
 652 -// WSEGL errors
 653 -*/
 654 -typedef enum WSEGLError_TAG
 655 -{
 656 -       WSEGL_SUCCESS = 0,
 657 -       WSEGL_CANNOT_INITIALISE = 1,
 658 -       WSEGL_BAD_NATIVE_DISPLAY = 2,
 659 -       WSEGL_BAD_NATIVE_WINDOW = 3,
 660 -       WSEGL_BAD_NATIVE_PIXMAP = 4,
 661 -       WSEGL_BAD_NATIVE_ENGINE = 5,
 662 -       WSEGL_BAD_DRAWABLE = 6,
 663 -       WSEGL_BAD_CONFIG = 7,
 664 -       WSEGL_OUT_OF_MEMORY = 8
 665 -
 666 -} WSEGLError;
 667 -
 668 -/*
 669 -// Drawable orientation (in degrees anti-clockwise)
 670 -*/
 671 -typedef enum WSEGLRotationAngle_TAG
 672 -{
 673 -       WSEGL_ROTATE_0 = 0,
 674 -       WSEGL_ROTATE_90 = 1,
 675 -       WSEGL_ROTATE_180 = 2,
 676 -       WSEGL_ROTATE_270 = 3
 677 -
 678 -} WSEGLRotationAngle;
 679 -
 680 -/*
 681 -// Drawable information required by OpenGL-ES driver
 682 -*/
 683 -typedef struct WSEGLDrawableParams_TAG
 684 -{
 685 -       /* Width in pixels of the drawable */
 686 -       unsigned long   ui32Width;
 687 -
 688 -       /* Height in pixels of the drawable */
 689 -       unsigned long   ui32Height;
 690 -
 691 -       /* Stride in pixels of the drawable */
 692 -       unsigned long   ui32Stride;
 693 -
 694 -       /* Pixel format of the drawable */
 695 -       WSEGLPixelFormat        ePixelFormat;
 696 -
 697 -       /* User space cpu virtual address of the drawable */
 698 -       void                    *pvLinearAddress;
 699 -
 700 -       /* HW address of the drawable */
 701 -       unsigned long   ui32HWAddress;
 702 -
 703 -       /* Private data for the drawable */
 704 -       void                    *hPrivateData;
 705 -
 706 -} WSEGLDrawableParams;
 707 -
 708 -
 709 -/*
 710 -// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()
 711 -//
 712 -// The first entry in the table is the version number of the wsegl.h header file that
 713 -// the module has been written against, and should therefore be set to WSEGL_VERSION
 714 -*/
 715 -typedef struct WSEGL_FunctionTable_TAG
 716 -{
 717 -       unsigned long ui32WSEGLVersion;
 718 -
 719 -       WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);
 720 -
 721 -       WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);
 722 -
 723 -       WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);
 724 -
 725 -       WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);
 726 -
 727 -       WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);
 728 -
 729 -       WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);
 730 -
 731 -       WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);
 732 -
 733 -       WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);
 734 -
 735 -       WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);
 736 -
 737 -       WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);
 738 -
 739 -       WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
 740 -
 741 -       WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
 742 -
 743 -
 744 -} WSEGL_FunctionTable;
 745 -
 746 -
 747 -WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
 748 -
 749 -#ifdef __cplusplus
 750 -}
 751 -#endif
 752 -
 753 -#endif /* __WSEGL_H__ */
 754 -
 755 -/******************************************************************************
 756 - End of file (wsegl.h)
 757 -******************************************************************************/
 758 Index: qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
 759 ===================================================================
 760 --- qt-4.8.5.orig/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2013-07-08 11:24:33.010516867 -0500
 761 +++ qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c      2013-07-08 11:28:26.142521123 -0500
 762 @@ -39,7 +39,7 @@
 763  **
 764  ****************************************************************************/
 765
 766 -#include <GLES/eglplatform.h>
 767 +#include <EGL/eglplatform.h>
 768  #include <wsegl.h>
 769  #include <pvr2d.h>
 770  #include <string.h>
 771 @@ -379,6 +379,20 @@
 772      return WSEGL_SUCCESS;
 773  }
 774
 775 +/* Function stub for ConnectDrawable() */
 776 +static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable)
 777 +{
 778 +    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
 779 +    return WSEGL_SUCCESS;
 780 +}
 781 +
 782 +/* Function stub for DisconnectDrawable() */
 783 +static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
 784 +{
 785 +    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
 786 +    return WSEGL_SUCCESS;
 787 +}
 788 +
 789  static WSEGL_FunctionTable const wseglFunctions = {
 790      WSEGL_VERSION,
 791      wseglIsDisplayValid,
 792 @@ -392,7 +406,9 @@
 793      wseglWaitNative,
 794      wseglCopyFromDrawable,
 795      wseglCopyFromPBuffer,
 796 -    wseglGetDrawableParameters
 797 +    wseglGetDrawableParameters,
 798 +    wseglConnectDrawable,
 799 +    wseglDisconnectDrawable
 800  };
 801
 802  /* Return the table of WSEGL functions to the EGL implementation */