From ae12e6b325719426085eb7f132b893cc432ffbd7 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Tue, 7 Jan 2025 17:34:11 +0800 Subject: [PATCH] virgl: remove virgl_get_param and virgl_get_paramf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/virgl/virgl_screen.c | 334 ----------------------- 1 file changed, 334 deletions(-) diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index ab0ff0a4ab5..adcd5d2e104 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -74,303 +74,6 @@ virgl_get_name(struct pipe_screen *screen) return "virgl"; } -static int -virgl_get_param(struct pipe_screen *screen, enum pipe_cap param) -{ - struct virgl_screen *vscreen = virgl_screen(screen); - switch (param) { - case PIPE_CAP_NPOT_TEXTURES: - return 1; - case PIPE_CAP_FRAGMENT_SHADER_TEXTURE_LOD: - case PIPE_CAP_FRAGMENT_SHADER_DERIVATIVES: - return 1; - case PIPE_CAP_ANISOTROPIC_FILTER: - return vscreen->caps.caps.v2.max_anisotropy > 1.0; - case PIPE_CAP_MAX_RENDER_TARGETS: - return vscreen->caps.caps.v1.max_render_targets; - case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: - return vscreen->caps.caps.v1.max_dual_source_render_targets; - case PIPE_CAP_OCCLUSION_QUERY: - return vscreen->caps.caps.v1.bset.occlusion_query; - case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE: - if (vscreen->caps.caps.v2.host_feature_check_version >= 20) - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_MIRROR_CLAMP_TO_EDGE; - FALLTHROUGH; - case PIPE_CAP_TEXTURE_MIRROR_CLAMP: - if (vscreen->caps.caps.v2.host_feature_check_version >= 22) - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_MIRROR_CLAMP; - return vscreen->caps.caps.v1.bset.mirror_clamp && - !(vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_HOST_IS_GLES); - case PIPE_CAP_TEXTURE_SWIZZLE: - return 1; - case PIPE_CAP_MAX_TEXTURE_2D_SIZE: - if (vscreen->caps.caps.v2.max_texture_2d_size) - return vscreen->caps.caps.v2.max_texture_2d_size; - return 16384; - case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: - if (vscreen->caps.caps.v2.max_texture_3d_size) - return 1 + util_logbase2(vscreen->caps.caps.v2.max_texture_3d_size); - return 9; /* 256 x 256 x 256 */ - case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: - if (vscreen->caps.caps.v2.max_texture_cube_size) - return 1 + util_logbase2(vscreen->caps.caps.v2.max_texture_cube_size); - return 13; /* 4K x 4K */ - case PIPE_CAP_BLEND_EQUATION_SEPARATE: - return 1; - case PIPE_CAP_INDEP_BLEND_ENABLE: - return vscreen->caps.caps.v1.bset.indep_blend_enable; - case PIPE_CAP_INDEP_BLEND_FUNC: - return vscreen->caps.caps.v1.bset.indep_blend_func; - case PIPE_CAP_FS_COORD_ORIGIN_UPPER_LEFT: - case PIPE_CAP_FS_COORD_PIXEL_CENTER_HALF_INTEGER: - case PIPE_CAP_FS_COORD_PIXEL_CENTER_INTEGER: - return 1; - case PIPE_CAP_FS_COORD_ORIGIN_LOWER_LEFT: - return vscreen->caps.caps.v1.bset.fragment_coord_conventions; - case PIPE_CAP_DEPTH_CLIP_DISABLE: - if (vscreen->caps.caps.v1.bset.depth_clip_disable) - return 1; - return 0; - case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: - return vscreen->caps.caps.v1.max_streamout_buffers; - case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: - case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: - return 16*4; - case PIPE_CAP_SUPPORTED_PRIM_MODES: - return BITFIELD_MASK(MESA_PRIM_COUNT) & - ~BITFIELD_BIT(MESA_PRIM_QUADS) & - ~BITFIELD_BIT(MESA_PRIM_QUAD_STRIP); - case PIPE_CAP_PRIMITIVE_RESTART: - case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX: - return vscreen->caps.caps.v1.bset.primitive_restart; - case PIPE_CAP_SHADER_STENCIL_EXPORT: - return vscreen->caps.caps.v1.bset.shader_stencil_export; - case PIPE_CAP_VS_INSTANCEID: - case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR: - return 1; - case PIPE_CAP_SEAMLESS_CUBE_MAP: - return vscreen->caps.caps.v1.bset.seamless_cube_map; - case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: - return vscreen->caps.caps.v1.bset.seamless_cube_map_per_texture; - case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: - return vscreen->caps.caps.v1.max_texture_array_layers; - case PIPE_CAP_MIN_TEXEL_OFFSET: - return vscreen->caps.caps.v2.min_texel_offset; - case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET: - return vscreen->caps.caps.v2.min_texture_gather_offset; - case PIPE_CAP_MAX_TEXEL_OFFSET: - return vscreen->caps.caps.v2.max_texel_offset; - case PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET: - return vscreen->caps.caps.v2.max_texture_gather_offset; - case PIPE_CAP_CONDITIONAL_RENDER: - return vscreen->caps.caps.v1.bset.conditional_render; - case PIPE_CAP_TEXTURE_BARRIER: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_TEXTURE_BARRIER; - case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: - return 1; - case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: - case PIPE_CAP_VERTEX_COLOR_CLAMPED: - return vscreen->caps.caps.v1.bset.color_clamping; - case PIPE_CAP_MIXED_COLORBUFFER_FORMATS: - return (vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_FBO_MIXED_COLOR_FORMATS) || - (vscreen->caps.caps.v2.host_feature_check_version < 1); - case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY: - if (vscreen->caps.caps.v2.host_feature_check_version < 6) - return MIN2(vscreen->caps.caps.v1.glsl_level, 140); - FALLTHROUGH; - case PIPE_CAP_GLSL_FEATURE_LEVEL: - return vscreen->caps.caps.v1.glsl_level; - case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: - return 1; - case PIPE_CAP_DEPTH_CLIP_DISABLE_SEPARATE: - return 0; - case PIPE_CAP_COMPUTE: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_COMPUTE_SHADER; - case PIPE_CAP_USER_VERTEX_BUFFERS: - return 0; - case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: - return vscreen->caps.caps.v2.uniform_buffer_offset_alignment; - case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: - case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: - return vscreen->caps.caps.v1.bset.streamout_pause_resume; - case PIPE_CAP_START_INSTANCE: - return vscreen->caps.caps.v1.bset.start_instance; - case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: - case PIPE_CAP_TEXTURE_TRANSFER_MODES: - case PIPE_CAP_NIR_IMAGES_AS_DEREF: - return 0; - case PIPE_CAP_QUERY_TIMESTAMP: - case PIPE_CAP_QUERY_TIME_ELAPSED: - if (vscreen->caps.caps.v2.host_feature_check_version >= 15) - return vscreen->caps.caps.v1.bset.timer_query; - return 1; /* older versions had this always enabled */ - case PIPE_CAP_TGSI_TEXCOORD: - return vscreen->caps.caps.v2.host_feature_check_version >= 10; - case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: - return VIRGL_MAP_BUFFER_ALIGNMENT; - case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: - return vscreen->caps.caps.v1.max_tbo_size > 0; - case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: - return vscreen->caps.caps.v2.texture_buffer_offset_alignment; - case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: - return 0; - case PIPE_CAP_CUBE_MAP_ARRAY: - return vscreen->caps.caps.v1.bset.cube_map_array; - case PIPE_CAP_TEXTURE_MULTISAMPLE: - return vscreen->caps.caps.v1.bset.texture_multisample; - case PIPE_CAP_MAX_VIEWPORTS: - return vscreen->caps.caps.v1.max_viewports; - case PIPE_CAP_MAX_TEXEL_BUFFER_ELEMENTS_UINT: - return vscreen->caps.caps.v1.max_tbo_size; - case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: - case PIPE_CAP_ENDIANNESS: - return 0; - case PIPE_CAP_QUERY_PIPELINE_STATISTICS: - return !!(vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_PIPELINE_STATISTICS_QUERY); - case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES: - case PIPE_CAP_MIXED_COLOR_DEPTH_BITS: - return 1; - case PIPE_CAP_VS_LAYER_VIEWPORT: - return (vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_VS_VERTEX_LAYER) && - (vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_VS_VIEWPORT_INDEX); - case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES: - return vscreen->caps.caps.v2.max_geom_output_vertices; - case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS: - return vscreen->caps.caps.v2.max_geom_total_output_components; - case PIPE_CAP_TEXTURE_QUERY_LOD: - return vscreen->caps.caps.v1.bset.texture_query_lod; - case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS: - return vscreen->caps.caps.v1.max_texture_gather_components; - case PIPE_CAP_DRAW_INDIRECT: - return vscreen->caps.caps.v1.bset.has_indirect_draw; - case PIPE_CAP_SAMPLE_SHADING: - case PIPE_CAP_FORCE_PERSAMPLE_INTERP: - return vscreen->caps.caps.v1.bset.has_sample_shading; - case PIPE_CAP_CULL_DISTANCE: - return vscreen->caps.caps.v1.bset.has_cull; - case PIPE_CAP_MAX_VERTEX_STREAMS: - return ((vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_TRANSFORM_FEEDBACK3) || - (vscreen->caps.caps.v2.host_feature_check_version < 2)) ? 4 : 1; - case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: - return vscreen->caps.caps.v1.bset.conditional_render_inverted; - case PIPE_CAP_FS_FINE_DERIVATIVE: - return vscreen->caps.caps.v1.bset.derivative_control; - case PIPE_CAP_POLYGON_OFFSET_CLAMP: - return vscreen->caps.caps.v1.bset.polygon_offset_clamp; - case PIPE_CAP_QUERY_SO_OVERFLOW: - return vscreen->caps.caps.v1.bset.transform_feedback_overflow_query; - case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: - return vscreen->caps.caps.v2.shader_buffer_offset_alignment; - case PIPE_CAP_DOUBLES: - return vscreen->caps.caps.v1.bset.has_fp64 || - (vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_HOST_IS_GLES); - case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: - return vscreen->caps.caps.v2.max_shader_patch_varyings; - case PIPE_CAP_SAMPLER_VIEW_TARGET: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_TEXTURE_VIEW; - case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE: - return vscreen->caps.caps.v2.max_vertex_attrib_stride; - case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_COPY_IMAGE; - case PIPE_CAP_TEXTURE_QUERY_SAMPLES: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_TXQS; - case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_FB_NO_ATTACH; - case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_ROBUST_BUFFER_ACCESS; - case PIPE_CAP_FBFETCH: - return (vscreen->caps.caps.v2.capability_bits & - VIRGL_CAP_TGSI_FBFETCH) ? 1 : 0; - case PIPE_CAP_BLEND_EQUATION_ADVANCED: - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_BLEND_EQUATION; - case PIPE_CAP_SHADER_CLOCK: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_SHADER_CLOCK; - case PIPE_CAP_SHADER_ARRAY_COMPONENTS: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_TGSI_COMPONENTS; - case PIPE_CAP_MAX_COMBINED_SHADER_BUFFERS: - return vscreen->caps.caps.v2.max_combined_shader_buffers; - case PIPE_CAP_MAX_COMBINED_HW_ATOMIC_COUNTERS: - return vscreen->caps.caps.v2.max_combined_atomic_counters; - case PIPE_CAP_MAX_COMBINED_HW_ATOMIC_COUNTER_BUFFERS: - return vscreen->caps.caps.v2.max_combined_atomic_counter_buffers; - case PIPE_CAP_TEXTURE_FLOAT_LINEAR: - case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: - return 1; /* TODO: need to introduce a hw-cap for this */ - case PIPE_CAP_QUERY_BUFFER_OBJECT: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_QBO; - case PIPE_CAP_MAX_VARYINGS: - if (vscreen->caps.caps.v1.glsl_level < 150) - return vscreen->caps.caps.v2.max_vertex_attribs; - return 32; - case PIPE_CAP_FAKE_SW_MSAA: - /* If the host supports only one sample (e.g., if it is using softpipe), - * fake multisampling to able to advertise higher GL versions. */ - return (vscreen->caps.caps.v1.max_samples == 1) ? 1 : 0; - case PIPE_CAP_MULTI_DRAW_INDIRECT: - return !!(vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_MULTI_DRAW_INDIRECT); - case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: - return !!(vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_INDIRECT_PARAMS); - case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT: - return (vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_ARB_BUFFER_STORAGE) && - (vscreen->caps.caps.v2.host_feature_check_version >= 4) && - vscreen->vws->supports_coherent && !vscreen->no_coherent; - case PIPE_CAP_PCI_GROUP: - case PIPE_CAP_PCI_BUS: - case PIPE_CAP_PCI_DEVICE: - case PIPE_CAP_PCI_FUNCTION: - case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION: - return 0; - case PIPE_CAP_CLIP_HALFZ: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_CLIP_HALFZ; - case PIPE_CAP_MAX_GS_INVOCATIONS: - return 32; - case PIPE_CAP_MAX_SHADER_BUFFER_SIZE_UINT: - return 1 << 27; - case PIPE_CAP_VENDOR_ID: - return 0x1af4; - case PIPE_CAP_DEVICE_ID: - return 0x1010; - case PIPE_CAP_ACCELERATED: - return -1; /* -1 means unknown */ - case PIPE_CAP_UMA: - case PIPE_CAP_VIDEO_MEMORY: - if (vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_VIDEO_MEMORY) - return vscreen->caps.caps.v2.max_video_memory; - return 0; - case PIPE_CAP_TEXTURE_SHADOW_LOD: - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_TEXTURE_SHADOW_LOD; - case PIPE_CAP_NATIVE_FENCE_FD: - return vscreen->vws->supports_fences; - case PIPE_CAP_DEST_SURFACE_SRGB_CONTROL: - return (vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_SRGB_WRITE_CONTROL) || - (vscreen->caps.caps.v2.host_feature_check_version < 1); - case PIPE_CAP_SHAREABLE_SHADERS: - /* Shader creation emits the shader through the context's command buffer - * in virgl_encode_shader_state(). - */ - return 0; - case PIPE_CAP_QUERY_MEMORY_INFO: - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_MEMINFO; - case PIPE_CAP_STRING_MARKER: - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_STRING_MARKER; - case PIPE_CAP_SURFACE_SAMPLE_COUNT: - return vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_IMPLICIT_MSAA; - case PIPE_CAP_DRAW_PARAMETERS: - return !!(vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_DRAW_PARAMETERS); - case PIPE_CAP_SHADER_GROUP_VOTE: - return !!(vscreen->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_GROUP_VOTE); - case PIPE_CAP_IMAGE_STORE_FORMATTED: - case PIPE_CAP_GL_SPIRV: - return 1; - case PIPE_CAP_MAX_CONSTANT_BUFFER_SIZE_UINT: - if (vscreen->caps.caps.v2.host_feature_check_version >= 13) - return vscreen->caps.caps.v2.max_uniform_block_size; - FALLTHROUGH; - default: - return u_pipe_screen_get_param_defaults(screen, param); - } -} - #define VIRGL_SHADER_STAGE_CAP_V2(CAP, STAGE) \ vscreen->caps.caps.v2. CAP[virgl_shader_stage_convert(STAGE)] @@ -573,41 +276,6 @@ virgl_get_video_param(struct pipe_screen *screen, } } -static float -virgl_get_paramf(struct pipe_screen *screen, enum pipe_capf param) -{ - struct virgl_screen *vscreen = virgl_screen(screen); - switch (param) { - case PIPE_CAPF_MIN_LINE_WIDTH: - case PIPE_CAPF_MIN_LINE_WIDTH_AA: - case PIPE_CAPF_MIN_POINT_SIZE: - case PIPE_CAPF_MIN_POINT_SIZE_AA: - return 1; - case PIPE_CAPF_POINT_SIZE_GRANULARITY: - case PIPE_CAPF_LINE_WIDTH_GRANULARITY: - return 0.1; - case PIPE_CAPF_MAX_LINE_WIDTH: - return vscreen->caps.caps.v2.max_aliased_line_width; - case PIPE_CAPF_MAX_LINE_WIDTH_AA: - return vscreen->caps.caps.v2.max_smooth_line_width; - case PIPE_CAPF_MAX_POINT_SIZE: - return vscreen->caps.caps.v2.max_aliased_point_size; - case PIPE_CAPF_MAX_POINT_SIZE_AA: - return vscreen->caps.caps.v2.max_smooth_point_size; - case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: - return vscreen->caps.caps.v2.max_anisotropy; - case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS: - return vscreen->caps.caps.v2.max_texture_lod_bias; - case PIPE_CAPF_MIN_CONSERVATIVE_RASTER_DILATE: - case PIPE_CAPF_MAX_CONSERVATIVE_RASTER_DILATE: - case PIPE_CAPF_CONSERVATIVE_RASTER_DILATE_GRANULARITY: - return 0.0f; - } - /* should only get here on unhandled cases */ - debug_printf("Unexpected PIPE_CAPF %d query\n", param); - return 0.0; -} - static int virgl_get_compute_param(struct pipe_screen *screen, enum pipe_shader_ir ir_type, @@ -1409,11 +1077,9 @@ virgl_create_screen(struct virgl_winsys *vws, const struct pipe_screen_config *c screen->base.get_name = virgl_get_name; screen->base.get_vendor = virgl_get_vendor; screen->base.get_screen_fd = virgl_screen_get_fd; - screen->base.get_param = virgl_get_param; screen->base.get_shader_param = virgl_get_shader_param; screen->base.get_video_param = virgl_get_video_param; screen->base.get_compute_param = virgl_get_compute_param; - screen->base.get_paramf = virgl_get_paramf; screen->base.get_compiler_options = virgl_get_compiler_options; screen->base.is_format_supported = virgl_is_format_supported; screen->base.is_video_format_supported = virgl_is_video_format_supported;