From db5363dee1daa7baace9b1d40eede243e985d0c6 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 9 May 2012 18:13:27 +0300 Subject: [PATCH] merge headers from 1.5.15.2766 (2) --- include4/dbgdrvif.h | 80 +++++++++++++++++----------------- include4/img_defs.h | 4 ++ include4/img_types.h | 60 ++++++++++++++----------- include4/pdumpdefs.h | 1 + include4/pvr_debug.h | 68 +++++++++++++++++++---------- include4/services.h | 99 +++++++++++++++++++++++------------------- include4/servicesext.h | 9 ++-- include4/sgx_options.h | 12 +---- include4/sgxapi_km.h | 28 ++++++------ 9 files changed, 199 insertions(+), 162 deletions(-) diff --git a/include4/dbgdrvif.h b/include4/dbgdrvif.h index e10db38..9e5d8dc 100644 --- a/include4/dbgdrvif.h +++ b/include4/dbgdrvif.h @@ -30,49 +30,49 @@ #include "ioctldef.h" -#define DEBUG_CAPMODE_FRAMED 0x00000001 -#define DEBUG_CAPMODE_CONTINUOUS 0x00000002 -#define DEBUG_CAPMODE_HOTKEY 0x00000004 +#define DEBUG_CAPMODE_FRAMED 0x00000001UL +#define DEBUG_CAPMODE_CONTINUOUS 0x00000002UL +#define DEBUG_CAPMODE_HOTKEY 0x00000004UL -#define DEBUG_OUTMODE_STANDARDDBG 0x00000001 -#define DEBUG_OUTMODE_MONO 0x00000002 -#define DEBUG_OUTMODE_STREAMENABLE 0x00000004 -#define DEBUG_OUTMODE_ASYNC 0x00000008 -#define DEBUG_OUTMODE_SGXVGA 0x00000010 +#define DEBUG_OUTMODE_STANDARDDBG 0x00000001UL +#define DEBUG_OUTMODE_MONO 0x00000002UL +#define DEBUG_OUTMODE_STREAMENABLE 0x00000004UL +#define DEBUG_OUTMODE_ASYNC 0x00000008UL +#define DEBUG_OUTMODE_SGXVGA 0x00000010UL -#define DEBUG_FLAGS_USE_NONPAGED_MEM 0x00000001 -#define DEBUG_FLAGS_NO_BUF_EXPANDSION 0x00000002 -#define DEBUG_FLAGS_ENABLESAMPLE 0x00000004 +#define DEBUG_FLAGS_USE_NONPAGED_MEM 0x00000001UL +#define DEBUG_FLAGS_NO_BUF_EXPANDSION 0x00000002UL +#define DEBUG_FLAGS_ENABLESAMPLE 0x00000004UL -#define DEBUG_FLAGS_TEXTSTREAM 0x80000000 +#define DEBUG_FLAGS_TEXTSTREAM 0x80000000UL -#define DEBUG_LEVEL_0 0x00000001 -#define DEBUG_LEVEL_1 0x00000003 -#define DEBUG_LEVEL_2 0x00000007 -#define DEBUG_LEVEL_3 0x0000000F -#define DEBUG_LEVEL_4 0x0000001F -#define DEBUG_LEVEL_5 0x0000003F -#define DEBUG_LEVEL_6 0x0000007F -#define DEBUG_LEVEL_7 0x000000FF -#define DEBUG_LEVEL_8 0x000001FF -#define DEBUG_LEVEL_9 0x000003FF -#define DEBUG_LEVEL_10 0x000007FF -#define DEBUG_LEVEL_11 0x00000FFF +#define DEBUG_LEVEL_0 0x00000001UL +#define DEBUG_LEVEL_1 0x00000003UL +#define DEBUG_LEVEL_2 0x00000007UL +#define DEBUG_LEVEL_3 0x0000000FUL +#define DEBUG_LEVEL_4 0x0000001FUL +#define DEBUG_LEVEL_5 0x0000003FUL +#define DEBUG_LEVEL_6 0x0000007FUL +#define DEBUG_LEVEL_7 0x000000FFUL +#define DEBUG_LEVEL_8 0x000001FFUL +#define DEBUG_LEVEL_9 0x000003FFUL +#define DEBUG_LEVEL_10 0x000007FFUL +#define DEBUG_LEVEL_11 0x00000FFFUL -#define DEBUG_LEVEL_SEL0 0x00000001 -#define DEBUG_LEVEL_SEL1 0x00000002 -#define DEBUG_LEVEL_SEL2 0x00000004 -#define DEBUG_LEVEL_SEL3 0x00000008 -#define DEBUG_LEVEL_SEL4 0x00000010 -#define DEBUG_LEVEL_SEL5 0x00000020 -#define DEBUG_LEVEL_SEL6 0x00000040 -#define DEBUG_LEVEL_SEL7 0x00000080 -#define DEBUG_LEVEL_SEL8 0x00000100 -#define DEBUG_LEVEL_SEL9 0x00000200 -#define DEBUG_LEVEL_SEL10 0x00000400 -#define DEBUG_LEVEL_SEL11 0x00000800 +#define DEBUG_LEVEL_SEL0 0x00000001UL +#define DEBUG_LEVEL_SEL1 0x00000002UL +#define DEBUG_LEVEL_SEL2 0x00000004UL +#define DEBUG_LEVEL_SEL3 0x00000008UL +#define DEBUG_LEVEL_SEL4 0x00000010UL +#define DEBUG_LEVEL_SEL5 0x00000020UL +#define DEBUG_LEVEL_SEL6 0x00000040UL +#define DEBUG_LEVEL_SEL7 0x00000080UL +#define DEBUG_LEVEL_SEL8 0x00000100UL +#define DEBUG_LEVEL_SEL9 0x00000200UL +#define DEBUG_LEVEL_SEL10 0x00000400UL +#define DEBUG_LEVEL_SEL11 0x00000800UL -#define DEBUG_SERVICE_IOCTL_BASE 0x800 +#define DEBUG_SERVICE_IOCTL_BASE 0x800UL #define DEBUG_SERVICE_CREATESTREAM CTL_CODE(FILE_DEVICE_UNKNOWN, DEBUG_SERVICE_IOCTL_BASE + 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) #define DEBUG_SERVICE_DESTROYSTREAM CTL_CODE(FILE_DEVICE_UNKNOWN, DEBUG_SERVICE_IOCTL_BASE + 0x02, METHOD_BUFFERED, FILE_ANY_ACCESS) #define DEBUG_SERVICE_GETSTREAM CTL_CODE(FILE_DEVICE_UNKNOWN, DEBUG_SERVICE_IOCTL_BASE + 0x03, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -202,7 +202,7 @@ typedef struct _DBG_IN_WRITE_LF_ IMG_UINT8 *pui8InBuffer; } DBG_IN_WRITE_LF, *PDBG_IN_WRITE_LF; -#define WRITELF_FLAGS_RESETBUF 0x00000001 +#define WRITELF_FLAGS_RESETBUF 0x00000001UL typedef struct _DBG_STREAM_ { @@ -254,12 +254,12 @@ typedef struct _DBGKM_SERVICE_TABLE_ IMG_UINT32 (IMG_CALLCONV *pfnGetMarker) (PDBG_STREAM psStream); IMG_VOID (IMG_CALLCONV *pfnStartInitPhase) (PDBG_STREAM psStream); IMG_VOID (IMG_CALLCONV *pfnStopInitPhase) (PDBG_STREAM psStream); - IMG_UINT32 (IMG_CALLCONV *pfnIsCaptureFrame) (PDBG_STREAM psStream, IMG_BOOL bCheckPreviousFrame); + IMG_BOOL (IMG_CALLCONV *pfnIsCaptureFrame) (PDBG_STREAM psStream, IMG_BOOL bCheckPreviousFrame); IMG_UINT32 (IMG_CALLCONV *pfnWriteLF) (PDBG_STREAM psStream, IMG_UINT8 *pui8InBuf, IMG_UINT32 ui32InBuffSize, IMG_UINT32 ui32Level, IMG_UINT32 ui32Flags); IMG_UINT32 (IMG_CALLCONV *pfnReadLF) (PDBG_STREAM psStream, IMG_UINT32 ui32OutBuffSize, IMG_UINT8 *pui8OutBuf); IMG_UINT32 (IMG_CALLCONV *pfnGetStreamOffset) (PDBG_STREAM psStream); IMG_VOID (IMG_CALLCONV *pfnSetStreamOffset) (PDBG_STREAM psStream, IMG_UINT32 ui32StreamOffset); - IMG_UINT32 (IMG_CALLCONV *pfnIsLastCaptureFrame) (PDBG_STREAM psStream); + IMG_BOOL (IMG_CALLCONV *pfnIsLastCaptureFrame) (PDBG_STREAM psStream); IMG_VOID (IMG_CALLCONV *pfnWaitForEvent) (DBG_EVENT eEvent); } DBGKM_SERVICE_TABLE, *PDBGKM_SERVICE_TABLE; diff --git a/include4/img_defs.h b/include4/img_defs.h index bf3f16e..bdaa73b 100644 --- a/include4/img_defs.h +++ b/include4/img_defs.h @@ -49,7 +49,9 @@ typedef enum img_tag_TriStateSwitch #define INLINE inline #define FORCE_INLINE inline #else +#if !defined(INLINE) #define INLINE __inline +#endif #define FORCE_INLINE static __inline #endif #endif @@ -101,4 +103,6 @@ typedef char TCHAR, *PTCHAR, *PTSTR; #define IMG_CONST const +#define IMG_FORMAT_PRINTF(x,y) + #endif diff --git a/include4/img_types.h b/include4/img_types.h index b1e0af4..b1fec3c 100644 --- a/include4/img_types.h +++ b/include4/img_types.h @@ -27,6 +27,14 @@ #ifndef __IMG_TYPES_H__ #define __IMG_TYPES_H__ +#if !defined(IMG_ADDRSPACE_CPUVADDR_BITS) +#define IMG_ADDRSPACE_CPUVADDR_BITS 32 +#endif + +#if !defined(IMG_ADDRSPACE_PHYSADDR_BITS) +#define IMG_ADDRSPACE_PHYSADDR_BITS 32 +#endif + typedef unsigned int IMG_UINT, *IMG_PUINT; typedef signed int IMG_INT, *IMG_PINT; @@ -41,7 +49,7 @@ typedef unsigned long IMG_UINT32, *IMG_PUINT32; typedef signed long IMG_INT32, *IMG_PINT32; #if !defined(IMG_UINT32_MAX) - #define IMG_UINT32_MAX 0xFFFFFFFFUL + #define IMG_UINT32_MAX 0xFFFFFFFFUL #endif #if (defined(LINUX) || defined(__METAG)) @@ -77,41 +85,43 @@ typedef IMG_PVOID IMG_HANDLE; typedef void** IMG_HVOID, * IMG_PHVOID; -typedef IMG_UINT32 IMG_SIZE_T; +typedef IMG_UINT32 IMG_SIZE_T; #define IMG_NULL 0 typedef IMG_PVOID IMG_CPU_VIRTADDR; -typedef struct {IMG_UINT32 uiAddr;} IMG_CPU_PHYADDR; - -typedef struct {IMG_UINT32 uiAddr;} IMG_DEV_VIRTADDR; - -typedef struct {IMG_UINT32 uiAddr;} IMG_DEV_PHYADDR; - -typedef struct {IMG_UINT32 uiAddr;} IMG_SYS_PHYADDR; - -typedef struct _SYSTEM_ADDR_ +typedef struct { - IMG_UINT32 ui32PageCount; - union - { - - - - IMG_SYS_PHYADDR sContig; - - - - + IMG_UINT32 uiAddr; +#define IMG_CAST_TO_DEVVADDR_UINT(var) (IMG_UINT32)(var) + +} IMG_DEV_VIRTADDR; +typedef struct _IMG_CPU_PHYADDR +{ + + IMG_UINTPTR_T uiAddr; +} IMG_CPU_PHYADDR; +typedef struct _IMG_DEV_PHYADDR +{ +#if IMG_ADDRSPACE_PHYSADDR_BITS == 32 + + IMG_UINTPTR_T uiAddr; +#else + IMG_UINT32 uiAddr; + IMG_UINT32 uiHighAddr; +#endif +} IMG_DEV_PHYADDR; - IMG_SYS_PHYADDR asNonContig[1]; - } u; -} SYSTEM_ADDR; +typedef struct _IMG_SYS_PHYADDR +{ + + IMG_UINTPTR_T uiAddr; +} IMG_SYS_PHYADDR; #include "img_defs.h" diff --git a/include4/pdumpdefs.h b/include4/pdumpdefs.h index ca599ce..83ccbb2 100644 --- a/include4/pdumpdefs.h +++ b/include4/pdumpdefs.h @@ -29,6 +29,7 @@ typedef enum _PDUMP_PIXEL_FORMAT_ { + PVRSRV_PDUMP_PIXEL_FORMAT_UNSUPPORTED = 0, PVRSRV_PDUMP_PIXEL_FORMAT_RGB8 = 1, PVRSRV_PDUMP_PIXEL_FORMAT_RGB332 = 2, PVRSRV_PDUMP_PIXEL_FORMAT_KRGB555 = 3, diff --git a/include4/pvr_debug.h b/include4/pvr_debug.h index 72379c7..9bba6bd 100644 --- a/include4/pvr_debug.h +++ b/include4/pvr_debug.h @@ -55,46 +55,68 @@ extern "C" { #define PVR_DBG_CALLTRACE DBGPRIV_CALLTRACE,__FILE__, __LINE__ #define PVR_DBG_ALLOC DBGPRIV_ALLOC,__FILE__, __LINE__ -#if defined(DEBUG) - #define PVR_ASSERT(EXPR) if (!(EXPR)) PVRSRVDebugAssertFail(__FILE__, __LINE__); - #define PVR_DPF(X) PVRSRVDebugPrintf X - #define PVR_TRACE(X) PVRSRVTrace X +#if !defined(PVRSRV_NEED_PVR_ASSERT) && defined(DEBUG_PVR) +#define PVRSRV_NEED_PVR_ASSERT +#endif -IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugAssertFail(const IMG_CHAR *pszFile, - IMG_UINT32 ui32Line); +#if defined(PVRSRV_NEED_PVR_ASSERT) && !defined(PVRSRV_NEED_PVR_DPF) +#define PVRSRV_NEED_PVR_DPF +#endif -IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugPrintf(IMG_UINT32 ui32DebugLevel, - const IMG_CHAR *pszFileName, - IMG_UINT32 ui32Line, - const IMG_CHAR *pszFormat, - ...); +#if !defined(PVRSRV_NEED_PVR_TRACE) && (defined(DEBUG_PVR) || defined(TIMING)) +#define PVRSRV_NEED_PVR_TRACE +#endif -IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVTrace(const IMG_CHAR* pszFormat, ... ); -IMG_VOID PVRSRVDebugSetLevel (IMG_UINT32 uDebugLevel); +#if defined(PVRSRV_NEED_PVR_ASSERT) - #define PVR_DBG_BREAK + #define PVR_ASSERT(EXPR) if (!(EXPR)) PVRSRVDebugAssertFail(__FILE__, __LINE__); -#else +IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugAssertFail(const IMG_CHAR *pszFile, + IMG_UINT32 ui32Line); + + #if defined(PVR_DBG_BREAK_ASSERT_FAIL) + #define PVR_DBG_BREAK PVRSRVDebugAssertFail("PVR_DBG_BREAK", 0) + #else + #define PVR_DBG_BREAK + #endif -#if defined(TIMING) +#else #define PVR_ASSERT(EXPR) + #define PVR_DBG_BREAK + +#endif + + +#if defined(PVRSRV_NEED_PVR_DPF) + + #define PVR_DPF(X) PVRSRVDebugPrintf X + +IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugPrintf(IMG_UINT32 ui32DebugLevel, + const IMG_CHAR *pszFileName, + IMG_UINT32 ui32Line, + const IMG_CHAR *pszFormat, + ...); + +#else + #define PVR_DPF(X) + +#endif + + +#if defined(PVRSRV_NEED_PVR_TRACE) + #define PVR_TRACE(X) PVRSRVTrace X - #define PVR_DBG_BREAK IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVTrace(const IMG_CHAR* pszFormat, ... ); -#else - - #define PVR_ASSERT(EXPR) - #define PVR_DPF(X) +#else + #define PVR_TRACE(X) - #define PVR_DBG_BREAK #endif -#endif #if defined (__cplusplus) diff --git a/include4/services.h b/include4/services.h index f81ef27..1fa76a1 100644 --- a/include4/services.h +++ b/include4/services.h @@ -72,6 +72,11 @@ extern "C" { |PVRSRV_HAP_MULTI_PROCESS \ |PVRSRV_HAP_FROM_EXISTING_PROCESS \ |PVRSRV_HAP_NO_CPU_VIRTUAL) + +#define PVRSRV_MEM_CACHED PVRSRV_HAP_CACHED +#define PVRSRV_MEM_UNCACHED PVRSRV_HAP_UNCACHED +#define PVRSRV_MEM_WRITECOMBINE PVRSRV_HAP_WRITECOMBINE + #define PVRSRV_MEM_BACKINGSTORE_FIELD_SHIFT (24) #define PVRSRV_MAP_NOUSERVIRTUAL (1UL<<27) @@ -89,6 +94,7 @@ extern "C" { #define PVRSRV_MISC_INFO_MEMSTATS_PRESENT (1UL<<2) #define PVRSRV_MISC_INFO_GLOBALEVENTOBJECT_PRESENT (1UL<<3) #define PVRSRV_MISC_INFO_DDKVERSION_PRESENT (1UL<<4) +#define PVRSRV_MISC_INFO_CPUCACHEFLUSH_PRESENT (1UL<<5) #define PVRSRV_PDUMP_MAX_FILENAME_SIZE 20 #define PVRSRV_PDUMP_MAX_COMMENT_SIZE 200 @@ -148,7 +154,10 @@ typedef enum IMG_VISTAMVIDEONODE = 0x0000000A, IMG_VISTAVPBNODE = 0x0000000B, IMG_OPENGL = 0x0000000C, - IMG_D3D = 0x0000000D + IMG_D3D = 0x0000000D, +#if defined(SUPPORT_GRAPHICS_HAL) + IMG_GRAPHICS_HAL = 0x0000000E +#endif } IMG_MODULE_ID; @@ -165,6 +174,26 @@ typedef enum }IMG_DATA_TYPE; +typedef struct _PVRSRV_DEV_DATA_ *PPVRSRV_DEV_DATA; + +typedef struct _PVRSRV_DEVICE_IDENTIFIER_ +{ + PVRSRV_DEVICE_TYPE eDeviceType; + PVRSRV_DEVICE_CLASS eDeviceClass; + IMG_UINT32 ui32DeviceIndex; + +} PVRSRV_DEVICE_IDENTIFIER; + + +typedef struct _PVRSRV_CLIENT_DEV_DATA_ +{ + IMG_UINT32 ui32NumDevices; + PVRSRV_DEVICE_IDENTIFIER asDevID[PVRSRV_MAX_DEVICES]; + PVRSRV_ERROR (*apfnDevConnect[PVRSRV_MAX_DEVICES])(PPVRSRV_DEV_DATA); + +} PVRSRV_CLIENT_DEV_DATA; + + typedef struct _PVRSRV_CONNECTION_ { IMG_HANDLE hServices; @@ -177,7 +206,7 @@ typedef struct _PVRSRV_DEV_DATA_ PVRSRV_CONNECTION sConnection; IMG_HANDLE hDevCookie; -} PVRSRV_DEV_DATA, *PPVRSRV_DEV_DATA; +} PVRSRV_DEV_DATA; typedef struct _PVRSRV_MEMUPDATE_ { @@ -231,7 +260,7 @@ typedef struct _PVRSRV_CLIENT_MEM_INFO_ IMG_UINT32 ui32ClientFlags; - IMG_UINT32 ui32AllocSize; + IMG_SIZE_T ui32AllocSize; @@ -255,30 +284,6 @@ typedef struct _PVRSRV_CLIENT_MEM_INFO_ } PVRSRV_CLIENT_MEM_INFO, *PPVRSRV_CLIENT_MEM_INFO; -#if 0 -typedef struct _PVRSRV_CLIENT_SYNC_INFO_ -{ - - PVRSRV_SYNC_DATA *psSyncData; - - - - - - IMG_DEV_VIRTADDR sWriteOpsCompleteDevVAddr; - - - IMG_DEV_VIRTADDR sReadOpsCompleteDevVAddr; - - - IMG_HANDLE hMappingInfo; - - - IMG_HANDLE hKernelSyncInfo; - -} PVRSRV_CLIENT_SYNC_INFO, *PPVRSRV_CLIENT_SYNC_INFO; -#endif - #define PVRSRV_MAX_CLIENT_HEAPS (32) typedef struct _PVRSRV_HEAP_INFO_ { @@ -292,14 +297,6 @@ typedef struct _PVRSRV_HEAP_INFO_ -typedef struct _PVRSRV_DEVICE_IDENTIFIER_ -{ - PVRSRV_DEVICE_TYPE eDeviceType; - PVRSRV_DEVICE_CLASS eDeviceClass; - IMG_UINT32 ui32DeviceIndex; - -} PVRSRV_DEVICE_IDENTIFIER; - typedef struct _PVRSRV_EVENTOBJECT_ { @@ -393,12 +390,23 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetDeviceMemHeapInfo(IMG_CONST PVRSRV_DEV_DATA * IMG_UINT32 *pui32SharedHeapCount, PVRSRV_HEAP_INFO *psHeapInfo); +#if defined(PVRSRV_LOG_MEMORY_ALLOCS) + #define PVRSRVAllocDeviceMem_log(psDevData, hDevMemHeap, ui32Attribs, ui32Size, ui32Alignment, ppsMemInfo, logStr) \ + (PVR_TRACE(("PVRSRVAllocDeviceMem(" #psDevData "," #hDevMemHeap "," #ui32Attribs "," #ui32Size "," #ui32Alignment "," #ppsMemInfo ")" \ + ": " logStr " (size = 0x%lx)", ui32Size)), \ + PVRSRVAllocDeviceMem(psDevData, hDevMemHeap, ui32Attribs, ui32Size, ui32Alignment, ppsMemInfo)) +#else + #define PVRSRVAllocDeviceMem_log(psDevData, hDevMemHeap, ui32Attribs, ui32Size, ui32Alignment, ppsMemInfo, logStr) \ + PVRSRVAllocDeviceMem(psDevData, hDevMemHeap, ui32Attribs, ui32Size, ui32Alignment, ppsMemInfo) +#endif + + IMG_IMPORT PVRSRV_ERROR IMG_CALLCONV PVRSRVAllocDeviceMem(IMG_CONST PVRSRV_DEV_DATA *psDevData, IMG_HANDLE hDevMemHeap, IMG_UINT32 ui32Attribs, - IMG_UINT32 ui32Size, - IMG_UINT32 ui32Alignment, + IMG_SIZE_T ui32Size, + IMG_SIZE_T ui32Alignment, PVRSRV_CLIENT_MEM_INFO **ppsMemInfo); IMG_IMPORT @@ -414,8 +422,8 @@ IMG_IMPORT PVRSRV_ERROR IMG_CALLCONV PVRSRVReserveDeviceVirtualMem(IMG_CONST PVRSRV_DEV_DATA *psDevData, IMG_HANDLE hDevMemHeap, IMG_DEV_VIRTADDR *psDevVAddr, - IMG_UINT32 ui32Size, - IMG_UINT32 ui32Alignment, + IMG_SIZE_T ui32Size, + IMG_SIZE_T ui32Alignment, PVRSRV_CLIENT_MEM_INFO **ppsMemInfo); IMG_IMPORT PVRSRV_ERROR IMG_CALLCONV PVRSRVFreeDeviceVirtualMem(IMG_CONST PVRSRV_DEV_DATA *psDevData, @@ -444,8 +452,8 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVUnmapExtMemory (IMG_CONST PVRSRV_DEV_DATA *psDev IMG_IMPORT PVRSRV_ERROR IMG_CALLCONV PVRSRVWrapExtMemory(IMG_CONST PVRSRV_DEV_DATA *psDevData, IMG_HANDLE hDevMemContext, - IMG_UINT32 ui32ByteSize, - IMG_UINT32 ui32PageOffset, + IMG_SIZE_T ui32ByteSize, + IMG_SIZE_T ui32PageOffset, IMG_BOOL bPhysContig, IMG_SYS_PHYADDR *psSysPAddr, IMG_VOID *pvLinAddr, @@ -594,6 +602,7 @@ IMG_IMPORT PVRSRV_ERROR IMG_CALLCONV PVRSRVSwapToDCSystem (IMG_HANDLE hDevice, IMG_HANDLE hSwapChain); + IMG_IMPORT IMG_HANDLE IMG_CALLCONV PVRSRVOpenBCDevice(IMG_CONST PVRSRV_DEV_DATA *psDevData, IMG_UINT32 ui32DeviceID); @@ -774,12 +783,12 @@ IMG_IMPORT IMG_BOOL IMG_CALLCONV PVRSRVGetAppHint(IMG_VOID *pvHintState, const IMG_VOID *pvDefault, IMG_VOID *pvReturn); -IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVAllocUserModeMem (IMG_UINT32 ui32Size); -IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVCallocUserModeMem (IMG_UINT32 ui32Size); +IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVAllocUserModeMem (IMG_SIZE_T ui32Size); +IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVCallocUserModeMem (IMG_SIZE_T ui32Size); IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVReallocUserModeMem (IMG_PVOID pvBase, IMG_SIZE_T uNewSize); IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVFreeUserModeMem (IMG_PVOID pvMem); -IMG_IMPORT IMG_VOID PVRSRVMemCopy(IMG_VOID *pvDst, const IMG_VOID *pvSrc, IMG_UINT32 ui32Size); -IMG_IMPORT IMG_VOID PVRSRVMemSet(IMG_VOID *pvDest, IMG_UINT8 ui8Value, IMG_UINT32 ui32Size); +IMG_IMPORT IMG_VOID PVRSRVMemCopy(IMG_VOID *pvDst, const IMG_VOID *pvSrc, IMG_SIZE_T ui32Size); +IMG_IMPORT IMG_VOID PVRSRVMemSet(IMG_VOID *pvDest, IMG_UINT8 ui8Value, IMG_SIZE_T ui32Size); struct _PVRSRV_MUTEX_OPAQUE_STRUCT_; typedef struct _PVRSRV_MUTEX_OPAQUE_STRUCT_ *PVRSRV_MUTEX_HANDLE; diff --git a/include4/servicesext.h b/include4/servicesext.h index 947f354..1032d31 100644 --- a/include4/servicesext.h +++ b/include4/servicesext.h @@ -70,6 +70,7 @@ typedef enum _PVRSRV_ERROR_ PVRSRV_ERROR_DDK_VERSION_MISMATCH = 35, PVRSRV_ERROR_BUILD_MISMATCH = 36, + PVRSRV_ERROR_PDUMP_BUF_OVERFLOW, PVRSRV_ERROR_FORCE_I32 = 0x7fffffff @@ -150,7 +151,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ { PVRSRV_PIXEL_FORMAT_D16, PVRSRV_PIXEL_FORMAT_D24S8, PVRSRV_PIXEL_FORMAT_D24X8, - + PVRSRV_PIXEL_FORMAT_ABGR16, PVRSRV_PIXEL_FORMAT_ABGR16F, @@ -222,7 +223,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ { PVRSRV_PIXEL_FORMAT_A16B16G16R16_SNORM, PVRSRV_PIXEL_FORMAT_A16B16G16R16_UINT, PVRSRV_PIXEL_FORMAT_A16B16G16R16_UNORM, - + PVRSRV_PIXEL_FORMAT_G16R16, PVRSRV_PIXEL_FORMAT_G16R16F, @@ -230,7 +231,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ { PVRSRV_PIXEL_FORMAT_G16R16_UNORM, PVRSRV_PIXEL_FORMAT_G16R16_SINT, PVRSRV_PIXEL_FORMAT_G16R16_SNORM, - + PVRSRV_PIXEL_FORMAT_R16, PVRSRV_PIXEL_FORMAT_R16F, @@ -397,7 +398,7 @@ typedef struct _IMG_RECT_16_ typedef PVRSRV_ERROR (*PFN_GET_BUFFER_ADDR)(IMG_HANDLE, IMG_HANDLE, IMG_SYS_PHYADDR**, - IMG_UINT32*, + IMG_SIZE_T*, IMG_VOID**, IMG_HANDLE*, IMG_BOOL*); diff --git a/include4/sgx_options.h b/include4/sgx_options.h index dfafbd7..7fe5f98 100644 --- a/include4/sgx_options.h +++ b/include4/sgx_options.h @@ -24,7 +24,7 @@ * ******************************************************************************/ -#if defined(DEBUG) || defined (INTERNAL_TEST) +#if defined(DEBUG_PVR) || defined (INTERNAL_TEST) #define DEBUG_SET_OFFSET OPTIONS_BIT0 #define OPTIONS_BIT0 0x1 #else @@ -75,15 +75,6 @@ #define OPTIONS_BIT6 0x0 #endif -#if defined(SGX_DONT_SWITCH_OFF_FEATURES) || defined (INTERNAL_TEST) -#define SGX_DONT_SWITCH_OFF_FEATURES_SET_OFFSET OPTIONS_BIT7 -#define OPTIONS_BIT7 (0x1 << 7) -#else -#define OPTIONS_BIT7 0x0 -#endif - - - #if defined(SGX_FAST_DPM_INIT) || defined (INTERNAL_TEST) #define SGX_FAST_DPM_INIT_SET_OFFSET OPTIONS_BIT8 #define OPTIONS_BIT8 (0x1 << 8) @@ -214,7 +205,6 @@ OPTIONS_BIT4 |\ OPTIONS_BIT5 |\ OPTIONS_BIT6 |\ - OPTIONS_BIT7 |\ OPTIONS_BIT8 |\ OPTIONS_BIT9 |\ OPTIONS_BIT10 |\ diff --git a/include4/sgxapi_km.h b/include4/sgxapi_km.h index ab0e411..c31082e 100644 --- a/include4/sgxapi_km.h +++ b/include4/sgxapi_km.h @@ -41,17 +41,17 @@ extern "C" { #endif #endif -#define SGX_UNDEFINED_HEAP_ID (~0LU) -#define SGX_GENERAL_HEAP_ID 0 -#define SGX_TADATA_HEAP_ID 1 -#define SGX_KERNEL_CODE_HEAP_ID 2 -#define SGX_KERNEL_DATA_HEAP_ID 3 -#define SGX_PIXELSHADER_HEAP_ID 4 -#define SGX_VERTEXSHADER_HEAP_ID 5 -#define SGX_PDSPIXEL_CODEDATA_HEAP_ID 6 -#define SGX_PDSVERTEX_CODEDATA_HEAP_ID 7 -#define SGX_SYNCINFO_HEAP_ID 8 -#define SGX_3DPARAMETERS_HEAP_ID 9 +#define SGX_UNDEFINED_HEAP_ID (~0LU) +#define SGX_GENERAL_HEAP_ID 0 +#define SGX_TADATA_HEAP_ID 1 +#define SGX_KERNEL_CODE_HEAP_ID 2 +#define SGX_KERNEL_DATA_HEAP_ID 3 +#define SGX_PIXELSHADER_HEAP_ID 4 +#define SGX_VERTEXSHADER_HEAP_ID 5 +#define SGX_PDSPIXEL_CODEDATA_HEAP_ID 6 +#define SGX_PDSVERTEX_CODEDATA_HEAP_ID 7 +#define SGX_SYNCINFO_HEAP_ID 8 +#define SGX_3DPARAMETERS_HEAP_ID 9 #if defined(SUPPORT_SGX_GENERAL_MAPPING_HEAP) #define SGX_GENERAL_MAPPING_HEAP_ID 10 #if defined(SGX_FEATURE_2D_HARDWARE) @@ -91,9 +91,9 @@ extern "C" { #define PVRSRV_SGX_HWPERF_MK_2D 0x104 #define PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT 28 -#define PVRSRV_SGX_HWPERF_TYPE_OP_MASK ((1 << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) - 1) -#define PVRSRV_SGX_HWPERF_TYPE_OP_START (0 << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) -#define PVRSRV_SGX_HWPERF_TYPE_OP_END (1 << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) +#define PVRSRV_SGX_HWPERF_TYPE_OP_MASK ((1UL << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) - 1) +#define PVRSRV_SGX_HWPERF_TYPE_OP_START (0UL << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) +#define PVRSRV_SGX_HWPERF_TYPE_OP_END (1Ul << PVRSRV_SGX_HWPERF_TYPE_STARTEND_BIT) #define PVRSRV_SGX_HWPERF_TYPE_TRANSFER_START (PVRSRV_SGX_HWPERF_TRANSFER | PVRSRV_SGX_HWPERF_TYPE_OP_START) #define PVRSRV_SGX_HWPERF_TYPE_TRANSFER_END (PVRSRV_SGX_HWPERF_TRANSFER | PVRSRV_SGX_HWPERF_TYPE_OP_END) -- 2.39.5