virgl: add missing members in virgl_caps_v2 in 22.2

The cherry pick 3ae1f012 adds max_uniform_block_size to the virgl_caps_v2 struct
without the video_caps, so max_uniform_block_size contains the wrong
data which regresses OpenGL 4.3 down to 3.0.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20065>
This commit is contained in:
Christopher Egert 2022-11-29 19:13:11 +01:00
parent 2cfea392a7
commit d1716fe20e

View file

@ -546,6 +546,26 @@ struct virgl_caps_v1 {
uint32_t max_texture_gather_components;
};
struct virgl_video_caps {
uint32_t profile:8;
uint32_t entrypoint:8;
uint32_t max_level:8;
uint32_t stacked_frames:8;
uint32_t max_width:16;
uint32_t max_height:16;
uint32_t prefered_format:16;
uint32_t max_macroblocks:16;
uint32_t npot_texture:1;
uint32_t supports_progressive:1;
uint32_t supports_interlaced:1;
uint32_t prefers_interlaced:1;
uint32_t max_temporal_layers:8;
uint32_t reserved:20;
};
/*
* This struct should be growable when used in capset 2,
* so we shouldn't have to add a v3 ever.
@ -603,6 +623,8 @@ struct virgl_caps_v2 {
uint32_t max_shader_sampler_views;
struct virgl_supported_format_mask supported_multisample_formats;
uint32_t max_const_buffer_size[6]; // PIPE_SHADER_TYPES
uint32_t num_video_caps;
struct virgl_video_caps video_caps[32];
uint32_t max_uniform_block_size;
};