svga: sync up with the latest svga include files

Also imported vm_basic_types.h to make upstream sync up easier.

Reviewed-by: Neha Bhende <bhenden@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31290>
This commit is contained in:
Charmaine Lee 2022-12-20 10:24:05 -08:00 committed by Marge Bot
parent 00c94e0cd4
commit 5bdcc290e3
5 changed files with 171 additions and 101 deletions

View file

@ -21,6 +21,7 @@
#include "includeCheck.h"
#include "svga3d_types.h"
#include "svga3d_limits.h"
#include "svga_reg.h"
/*
* Identifiers for commands in the command FIFO.
@ -85,7 +86,7 @@ typedef enum {
SVGA_3D_CMD_SCREEN_DMA = 1082,
SVGA_3D_CMD_DEAD1 = 1083,
SVGA_3D_CMD_DEAD2 = 1084,
SVGA_3D_CMD_DEAD12 = 1085,
SVGA_3D_CMD_DEAD13 = 1086,
SVGA_3D_CMD_DEAD14 = 1087,
@ -286,7 +287,7 @@ typedef enum {
SVGA_3D_CMD_DX_DISPATCH_INDIRECT = 1254,
SVGA_3D_CMD_WRITE_ZERO_SURFACE = 1255,
SVGA_3D_CMD_HINT_ZERO_SURFACE = 1256,
SVGA_3D_CMD_UPDATE_ZERO_SURFACE = 1256,
SVGA_3D_CMD_DX_TRANSFER_TO_BUFFER = 1257,
SVGA_3D_CMD_DX_SET_STRUCTURE_COUNT = 1258,
@ -540,6 +541,26 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdIntraSurfaceCopy; /* SVGA_3D_CMD_INTRA_SURFACE_COPY */
typedef
#include "vmware_pack_begin.h"
struct {
uint32 srcSid;
uint32 destSid;
}
#include "vmware_pack_end.h"
SVGA3dCmdWholeSurfaceCopy; /* SVGA_3D_CMD_WHOLE_SURFACE_COPY */
typedef
#include "vmware_pack_begin.h"
struct {
SVGA3dSurfaceImageId src;
SVGA3dSurfaceImageId dest;
SVGA3dBox boxSrc;
SVGA3dBox boxDest;
}
#include "vmware_pack_end.h"
SVGA3dCmdSurfaceStretchBltNonMSToMS; /* SVGA_3D_CMD_SURFACE_STRETCHBLT_NON_MS_TO_MS */
typedef
#include "vmware_pack_begin.h"
struct {
@ -1276,7 +1297,8 @@ struct SVGA3dCmdLogicOpsTransBlt {
uint32 color;
uint32 flags;
SVGA3dBox srcBox;
SVGA3dBox dstBox;
SVGA3dSignedBox dstBox;
SVGA3dBox clipBox;
}
#include "vmware_pack_end.h"
SVGA3dCmdLogicOpsTransBlt; /* SVGA_3D_CMD_LOGICOPS_TRANSBLT */
@ -1295,7 +1317,8 @@ struct SVGA3dCmdLogicOpsStretchBlt {
uint16 mode;
uint16 flags;
SVGA3dBox srcBox;
SVGA3dBox dstBox;
SVGA3dSignedBox dstBox;
SVGA3dBox clipBox;
}
#include "vmware_pack_end.h"
SVGA3dCmdLogicOpsStretchBlt; /* SVGA_3D_CMD_LOGICOPS_STRETCHBLT */
@ -1331,7 +1354,8 @@ struct SVGA3dCmdLogicOpsAlphaBlend {
uint32 alphaVal;
uint32 flags;
SVGA3dBox srcBox;
SVGA3dBox dstBox;
SVGA3dSignedBox dstBox;
SVGA3dBox clipBox;
}
#include "vmware_pack_end.h"
SVGA3dCmdLogicOpsAlphaBlend; /* SVGA_3D_CMD_LOGICOPS_ALPHABLEND */
@ -1392,8 +1416,10 @@ struct {
uint32 mobPitch;
SVGA3dSurface2Flags surface2Flags;
uint8 multisamplePattern;
uint8 pad0[3];
uint32 pad1[3];
uint8 qualityLevel;
uint16 bufferByteStride;
float minLOD;
uint32 pad0[2];
}
#include "vmware_pack_end.h"
SVGAOTableSurfaceEntry;
@ -1482,6 +1508,7 @@ struct {
}
#include "vmware_pack_end.h"
SVGAGBVertexStream;
typedef
#include "vmware_pack_begin.h"
struct {
@ -1501,7 +1528,7 @@ struct {
SVGA3dMaterial material;
} material;
float clipPlanes[SVGA3D_NUM_CLIPPLANES][4];
float clipPlanes[SVGA3D_MAX_CLIP_PLANES][4];
float matrices[SVGA3D_TRANSFORM_MAX][16];
SVGA3dBool lightEnabled[SVGA3D_NUM_LIGHTS];
@ -1552,7 +1579,6 @@ struct {
}
#include "vmware_pack_end.h"
SVGAGBContextData;
#define SVGA3D_CONTEXT_DATA_SIZE (sizeof(SVGAGBContextData))
/*
* SVGA3dCmdSetOTableBase --
@ -1741,10 +1767,30 @@ struct SVGA3dCmdDefineGBSurface_v3 {
#include "vmware_pack_end.h"
SVGA3dCmdDefineGBSurface_v3; /* SVGA_3D_CMD_DEFINE_GB_SURFACE_V3 */
/*
* Defines a guest-backed surface, adding buffer byte stride.
*/
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDefineGBSurface_v4 {
uint32 sid;
SVGA3dSurfaceAllFlags surfaceFlags;
SVGA3dSurfaceFormat format;
uint32 numMipLevels;
uint32 multisampleCount;
SVGA3dMSPattern multisamplePattern;
SVGA3dMSQualityLevel qualityLevel;
SVGA3dTextureFilter autogenFilter;
SVGA3dSize size;
uint32 arraySize;
uint32 bufferByteStride;
}
#include "vmware_pack_end.h"
SVGA3dCmdDefineGBSurface_v4; /* SVGA_3D_CMD_DEFINE_GB_SURFACE_V4 */
/*
* Destroy a guest-backed surface.
*/
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDestroyGBSurface {
@ -1867,7 +1913,6 @@ struct SVGA3dCmdReadbackGBImagePartial {
#include "vmware_pack_end.h"
SVGA3dCmdReadbackGBImagePartial; /* SVGA_3D_CMD_READBACK_GB_IMAGE_PARTIAL */
/*
* Invalidate an image in a guest-backed surface.
* (Notify the device that the contents can be lost.)
@ -1911,7 +1956,6 @@ struct SVGA3dCmdInvalidateGBImagePartial {
#include "vmware_pack_end.h"
SVGA3dCmdInvalidateGBImagePartial; /* SVGA_3D_CMD_INVALIDATE_GB_IMAGE_PARTIAL */
/*
* Define a guest-backed context.
*/
@ -1974,6 +2018,7 @@ SVGA3dCmdReadbackGBContext; /* SVGA_3D_CMD_READBACK_GB_CONTEXT */
/*
* Invalidate a guest-backed context.
*/
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdInvalidateGBContext {
@ -2040,7 +2085,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdSetGBShaderConstInline; /* SVGA_3D_CMD_SET_GB_SHADERCONSTS_INLINE */
typedef
#include "vmware_pack_begin.h"
struct {
@ -2061,7 +2105,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdEndGBQuery; /* SVGA_3D_CMD_END_GB_QUERY */
/*
* SVGA_3D_CMD_WAIT_FOR_GB_QUERY --
*
@ -2081,7 +2124,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdWaitForGBQuery; /* SVGA_3D_CMD_WAIT_FOR_GB_QUERY */
typedef
#include "vmware_pack_begin.h"
struct {
@ -2101,7 +2143,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdMapMobIntoGart; /* SVGA_3D_CMD_MAP_MOB_INTO_GART */
typedef
#include "vmware_pack_begin.h"
struct {
@ -2111,7 +2152,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdUnmapGartRange; /* SVGA_3D_CMD_UNMAP_GART_RANGE */
/*
* Screen Targets
*/
@ -2162,6 +2202,27 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdUpdateGBScreenTarget; /* SVGA_3D_CMD_UPDATE_GB_SCREENTARGET */
typedef
#include "vmware_pack_begin.h"
struct {
uint32 stid;
SVGA3dRect rect;
SVGA3dFrameUpdateType type;
}
#include "vmware_pack_end.h"
SVGA3dCmdUpdateGBScreenTarget_v2; /* SVGA_3D_CMD_UPDATE_GB_SCREENTARGET_V2 */
typedef
#include "vmware_pack_begin.h"
struct {
uint32 stid;
SVGA3dRect rect;
SVGA3dFrameUpdateType type;
SVGAUnsignedPoint srcPoint;
}
#include "vmware_pack_end.h"
SVGA3dCmdUpdateGBScreenTargetMove; /* SVGA_3D_CMD_UPDATE_GB_SCREENTARGET_MOVE */
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdGBScreenDMA {
@ -2204,4 +2265,20 @@ SVGA3dCmdScreenCopy; /* SVGA_3D_CMD_SCREEN_COPY */
#define SVGA_SCREEN_COPY_STATUS_SUCCESS 0x01
#define SVGA_SCREEN_COPY_STATUS_INVALID 0xFFFFFFFF
typedef
#include "vmware_pack_begin.h"
struct {
uint32 sid;
}
#include "vmware_pack_end.h"
SVGA3dCmdWriteZeroSurface; /* SVGA_3D_CMD_WRITE_ZERO_SURFACE */
typedef
#include "vmware_pack_begin.h"
struct {
uint32 sid;
}
#include "vmware_pack_end.h"
SVGA3dCmdUpdateZeroSurface; /* SVGA_3D_CMD_UPDATE_ZERO_SURFACE */
#endif // _SVGA3D_CMD_H_

View file

@ -34,19 +34,6 @@
#define SVGA3D_INPUT_MAX 2
typedef uint32 SVGA3dInputClassification;
#define SVGA3D_RESOURCE_TYPE_MIN 1
#define SVGA3D_RESOURCE_BUFFER 1
#define SVGA3D_RESOURCE_TEXTURE1D 2
#define SVGA3D_RESOURCE_TEXTURE2D 3
#define SVGA3D_RESOURCE_TEXTURE3D 4
#define SVGA3D_RESOURCE_TEXTURECUBE 5
#define SVGA3D_RESOURCE_TYPE_DX10_MAX 6
#define SVGA3D_RESOURCE_BUFFEREX 6
#define SVGA3D_RESOURCE_TYPE_MAX 7
typedef uint32 SVGA3dResourceType;
#define SVGA3D_COLOR_WRITE_ENABLE_RED (1 << 0)
#define SVGA3D_COLOR_WRITE_ENABLE_GREEN (1 << 1)
#define SVGA3D_COLOR_WRITE_ENABLE_BLUE (1 << 2)
@ -126,17 +113,6 @@ typedef uint32 SVGA3dRasterizerStateId;
typedef uint32 SVGA3dQueryId;
typedef uint32 SVGA3dStreamOutputId;
typedef union {
struct {
float r;
float g;
float b;
float a;
};
float value[4];
} SVGA3dRGBAFloat;
typedef union {
struct {
uint32 r;
@ -173,7 +149,6 @@ struct SVGA3dCmdDXDestroyContext {
#include "vmware_pack_end.h"
SVGA3dCmdDXDestroyContext;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXBindContext {
@ -184,7 +159,6 @@ struct SVGA3dCmdDXBindContext {
#include "vmware_pack_end.h"
SVGA3dCmdDXBindContext;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXReadbackContext {
@ -193,7 +167,6 @@ struct SVGA3dCmdDXReadbackContext {
#include "vmware_pack_end.h"
SVGA3dCmdDXReadbackContext;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXInvalidateContext {
@ -214,14 +187,11 @@ struct SVGA3dCmdDXSetSingleConstantBuffer {
#include "vmware_pack_end.h"
SVGA3dCmdDXSetSingleConstantBuffer;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetShaderResources {
uint32 startView;
SVGA3dShaderType type;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetShaderResources;
@ -235,7 +205,6 @@ struct SVGA3dCmdDXSetShader {
#include "vmware_pack_end.h"
SVGA3dCmdDXSetShader;
typedef union {
struct {
uint32 cbOffset : 12;
@ -274,8 +243,6 @@ typedef
struct SVGA3dCmdDXSetSamplers {
uint32 startSampler;
SVGA3dShaderType type;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetSamplers;
@ -331,7 +298,6 @@ struct SVGA3dCmdDXDrawIndexedInstancedIndirect {
#include "vmware_pack_end.h"
SVGA3dCmdDXDrawIndexedInstancedIndirect;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDrawInstancedIndirect {
@ -341,7 +307,6 @@ struct SVGA3dCmdDXDrawInstancedIndirect {
#include "vmware_pack_end.h"
SVGA3dCmdDXDrawInstancedIndirect;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDrawAuto {
@ -360,7 +325,6 @@ struct SVGA3dCmdDXDispatch {
#include "vmware_pack_end.h"
SVGA3dCmdDXDispatch;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDispatchIndirect {
@ -370,7 +334,6 @@ struct SVGA3dCmdDXDispatchIndirect {
#include "vmware_pack_end.h"
SVGA3dCmdDXDispatchIndirect;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetInputLayout {
@ -393,7 +356,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetVertexBuffers {
uint32 startBuffer;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetVertexBuffers;
@ -413,7 +375,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetVertexBuffers_v2 {
uint32 startBuffer;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetVertexBuffers_v2;
@ -432,12 +393,10 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetVertexBuffersOffsetAndSize {
uint32 startBuffer;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetVertexBuffersOffsetAndSize;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetIndexBuffer {
@ -469,7 +428,6 @@ struct SVGA3dCmdDXSetIndexBufferOffsetAndSize {
#include "vmware_pack_end.h"
SVGA3dCmdDXSetIndexBufferOffsetAndSize;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetTopology {
@ -482,7 +440,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetRenderTargets {
SVGA3dDepthStencilViewId depthStencilViewId;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetRenderTargets;
@ -514,7 +471,6 @@ struct SVGA3dCmdDXSetRasterizerState {
#include "vmware_pack_end.h"
SVGA3dCmdDXSetRasterizerState;
#define SVGA3D_DXQUERY_FLAG_PREDICATEHINT (1 << 0)
typedef uint32 SVGA3dDXQueryFlags;
@ -639,11 +595,11 @@ SVGA3dCmdDXSetPredication;
typedef
#include "vmware_pack_begin.h"
struct MKS3dDXSOState {
struct SVGA3dDXSOState {
uint32 offset;
uint32 intOffset;
uint32 vertexCount;
uint32 dead;
uint32 dead1;
uint32 dead2;
}
#include "vmware_pack_end.h"
SVGA3dDXSOState;
@ -665,7 +621,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetSOTargets {
uint32 pad0;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetSOTargets;
@ -688,7 +643,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetViewports {
uint32 pad0;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetViewports;
@ -699,7 +653,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetScissorRects {
uint32 pad0;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetScissorRects;
@ -715,8 +668,6 @@ struct SVGA3dCmdDXClearRenderTargetView {
#include "vmware_pack_end.h"
SVGA3dCmdDXClearRenderTargetView;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXClearDepthStencilView {
@ -740,7 +691,6 @@ struct SVGA3dCmdDXPredCopyRegion {
#include "vmware_pack_end.h"
SVGA3dCmdDXPredCopyRegion;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXPredStagingCopyRegion {
@ -756,7 +706,6 @@ struct SVGA3dCmdDXPredStagingCopyRegion {
#include "vmware_pack_end.h"
SVGA3dCmdDXPredStagingCopyRegion;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXPredCopy {
@ -795,7 +744,6 @@ struct SVGA3dCmdDXPredStagingConvertRegion {
#include "vmware_pack_end.h"
SVGA3dCmdDXPredStagingConvertRegion;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXPredConvert {
@ -829,7 +777,6 @@ struct SVGA3dCmdDXBufferCopy {
#include "vmware_pack_end.h"
SVGA3dCmdDXBufferCopy;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXStagingBufferCopy {
@ -845,8 +792,6 @@ struct SVGA3dCmdDXStagingBufferCopy {
#include "vmware_pack_end.h"
SVGA3dCmdDXStagingBufferCopy;
typedef
#include "vmware_pack_begin.h"
struct {
@ -859,7 +804,6 @@ struct {
#include "vmware_pack_end.h"
SVGA3dCmdDXResolveCopy;
typedef
#include "vmware_pack_begin.h"
struct {
@ -1029,8 +973,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXHint {
SVGADXHintId hintId;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXHint;
@ -1394,7 +1336,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetUAViews {
uint32 uavSpliceIndex;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetUAViews;
@ -1403,7 +1344,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXSetCSUAViews {
uint32 startIndex;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXSetCSUAViews;
@ -1436,7 +1376,6 @@ typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDefineElementLayout {
SVGA3dElementLayoutId elementLayoutId;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXDefineElementLayout;
@ -1478,13 +1417,12 @@ struct {
uint8 alphaToCoverageEnable;
uint8 independentBlendEnable;
uint16 pad0;
SVGA3dDXBlendStatePerRT perRT[SVGA3D_MAX_RENDER_TARGETS];
SVGA3dDXBlendStatePerRT perRT[SVGA3D_DX_MAX_RENDER_TARGETS];
uint32 pad1[7];
}
#include "vmware_pack_end.h"
SVGACOTableDXBlendStateEntry;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDefineBlendState {
@ -1530,7 +1468,6 @@ struct {
#include "vmware_pack_end.h"
SVGACOTableDXDepthStencilEntry;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDefineDepthStencilState {
@ -1592,7 +1529,6 @@ struct {
#include "vmware_pack_end.h"
SVGACOTableDXRasterizerStateEntry;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXDefineRasterizerState {
@ -1966,6 +1902,15 @@ struct SVGA3dCmdDXReadbackCOTable {
SVGA3dCmdDXReadbackCOTable;
typedef
#include "vmware_pack_begin.h"
struct SVGA3dCmdDXCopyCOTableIntoMob {
uint32 cid;
SVGACOTableType type;
uint32 mobid;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXCopyCOTableIntoMob;
typedef
#include "vmware_pack_begin.h"
@ -1975,7 +1920,6 @@ struct SVGA3dCmdDXPredStagingCopy {
uint8 readback;
uint8 unsynchronized;
uint8 mustBeZero[2];
}
#include "vmware_pack_end.h"
SVGA3dCmdDXPredStagingCopy;
@ -1988,7 +1932,6 @@ struct SVGA3dCmdDXStagingCopy {
uint8 readback;
uint8 unsynchronized;
uint8 mustBeZero[2];
}
#include "vmware_pack_end.h"
SVGA3dCmdDXStagingCopy;
@ -2048,7 +1991,7 @@ struct SVGADXContextMobFormat {
uint32 stencilRef;
uint32 rasterizerStateId;
uint32 depthStencilViewId;
uint32 renderTargetViewIds[SVGA3D_MAX_SIMULTANEOUS_RENDER_TARGETS];
uint32 renderTargetViewIds[SVGA3D_DX_MAX_RENDER_TARGETS];
} renderState;
uint32 pad0[8];
@ -2120,4 +2063,19 @@ struct SVGADXShaderIfaceMobFormat {
#include "vmware_pack_end.h"
SVGADXShaderIfaceMobFormat;
#define SVGA_MOB_FENCE_FLAG_IRQ (1 << 0)
#define SVGA_MOB_FENCE_MASK (SVGA_MOB_FENCE_FLAG_IRQ)
typedef uint32 SVGAMobFenceFlags;
typedef
#include "vmware_pack_begin.h"
struct {
uint64 value;
uint32 mobId;
uint32 mobOffset;
uint32 flags;
}
#include "vmware_pack_end.h"
SVGA3dCmdDXMobFenceWithFlags;
#endif

View file

@ -14,6 +14,7 @@
#ifndef SVGA3D_SURFACEDEFS_H
#define SVGA3D_SURFACEDEFS_H
#include "svga_types.h"
#include "svga3d_reg.h"
#define max_t(type, x, y) ((x) > (y) ? (x) : (y))

View file

@ -58,12 +58,25 @@
#define MIN_UINT64 (CONST64U(0))
#define MAX_UINT64 (CONST64U(0xffffffffffffffff))
#include "svga_types.h"
/*
* Generic Types
*/
#define SVGA3D_INVALID_ID ((uint32)-1)
#define SVGA3D_RESERVED_ID ((uint32)-2)
#define SVGA3D_RESOURCE_TYPE_MIN 1
#define SVGA3D_RESOURCE_BUFFER 1
#define SVGA3D_RESOURCE_TEXTURE1D 2
#define SVGA3D_RESOURCE_TEXTURE2D 3
#define SVGA3D_RESOURCE_TEXTURE3D 4
#define SVGA3D_RESOURCE_TEXTURECUBE 5
#define SVGA3D_RESOURCE_TYPE_DX10_MAX 6
#define SVGA3D_RESOURCE_BUFFEREX 6
#define SVGA3D_RESOURCE_TYPE_MAX 7
typedef uint32 SVGA3dResourceType;
typedef uint8 SVGABool8; /* 8-bit Bool definition */
typedef uint32 SVGA3dBool; /* 32-bit Bool definition */
@ -133,6 +146,19 @@ struct {
#include "vmware_pack_end.h"
SVGA3dBox;
typedef
#include "vmware_pack_begin.h"
struct {
int32 x;
int32 y;
int32 z;
int32 w;
int32 h;
int32 d;
}
#include "vmware_pack_end.h"
SVGA3dSignedBox;
typedef
#include "vmware_pack_begin.h"
struct {
@ -143,6 +169,22 @@ struct {
#include "vmware_pack_end.h"
SVGA3dPoint;
typedef
#include "vmware_pack_begin.h"
union {
struct {
float r;
float g;
float b;
float a;
};
float value[4];
}
#include "vmware_pack_end.h"
SVGA3dRGBAFloat;
/*
* Surface formats.
*/
@ -419,7 +461,6 @@ typedef enum SVGA3dSurfaceFormat {
*/
#define SVGA3D_SURFACE_TRANSFER_FROM_BUFFER (CONST64U(1) << 30)
#define SVGA3D_SURFACE_RESERVED1 (CONST64U(1) << 31)
@ -443,15 +484,6 @@ typedef enum SVGA3dSurfaceFormat {
#define SVGA3D_SURFACE_STAGING_COPY (CONST64U(1) << 40)
#define SVGA3D_SURFACE_FLAG_MAX (CONST64U(1) << 44)
@ -1641,7 +1673,6 @@ typedef enum {
#define SVGA3D_LOGICOP_INVALID 0
#define SVGA3D_LOGICOP_COPY 1
#define SVGA3D_LOGICOP_MIN 1
#define SVGA3D_LOGICOP_NOT 2
#define SVGA3D_LOGICOP_AND 3
@ -1649,7 +1680,6 @@ typedef enum {
#define SVGA3D_LOGICOP_XOR 5
#define SVGA3D_LOGICOP_NXOR 6
#define SVGA3D_LOGICOP_ROP3 7
#define SVGA3D_LOGICOP_MAX 8
typedef uint16 SVGA3dLogicOp;
@ -1766,7 +1796,6 @@ typedef enum SVGAMobFormat {
SVGA3D_MOBFMT_PT64_2 = 6,
SVGA3D_MOBFMT_PREDX_MAX = 7,
SVGA3D_MOBFMT_EMPTY = 7,
SVGA3D_MOBFMT_MAX,

View file

@ -554,6 +554,11 @@ struct {
int32 y;
} SVGASignedPoint;
typedef
struct {
uint32 x;
uint32 y;
} SVGAUnsignedPoint;
/*
* SVGA Device Capabilities