Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Fri, Aug 10, 2018 at 9:22 PM Eric Anholt <e...@anholt.net> wrote:
>
> One of the pains of implementing a gallium driver is filling in a million
> pipe caps you don't know about yet when you're just starting out. One of
> the pains of working on gallium is copy-and-pasting your new PIPE_CAP into
> each driver. We can fix both of these by having each driver call into the
> default helper from their default case, so that both sides can ignore each
> other until they need to.
> ---
> src/gallium/auxiliary/Makefile.sources | 2 +
> src/gallium/auxiliary/meson.build | 2 +
> src/gallium/auxiliary/util/u_screen.c | 316 ++++++++++++++++++
> src/gallium/auxiliary/util/u_screen.h | 29 ++
> src/gallium/drivers/etnaviv/etnaviv_screen.c | 6 +-
> .../drivers/freedreno/freedreno_screen.c | 5 +-
> src/gallium/drivers/i915/i915_screen.c | 5 +-
> src/gallium/drivers/llvmpipe/lp_screen.c | 7 +-
> .../drivers/nouveau/nv30/nv30_screen.c | 6 +-
> .../drivers/nouveau/nv50/nv50_screen.c | 6 +-
> .../drivers/nouveau/nvc0/nvc0_screen.c | 6 +-
> src/gallium/drivers/r300/r300_screen.c | 4 +-
> src/gallium/drivers/r600/r600_pipe.c | 4 +-
> src/gallium/drivers/radeonsi/si_get.c | 5 +-
> src/gallium/drivers/softpipe/sp_screen.c | 6 +-
> src/gallium/drivers/svga/svga_screen.c | 6 +-
> src/gallium/drivers/swr/swr_screen.cpp | 8 +-
> src/gallium/drivers/v3d/v3d_screen.c | 4 +-
> src/gallium/drivers/vc4/vc4_screen.c | 4 +-
> src/gallium/drivers/virgl/virgl_screen.c | 6 +-
> 20 files changed, 398 insertions(+), 39 deletions(-)
> create mode 100644 src/gallium/auxiliary/util/u_screen.c
> create mode 100644 src/gallium/auxiliary/util/u_screen.h
>
> diff --git a/src/gallium/auxiliary/Makefile.sources
> b/src/gallium/auxiliary/Makefile.sources
> index 626cde123afd..d66fa85f798d 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -317,6 +317,8 @@ C_SOURCES := \
> util/u_ringbuffer.h \
> util/u_sampler.c \
> util/u_sampler.h \
> + util/u_screen.c \
> + util/u_screen.h \
> util/u_simple_shaders.c \
> util/u_simple_shaders.h \
> util/u_split_prim.h \
> diff --git a/src/gallium/auxiliary/meson.build
> b/src/gallium/auxiliary/meson.build
> index 98542d7ef3e0..24ad1083ce22 100644
> --- a/src/gallium/auxiliary/meson.build
> +++ b/src/gallium/auxiliary/meson.build
> @@ -337,6 +337,8 @@ files_libgallium = files(
> 'util/u_ringbuffer.h',
> 'util/u_sampler.c',
> 'util/u_sampler.h',
> + 'util/u_screen.c',
> + 'util/u_screen.h',
> 'util/u_simple_shaders.c',
> 'util/u_simple_shaders.h',
> 'util/u_split_prim.h',
> diff --git a/src/gallium/auxiliary/util/u_screen.c
> b/src/gallium/auxiliary/util/u_screen.c
> new file mode 100644
> index 000000000000..18475fcf1377
> --- /dev/null
> +++ b/src/gallium/auxiliary/util/u_screen.c
> @@ -0,0 +1,316 @@
> +/*
> + * Copyright © 2018 Broadcom
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +#include "pipe/p_screen.h"
> +#include "util/u_screen.h"
> +
> +/**
> + * Helper to use from a pipe_screen->get_param() implementation to return
> + * default values for unsupported PIPE_CAPs.
> + *
> + * Call this function from your pipe_screen->get_param() implementation's
> + * default case, so that implementors of new pipe caps don't need to
> + */
> +int
> +u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen,
> + enum pipe_cap param)
> +{
> + /* Let's keep these sorted by position in p_defines.h. */
> + switch (param) {
> + case PIPE_CAP_NPOT_TEXTURES:
> + case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
> + case PIPE_CAP_ANISOTROPIC_FILTER:
> + case PIPE_CAP_POINT_SPRITE:
> + return 0;
> +
> + case PIPE_CAP_MAX_RENDER_TARGETS:
> + return 1;
> +
> + case PIPE_CAP_OCCLUSION_QUERY:
> + case PIPE_CAP_QUERY_TIME_ELAPSED:
> + case PIPE_CAP_TEXTURE_SWIZZLE:
> + return 0;
> +
> + case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
> + case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
> + case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
> + unreachable("driver must implement these.");
> +
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> + case PIPE_CAP_SM3:
> + case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: /* enables
> EXT_transform_feedback */
> + case PIPE_CAP_PRIMITIVE_RESTART:
> + case PIPE_CAP_INDEP_BLEND_ENABLE:
> + case PIPE_CAP_INDEP_BLEND_FUNC:
> + return 0;
> +
> + case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
> + unreachable("driver must implement these.");
> +
> + case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT:
> + case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
> + case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER:
> + case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
> + case PIPE_CAP_DEPTH_CLIP_DISABLE:
> + case PIPE_CAP_SHADER_STENCIL_EXPORT:
> + case PIPE_CAP_TGSI_INSTANCEID:
> + case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
> + case PIPE_CAP_FRAGMENT_COLOR_CLAMPED:
> + case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
> + case PIPE_CAP_SEAMLESS_CUBE_MAP:
> + case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
> + return 0;
> +
> + case PIPE_CAP_MIN_TEXEL_OFFSET:
> + /* GL 3.x minimum value. */
> + return -8;
> + case PIPE_CAP_MAX_TEXEL_OFFSET:
> + return 7;
> +
> + case PIPE_CAP_CONDITIONAL_RENDER:
> + case PIPE_CAP_TEXTURE_BARRIER:
> + return 0;
> +
> + case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> + /* GL_EXT_transform_feedback minimum value. */
> + return 4;
> + case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> + return 64;
> +
> + case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> + case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
> + case PIPE_CAP_VERTEX_COLOR_UNCLAMPED:
> + case PIPE_CAP_VERTEX_COLOR_CLAMPED:
> + return 0;
> +
> + case PIPE_CAP_GLSL_FEATURE_LEVEL:
> + case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
> + /* Minimum GLSL level implemented by gallium drivers. */
> + return 120;
> +
> + case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
> + case PIPE_CAP_USER_VERTEX_BUFFERS:
> + case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY:
> + case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY:
> + case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY:
> + case PIPE_CAP_COMPUTE:
> + return 0;
> +
> + case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
> + /* GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT default value. */
> + return 1;
> +
> + case PIPE_CAP_START_INSTANCE:
> + case PIPE_CAP_QUERY_TIMESTAMP:
> + case PIPE_CAP_TEXTURE_MULTISAMPLE:
> + return 0;
> +
> + case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT:
> + /* GL_ARB_map_buffer_alignment minimum value. All drivers expose the
> + * extension.
> + */
> + return 64;
> +
> + case PIPE_CAP_CUBE_MAP_ARRAY:
> + case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
> + return 0;
> +
> + case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
> + /* GL_EXT_texture_buffer minimum value. */
> + return 256;
> +
> + case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
> + case PIPE_CAP_TGSI_TEXCOORD:
> + return 0;
> +
> + case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER:
> + return 1;
> +
> + case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> + case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
> + return 0;
> +
> + case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
> + /* GL_EXT_texture_buffer minimum value. */
> + return 65536;
> +
> + case PIPE_CAP_MAX_VIEWPORTS:
> + return 1;
> +
> + case PIPE_CAP_ENDIANNESS:
> + return PIPE_ENDIAN_LITTLE;
> +
> + case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS: /* Enables
> ARB_texture_gather */
> + case PIPE_CAP_TEXTURE_GATHER_SM5:
> + case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> + case PIPE_CAP_FAKE_SW_MSAA:
> + case PIPE_CAP_TEXTURE_QUERY_LOD:
> + return 0;
> +
> + case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET:
> + return -8;
> + case PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET:
> + return 7;
> +
> + case PIPE_CAP_SAMPLE_SHADING:
> + case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
> + case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
> + case PIPE_CAP_MAX_VERTEX_STREAMS:
> + case PIPE_CAP_DRAW_INDIRECT:
> + case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
> + return 0;
> +
> + case PIPE_CAP_VENDOR_ID:
> + case PIPE_CAP_DEVICE_ID:
> + return 0xffffffff;
> +
> + case PIPE_CAP_ACCELERATED:
> + case PIPE_CAP_VIDEO_MEMORY:
> + case PIPE_CAP_UMA:
> + unreachable("driver must implement these.");
> +
> + case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> + return 0;
> +
> + case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE:
> + /* GL minimum value */
> + return 2048;
> +
> + case PIPE_CAP_SAMPLER_VIEW_TARGET:
> + case PIPE_CAP_CLIP_HALFZ:
> + case PIPE_CAP_VERTEXID_NOBASE:
> + case PIPE_CAP_POLYGON_OFFSET_CLAMP:
> + case PIPE_CAP_MULTISAMPLE_Z_RESOLVE:
> + case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
> + case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
> + case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
> + case PIPE_CAP_TEXTURE_FLOAT_LINEAR:
> + case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR:
> + case PIPE_CAP_DEPTH_BOUNDS_TEST:
> + case PIPE_CAP_TGSI_TXQS:
> + case PIPE_CAP_FORCE_PERSAMPLE_INTERP:
> + case PIPE_CAP_SHAREABLE_SHADERS:
> + case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS:
> + case PIPE_CAP_CLEAR_TEXTURE:
> + case PIPE_CAP_DRAW_PARAMETERS:
> + case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
> + case PIPE_CAP_MULTI_DRAW_INDIRECT:
> + case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
> + case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL:
> + case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
> + return 0;
> +
> + case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
> + /* Enables GL_ARB_shader_storage_buffer_object */
> + return 0;
> +
> + case PIPE_CAP_INVALIDATE_BUFFER:
> + case PIPE_CAP_GENERATE_MIPMAP:
> + case PIPE_CAP_STRING_MARKER:
> + case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
> + case PIPE_CAP_QUERY_BUFFER_OBJECT:
> + case PIPE_CAP_QUERY_MEMORY_INFO: /* Enables GL_ATI_meminfo */
> + return 0;
> +
> + case PIPE_CAP_PCI_GROUP:
> + case PIPE_CAP_PCI_BUS:
> + case PIPE_CAP_PCI_DEVICE:
> + case PIPE_CAP_PCI_FUNCTION:
> + unreachable("driver must implement these.");
> +
> + case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT:
> + case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR:
> + case PIPE_CAP_CULL_DISTANCE:
> + case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
> + case PIPE_CAP_TGSI_VOTE:
> + case PIPE_CAP_MAX_WINDOW_RECTANGLES: /* Enables EXT_window_rectangles */
> + case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED:
> + case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS:
> + case PIPE_CAP_MIXED_COLOR_DEPTH_BITS:
> + case PIPE_CAP_TGSI_ARRAY_COMPONENTS:
> + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
> + case PIPE_CAP_TGSI_CAN_READ_OUTPUTS:
> + case PIPE_CAP_NATIVE_FENCE_FD:
> + return 0;
> +
> + case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
> + return 1;
> +
> + case PIPE_CAP_TGSI_FS_FBFETCH:
> + case PIPE_CAP_TGSI_MUL_ZERO_WINS:
> + case PIPE_CAP_DOUBLES:
> + case PIPE_CAP_INT64:
> + case PIPE_CAP_INT64_DIVMOD:
> + case PIPE_CAP_TGSI_TEX_TXF_LZ:
> + case PIPE_CAP_TGSI_CLOCK:
> + case PIPE_CAP_POLYGON_MODE_FILL_RECTANGLE:
> + case PIPE_CAP_SPARSE_BUFFER_PAGE_SIZE:
> + case PIPE_CAP_TGSI_BALLOT:
> + case PIPE_CAP_TGSI_TES_LAYER_VIEWPORT:
> + case PIPE_CAP_CAN_BIND_CONST_BUFFER_AS_VERTEX:
> + return 0;
> +
> + case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
> + /* Drivers generally support this, and it reduces GL overhead just to
> + * throw an error when buffers are mapped.
> + */
> + return 1;
> +
> + case PIPE_CAP_POST_DEPTH_COVERAGE:
> + case PIPE_CAP_BINDLESS_TEXTURE:
> + case PIPE_CAP_NIR_SAMPLERS_AS_DEREF:
> + case PIPE_CAP_QUERY_SO_OVERFLOW:
> + case PIPE_CAP_MEMOBJ:
> + case PIPE_CAP_LOAD_CONSTBUF:
> + case PIPE_CAP_TGSI_ANY_REG_AS_ADDRESS:
> + case PIPE_CAP_TILE_RASTER_ORDER:
> + return 0;
> +
> + case PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES:
> + /* nonzero overrides defaults */
> + return 0;
> +
> + case PIPE_CAP_FRAMEBUFFER_MSAA_CONSTRAINTS:
> + case PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET:
> + case PIPE_CAP_CONTEXT_PRIORITY_MASK:
> + case PIPE_CAP_FENCE_SIGNAL:
> + case PIPE_CAP_CONSTBUF0_FLAGS:
> + case PIPE_CAP_PACKED_UNIFORMS:
> + case PIPE_CAP_CONSERVATIVE_RASTER_POST_SNAP_TRIANGLES:
> + case PIPE_CAP_CONSERVATIVE_RASTER_POST_SNAP_POINTS_LINES:
> + case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_TRIANGLES:
> + case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES:
> + case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS:
> + case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE:
> + case PIPE_CAP_PROGRAMMABLE_SAMPLE_LOCATIONS:
> + return 0;
> +
> + default:
> + unreachable("bad PIPE_CAP_*");
> + }
> +}
> diff --git a/src/gallium/auxiliary/util/u_screen.h
> b/src/gallium/auxiliary/util/u_screen.h
> new file mode 100644
> index 000000000000..65afb277ef3b
> --- /dev/null
> +++ b/src/gallium/auxiliary/util/u_screen.h
> @@ -0,0 +1,29 @@
> +/*
> + * Copyright © 2018 Broadcom
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +struct pipe_screen;
> +enum pipe_cap;
> +
> +int
> +u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen,
> + enum pipe_cap param);
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c
> b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> index 35707e604458..c6daded20f54 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> @@ -41,6 +41,7 @@
> #include "util/os_time.h"
> #include "util/u_math.h"
> #include "util/u_memory.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
>
> #include "state_tracker/drm_driver.h"
> @@ -362,10 +363,9 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return 0;
> case PIPE_CAP_UMA:
> return 1;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> -
> - debug_printf("unknown param %d", param);
> - return 0;
> }
>
> static float
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c
> b/src/gallium/drivers/freedreno/freedreno_screen.c
> index 4d54446ec7ec..b698e36d6e3b 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -35,6 +35,7 @@
> #include "util/u_inlines.h"
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
> #include "util/u_debug.h"
>
> @@ -477,9 +478,9 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return 1;
> case PIPE_CAP_NATIVE_FENCE_FD:
> return fd_device_version(screen->dev) >= FD_VERSION_FENCE_FD;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> - debug_printf("unknown param %d\n", param);
> - return 0;
> }
>
> static float
> diff --git a/src/gallium/drivers/i915/i915_screen.c
> b/src/gallium/drivers/i915/i915_screen.c
> index dda7c5baee54..6251774ff24f 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -32,6 +32,7 @@
> #include "util/u_format_s3tc.h"
> #include "util/u_inlines.h"
> #include "util/u_memory.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
>
> #include "i915_reg.h"
> @@ -418,9 +419,9 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap
> cap)
> case PIPE_CAP_COMPUTE:
> case PIPE_CAP_QUERY_BUFFER_OBJECT:
> return 0;
> +
> default:
> - debug_printf("%s: Unknown cap %u.\n", __FUNCTION__, cap);
> - return 0;
> + return u_pipe_screen_get_param_defaults(screen, param);
> }
> }
>
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c
> b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 261bca907a63..ab9da9917521 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -30,6 +30,7 @@
> #include "util/u_math.h"
> #include "util/u_cpu_detect.h"
> #include "util/u_format.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
> #include "util/u_format_s3tc.h"
> #include "pipe/p_defines.h"
> @@ -373,10 +374,10 @@ llvmpipe_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS:
> case PIPE_CAP_PROGRAMMABLE_SAMPLE_LOCATIONS:
> return 0;
> +
> + default:
> + return u_pipe_screen_get_param_defaults(screen, param);
> }
> - /* should only get here on unhandled cases */
> - debug_printf("Unexpected PIPE_CAP %d query\n", param);
> - return 0;
> }
>
> static int
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index 556bd9bbbbe8..ba98155e9730 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -27,6 +27,7 @@
> #include <nouveau_drm.h>
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
>
> #include "nv_object.xml.h"
> #include "nv_m2mf.xml.h"
> @@ -256,10 +257,9 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return dev->vram_size >> 20;
> case PIPE_CAP_UMA:
> return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> -
> - debug_printf("unknown param %d\n", param);
> - return 0;
> }
>
> static float
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index cea6818bc9af..36ecb0d4e0b0 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -25,6 +25,7 @@
> #include <nouveau_drm.h>
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "pipe/p_screen.h"
>
> #include "nv50/nv50_context.h"
> @@ -310,10 +311,9 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return dev->vram_size >> 20;
> case PIPE_CAP_UMA:
> return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> -
> - NOUVEAU_ERR("unknown PIPE_CAP %d\n", param);
> - return 0;
> }
>
> static int
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index daa4edb0dcaa..0e08481286b8 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -25,6 +25,7 @@
> #include <nvif/class.h>
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "pipe/p_screen.h"
>
> #include "nouveau_vp3_video.h"
> @@ -333,10 +334,9 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return dev->vram_size >> 20;
> case PIPE_CAP_UMA:
> return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> -
> - NOUVEAU_ERR("unknown PIPE_CAP %d\n", param);
> - return 0;
> }
>
> static int
> diff --git a/src/gallium/drivers/r300/r300_screen.c
> b/src/gallium/drivers/r300/r300_screen.c
> index 046d68c0b591..ef64282cede5 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -23,6 +23,7 @@
>
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "util/u_memory.h"
> #include "util/os_time.h"
> #include "vl/vl_decoder.h"
> @@ -313,8 +314,9 @@ static int r300_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> return r300screen->info.pci_dev;
> case PIPE_CAP_PCI_FUNCTION:
> return r300screen->info.pci_func;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> - return 0;
> }
>
> static int r300_get_shader_param(struct pipe_screen *pscreen,
> diff --git a/src/gallium/drivers/r600/r600_pipe.c
> b/src/gallium/drivers/r600/r600_pipe.c
> index ffed69a081ea..23fc1b9c4986 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -32,6 +32,7 @@
> #include "pipe/p_shader_tokens.h"
> #include "util/u_debug.h"
> #include "util/u_memory.h"
> +#include "util/u_screen.h"
> #include "util/u_simple_shaders.h"
> #include "util/u_upload_mgr.h"
> #include "util/u_math.h"
> @@ -538,8 +539,9 @@ static int r600_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> return rscreen->b.info.pci_dev;
> case PIPE_CAP_PCI_FUNCTION:
> return rscreen->b.info.pci_func;
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> - return 0;
> }
>
> static int r600_get_shader_param(struct pipe_screen* pscreen,
> diff --git a/src/gallium/drivers/radeonsi/si_get.c
> b/src/gallium/drivers/radeonsi/si_get.c
> index 6e804797bab1..9834c862215e 100644
> --- a/src/gallium/drivers/radeonsi/si_get.c
> +++ b/src/gallium/drivers/radeonsi/si_get.c
> @@ -29,6 +29,7 @@
> #include "ac_llvm_util.h"
> #include "vl/vl_decoder.h"
> #include "vl/vl_video_buffer.h"
> +#include "util/u_screen.h"
> #include "util/u_video.h"
> #include "compiler/nir/nir.h"
>
> @@ -340,8 +341,10 @@ static int si_get_param(struct pipe_screen *pscreen,
> enum pipe_cap param)
> return sscreen->info.pci_dev;
> case PIPE_CAP_PCI_FUNCTION:
> return sscreen->info.pci_func;
> +
> + default:
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> - return 0;
> }
>
> static float si_get_paramf(struct pipe_screen* pscreen, enum pipe_capf param)
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c
> b/src/gallium/drivers/softpipe/sp_screen.c
> index 302bebfc3960..b8d2a23857d3 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -29,6 +29,7 @@
> #include "util/u_memory.h"
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "util/u_video.h"
> #include "os/os_misc.h"
> #include "util/os_time.h"
> @@ -327,10 +328,9 @@ softpipe_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> return 0;
> case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
> return 4;
> + default:
> + return u_pipe_screen_get_param_defaults(screen, param);
> }
> - /* should only get here on unhandled cases */
> - debug_printf("Unexpected PIPE_CAP %d query\n", param);
> - return 0;
> }
>
> static int
> diff --git a/src/gallium/drivers/svga/svga_screen.c
> b/src/gallium/drivers/svga/svga_screen.c
> index b8f936ee9673..44a50b99beff 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -27,6 +27,7 @@
> #include "util/u_format.h"
> #include "util/u_memory.h"
> #include "util/u_inlines.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
> #include "util/u_math.h"
>
> @@ -471,10 +472,9 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
> case PIPE_CAP_PACKED_UNIFORMS:
> case PIPE_CAP_PROGRAMMABLE_SAMPLE_LOCATIONS:
> return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(screen, param);
> }
> -
> - debug_printf("Unexpected PIPE_CAP_ query %u\n", param);
> - return 0;
> }
>
>
> diff --git a/src/gallium/drivers/swr/swr_screen.cpp
> b/src/gallium/drivers/swr/swr_screen.cpp
> index 084f55dab997..6238c7878b94 100644
> --- a/src/gallium/drivers/swr/swr_screen.cpp
> +++ b/src/gallium/drivers/swr/swr_screen.cpp
> @@ -35,6 +35,7 @@
> #include "util/u_inlines.h"
> #include "util/u_cpu_detect.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "util/u_string.h"
>
> #include "state_tracker/sw_winsys.h"
> @@ -378,11 +379,10 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
>
> return (int)(system_memory >> 20);
> }
> - }
>
> - /* should only get here on unhandled cases */
> - debug_printf("Unexpected PIPE_CAP %d query\n", param);
> - return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(screen, param);
> + }
> }
>
> static int
> diff --git a/src/gallium/drivers/v3d/v3d_screen.c
> b/src/gallium/drivers/v3d/v3d_screen.c
> index 28334aeba4cc..b305dac4b6c9 100644
> --- a/src/gallium/drivers/v3d/v3d_screen.c
> +++ b/src/gallium/drivers/v3d/v3d_screen.c
> @@ -31,6 +31,7 @@
> #include "util/u_memory.h"
> #include "util/u_format.h"
> #include "util/u_hash_table.h"
> +#include "util/u_screen.h"
> #include "util/ralloc.h"
>
> #include <xf86drm.h>
> @@ -323,8 +324,7 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return 1;
>
> default:
> - fprintf(stderr, "unknown param %d\n", param);
> - return 0;
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> }
>
> diff --git a/src/gallium/drivers/vc4/vc4_screen.c
> b/src/gallium/drivers/vc4/vc4_screen.c
> index 646e7fa72319..feed9a97f31b 100644
> --- a/src/gallium/drivers/vc4/vc4_screen.c
> +++ b/src/gallium/drivers/vc4/vc4_screen.c
> @@ -32,6 +32,7 @@
> #include "util/u_memory.h"
> #include "util/u_format.h"
> #include "util/u_hash_table.h"
> +#include "util/u_screen.h"
> #include "util/ralloc.h"
>
> #include <xf86drm.h>
> @@ -365,8 +366,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> return 1;
>
> default:
> - fprintf(stderr, "unknown param %d\n", param);
> - return 0;
> + return u_pipe_screen_get_param_defaults(pscreen, param);
> }
> }
>
> diff --git a/src/gallium/drivers/virgl/virgl_screen.c
> b/src/gallium/drivers/virgl/virgl_screen.c
> index 421fde5249da..daa16146c662 100644
> --- a/src/gallium/drivers/virgl/virgl_screen.c
> +++ b/src/gallium/drivers/virgl/virgl_screen.c
> @@ -23,6 +23,7 @@
> #include "util/u_memory.h"
> #include "util/u_format.h"
> #include "util/u_format_s3tc.h"
> +#include "util/u_screen.h"
> #include "util/u_video.h"
> #include "util/os_time.h"
> #include "pipe/p_defines.h"
> @@ -315,10 +316,9 @@ virgl_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> return 0;
> case PIPE_CAP_NATIVE_FENCE_FD:
> return 0;
> + default:
> + return u_pipe_screen_get_param_defaults(screen, param);
> }
> - /* should only get here on unhandled cases */
> - debug_printf("Unexpected PIPE_CAP %d query\n", param);
> - return 0;
> }
>
> static int
> --
> 2.18.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
