X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fvirgl%2Fvirgl_hw.h;h=bbf5f5f7519a59e5752a4a5b4716320387cf5f5e;hb=a4c708dd24e5ba8ac381973c14db8d23f4ac97bf;hp=ed88b6cf8d3928e51d2771f4967b6e8af96040fb;hpb=a0edceb00dbe4771267615593f416a0dc9ccd52a;p=mesa.git diff --git a/src/gallium/drivers/virgl/virgl_hw.h b/src/gallium/drivers/virgl/virgl_hw.h index ed88b6cf8d3..bbf5f5f7519 100644 --- a/src/gallium/drivers/virgl/virgl_hw.h +++ b/src/gallium/drivers/virgl/virgl_hw.h @@ -23,6 +23,8 @@ #ifndef VIRGL_HW_H #define VIRGL_HW_H +#include + struct virgl_box { uint32_t x, y, z; uint32_t w, h, d; @@ -49,32 +51,74 @@ enum virgl_formats { VIRGL_FORMAT_Z24_UNORM_S8_UINT = 19, VIRGL_FORMAT_S8_UINT_Z24_UNORM = 20, VIRGL_FORMAT_Z24X8_UNORM = 21, + VIRGL_FORMAT_X8Z24_UNORM = 22, VIRGL_FORMAT_S8_UINT = 23, /**< ubyte stencil */ - + VIRGL_FORMAT_R64_FLOAT = 24, + VIRGL_FORMAT_R64G64_FLOAT = 25, + VIRGL_FORMAT_R64G64B64_FLOAT = 26, + VIRGL_FORMAT_R64G64B64A64_FLOAT = 27, VIRGL_FORMAT_R32_FLOAT = 28, VIRGL_FORMAT_R32G32_FLOAT = 29, VIRGL_FORMAT_R32G32B32_FLOAT = 30, VIRGL_FORMAT_R32G32B32A32_FLOAT = 31, + VIRGL_FORMAT_R32_UNORM = 32, + VIRGL_FORMAT_R32G32_UNORM = 33, + VIRGL_FORMAT_R32G32B32_UNORM = 34, + VIRGL_FORMAT_R32G32B32A32_UNORM = 35, + VIRGL_FORMAT_R32_USCALED = 36, + VIRGL_FORMAT_R32G32_USCALED = 37, + VIRGL_FORMAT_R32G32B32_USCALED = 38, + VIRGL_FORMAT_R32G32B32A32_USCALED = 39, + VIRGL_FORMAT_R32_SNORM = 40, + VIRGL_FORMAT_R32G32_SNORM = 41, + VIRGL_FORMAT_R32G32B32_SNORM = 42, + VIRGL_FORMAT_R32G32B32A32_SNORM = 43, + VIRGL_FORMAT_R32_SSCALED = 44, + VIRGL_FORMAT_R32G32_SSCALED = 45, + VIRGL_FORMAT_R32G32B32_SSCALED = 46, + VIRGL_FORMAT_R32G32B32A32_SSCALED = 47, + VIRGL_FORMAT_R16_UNORM = 48, VIRGL_FORMAT_R16G16_UNORM = 49, - + VIRGL_FORMAT_R16G16B16_UNORM = 50, VIRGL_FORMAT_R16G16B16A16_UNORM = 51, + VIRGL_FORMAT_R16_USCALED = 52, + VIRGL_FORMAT_R16G16_USCALED = 53, + VIRGL_FORMAT_R16G16B16_USCALED = 54, + VIRGL_FORMAT_R16G16B16A16_USCALED = 55, + VIRGL_FORMAT_R16_SNORM = 56, VIRGL_FORMAT_R16G16_SNORM = 57, + VIRGL_FORMAT_R16G16B16_SNORM = 58, VIRGL_FORMAT_R16G16B16A16_SNORM = 59, + VIRGL_FORMAT_R16_SSCALED = 60, + VIRGL_FORMAT_R16G16_SSCALED = 61, + VIRGL_FORMAT_R16G16B16_SSCALED = 62, + VIRGL_FORMAT_R16G16B16A16_SSCALED = 63, + VIRGL_FORMAT_R8_UNORM = 64, VIRGL_FORMAT_R8G8_UNORM = 65, - + VIRGL_FORMAT_R8G8B8_UNORM = 66, VIRGL_FORMAT_R8G8B8A8_UNORM = 67, + VIRGL_FORMAT_R8_USCALED = 69, + VIRGL_FORMAT_R8G8_USCALED = 70, + VIRGL_FORMAT_R8G8B8_USCALED = 71, + VIRGL_FORMAT_R8G8B8A8_USCALED = 72, + VIRGL_FORMAT_R8_SNORM = 74, VIRGL_FORMAT_R8G8_SNORM = 75, VIRGL_FORMAT_R8G8B8_SNORM = 76, VIRGL_FORMAT_R8G8B8A8_SNORM = 77, + VIRGL_FORMAT_R8_SSCALED = 82, + VIRGL_FORMAT_R8G8_SSCALED = 83, + VIRGL_FORMAT_R8G8B8_SSCALED = 84, + VIRGL_FORMAT_R8G8B8A8_SSCALED = 85, + VIRGL_FORMAT_R16_FLOAT = 91, VIRGL_FORMAT_R16G16_FLOAT = 92, VIRGL_FORMAT_R16G16B16_FLOAT = 93, @@ -82,8 +126,13 @@ enum virgl_formats { VIRGL_FORMAT_L8_SRGB = 95, VIRGL_FORMAT_L8A8_SRGB = 96, + VIRGL_FORMAT_R8G8B8_SRGB = 97, + VIRGL_FORMAT_A8B8G8R8_SRGB = 98, + VIRGL_FORMAT_X8B8G8R8_SRGB = 99, VIRGL_FORMAT_B8G8R8A8_SRGB = 100, VIRGL_FORMAT_B8G8R8X8_SRGB = 101, + VIRGL_FORMAT_A8R8G8B8_SRGB = 102, + VIRGL_FORMAT_X8R8G8B8_SRGB = 103, VIRGL_FORMAT_R8G8B8A8_SRGB = 104, /* compressed formats */ @@ -106,6 +155,7 @@ enum virgl_formats { VIRGL_FORMAT_A8B8G8R8_UNORM = 121, VIRGL_FORMAT_B5G5R5X1_UNORM = 122, + VIRGL_FORMAT_R10G10B10A2_USCALED = 123, VIRGL_FORMAT_R11G11B10_FLOAT = 124, VIRGL_FORMAT_R9G9B9E5_FLOAT = 125, VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT = 126, @@ -115,10 +165,17 @@ enum virgl_formats { VIRGL_FORMAT_B4G4R4X4_UNORM = 135, VIRGL_FORMAT_X24S8_UINT = 136, VIRGL_FORMAT_S8X24_UINT = 137, + VIRGL_FORMAT_X32_S8X24_UINT = 138, VIRGL_FORMAT_B2G3R3_UNORM = 139, VIRGL_FORMAT_L16A16_UNORM = 140, VIRGL_FORMAT_A16_UNORM = 141, + VIRGL_FORMAT_I16_UNORM = 142, + + VIRGL_FORMAT_LATC1_UNORM = 143, + VIRGL_FORMAT_LATC1_SNORM = 144, + VIRGL_FORMAT_LATC2_UNORM = 145, + VIRGL_FORMAT_LATC2_SNORM = 146, VIRGL_FORMAT_A8_SNORM = 147, VIRGL_FORMAT_L8_SNORM = 148, @@ -136,6 +193,16 @@ enum virgl_formats { VIRGL_FORMAT_L32_FLOAT = 160, VIRGL_FORMAT_L32A32_FLOAT = 161, + VIRGL_FORMAT_YV12 = 163, + VIRGL_FORMAT_YV16 = 164, + VIRGL_FORMAT_IYUV = 165, /**< aka I420 */ + VIRGL_FORMAT_NV12 = 166, + VIRGL_FORMAT_NV21 = 167, + + VIRGL_FORMAT_R10G10B10A2_SSCALED = 172, + VIRGL_FORMAT_R10G10B10A2_SNORM = 173, + VIRGL_FORMAT_B10G10R10A2_SNORM = 176, + VIRGL_FORMAT_R8_UINT = 177, VIRGL_FORMAT_R8G8_UINT = 178, VIRGL_FORMAT_R8G8B8_UINT = 179, @@ -202,6 +269,9 @@ enum virgl_formats { VIRGL_FORMAT_R16G16B16X16_FLOAT = 236, VIRGL_FORMAT_R16G16B16X16_UINT = 237, VIRGL_FORMAT_R16G16B16X16_SINT = 238, + VIRGL_FORMAT_R32G32B32X32_FLOAT = 239, + VIRGL_FORMAT_R32G32B32X32_UINT = 240, + VIRGL_FORMAT_R32G32B32X32_SINT = 241, VIRGL_FORMAT_R10G10B10A2_UINT = 253, @@ -210,9 +280,28 @@ enum virgl_formats { VIRGL_FORMAT_BPTC_RGB_FLOAT = 257, VIRGL_FORMAT_BPTC_RGB_UFLOAT = 258, + /* etc2 compressed */ + VIRGL_FORMAT_ETC2_RGB8 = 269, + VIRGL_FORMAT_ETC2_SRGB8 = 270, + VIRGL_FORMAT_ETC2_RGB8A1 = 271, + VIRGL_FORMAT_ETC2_SRGB8A1 = 272, + VIRGL_FORMAT_ETC2_RGBA8 = 273, + VIRGL_FORMAT_ETC2_SRGBA8 = 274, + VIRGL_FORMAT_ETC2_R11_UNORM = 275, + VIRGL_FORMAT_ETC2_R11_SNORM = 276, + VIRGL_FORMAT_ETC2_RG11_UNORM = 277, + VIRGL_FORMAT_ETC2_RG11_SNORM = 278, + VIRGL_FORMAT_R10G10B10X2_UNORM = 308, VIRGL_FORMAT_A4B4G4R4_UNORM = 311, - VIRGL_FORMAT_MAX, + + VIRGL_FORMAT_R8_SRGB = 312, + VIRGL_FORMAT_MAX /* = PIPE_FORMAT_COUNT */, + + /* Below formats must not be used in the guest. */ + VIRGL_FORMAT_B8G8R8X8_UNORM_EMULATED, + VIRGL_FORMAT_B8G8R8A8_UNORM_EMULATED, + VIRGL_FORMAT_MAX_EXTENDED }; /* These are used by the capability_bits field in virgl_caps_v2. */ @@ -235,8 +324,23 @@ enum virgl_formats { #define VIRGL_CAP_SRGB_WRITE_CONTROL (1 << 15) #define VIRGL_CAP_QBO (1 << 16) #define VIRGL_CAP_TRANSFER (1 << 17) -#define VIRGL_CAP_FBO_MIXED_COLOR_FORMATS (1 << 18) +#define VIRGL_CAP_FBO_MIXED_COLOR_FORMATS (1 << 18) #define VIRGL_CAP_FAKE_FP64 (1 << 19) +#define VIRGL_CAP_BIND_COMMAND_ARGS (1 << 20) +#define VIRGL_CAP_MULTI_DRAW_INDIRECT (1 << 21) +#define VIRGL_CAP_INDIRECT_PARAMS (1 << 22) +#define VIRGL_CAP_TRANSFORM_FEEDBACK3 (1 << 23) +#define VIRGL_CAP_3D_ASTC (1 << 24) +#define VIRGL_CAP_INDIRECT_INPUT_ADDR (1 << 25) +#define VIRGL_CAP_COPY_TRANSFER (1 << 26) +#define VIRGL_CAP_CLIP_HALFZ (1 << 27) +#define VIRGL_CAP_APP_TWEAK_SUPPORT (1 << 28) +#define VIRGL_CAP_BGRA_SRGB_IS_EMULATED (1 << 29) +#define VIRGL_CAP_CLEAR_TEXTURE (1 << 30) +/* Reserved for VIRGL_CAP_ARB_BUFFER_STORAGE */ + +/* These are used by the capability_bits_v2 field in virgl_caps_v2. */ +#define VIRGL_CAP_V2_BLEND_EQUATION (1 << 0) /* virgl bind flags - these are compatible with mesa 10.5 gallium. * but are fixed, no other should be passed to virgl either. @@ -248,12 +352,21 @@ enum virgl_formats { #define VIRGL_BIND_INDEX_BUFFER (1 << 5) #define VIRGL_BIND_CONSTANT_BUFFER (1 << 6) #define VIRGL_BIND_DISPLAY_TARGET (1 << 7) +#define VIRGL_BIND_COMMAND_ARGS (1 << 8) #define VIRGL_BIND_STREAM_OUTPUT (1 << 11) #define VIRGL_BIND_SHADER_BUFFER (1 << 14) #define VIRGL_BIND_QUERY_BUFFER (1 << 15) #define VIRGL_BIND_CURSOR (1 << 16) #define VIRGL_BIND_CUSTOM (1 << 17) #define VIRGL_BIND_SCANOUT (1 << 18) +/* Used for buffers that are backed by guest storage and + * are only read by the host. + */ +#define VIRGL_BIND_STAGING (1 << 19) +#define VIRGL_BIND_SHARED (1 << 20) + +/* Extra flags that may be passed */ +#define VIRGL_BIND_PREFER_EMULATED_BGRA (1 << 21) struct virgl_caps_bool_set1 { unsigned indep_blend_enable:1; @@ -364,6 +477,9 @@ struct virgl_caps_v2 { uint32_t max_combined_atomic_counters; uint32_t max_combined_atomic_counter_buffers; uint32_t host_feature_check_version; + struct virgl_supported_format_mask supported_readback_formats; + struct virgl_supported_format_mask scanout; + uint32_t capability_bits_v2; }; union virgl_caps { @@ -387,8 +503,8 @@ enum virgl_ctx_errors { VIRGL_ERROR_CTX_ILLEGAL_SURFACE, VIRGL_ERROR_CTX_ILLEGAL_VERTEX_FORMAT, VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER, + VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS, }; - #define VIRGL_RESOURCE_Y_0_TOP (1 << 0) #endif