[Mesa-dev] [PATCH 01/17] gallium: Add PIPE_CAP_MSAA_MODES
Bas Nieuwenhuizen
bas at basnieuwenhuizen.nl
Sat Mar 19 15:14:52 UTC 2016
That would limit us to supporting sample counts for which we have
texture formats.
As far as I understand with radeonsi we can support 16 samples without
any attachments, but all formats are limited to <= 8 samples.
- Bas
On Sat, Mar 19, 2016 at 3:00 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Why not derive this information from is_format_supported with rgba8 format?
> Seems like that would do the trick. Look at how the st already does
> something similar in st_extensions.c iirc.
>
> Your scheme only enables power-of-two msaa levels, and is redundant wrt the
> function I mentioned earlier...
>
> As I said to you on a number of previous occasions, the "no attachments" cap
> should just be a boolean.
>
> -ilia
>
> On Mar 19, 2016 2:42 AM, "Edward O'Callaghan" <eocallaghan at alterapraxis.com>
> wrote:
>>
>> Add PIPE_CAP to determine the MSAA modes the hardware
>> supports so that values requested from the application
>> using GL_ARB_framebuffer_no_attachments may be quantized
>> to what the hardware expects.
>>
>> V.2:
>> Fix doc for a more detailed description of the PIPE_CAP
>> and the corresponding GL constant.
>>
>> Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
>> ---
>> src/gallium/docs/source/screen.rst | 7 +++++++
>> src/gallium/drivers/freedreno/freedreno_screen.c | 1 +
>> src/gallium/drivers/i915/i915_screen.c | 1 +
>> src/gallium/drivers/ilo/ilo_screen.c | 1 +
>> src/gallium/drivers/llvmpipe/lp_screen.c | 1 +
>> src/gallium/drivers/nouveau/nv30/nv30_screen.c | 1 +
>> src/gallium/drivers/nouveau/nv50/nv50_screen.c | 1 +
>> src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 1 +
>> src/gallium/drivers/r300/r300_screen.c | 1 +
>> src/gallium/drivers/r600/r600_pipe.c | 1 +
>> src/gallium/drivers/radeonsi/si_pipe.c | 1 +
>> src/gallium/drivers/softpipe/sp_screen.c | 1 +
>> src/gallium/drivers/svga/svga_screen.c | 1 +
>> src/gallium/drivers/vc4/vc4_screen.c | 1 +
>> src/gallium/drivers/virgl/virgl_screen.c | 1 +
>> src/gallium/include/pipe/p_defines.h | 1 +
>> src/mesa/state_tracker/st_extensions.c | 1 +
>> 17 files changed, 23 insertions(+)
>>
>> diff --git a/src/gallium/docs/source/screen.rst
>> b/src/gallium/docs/source/screen.rst
>> index 46ec381..d3d8dc4 100644
>> --- a/src/gallium/docs/source/screen.rst
>> +++ b/src/gallium/docs/source/screen.rst
>> @@ -323,6 +323,13 @@ The integer capabilities:
>> * ``PIPE_CAP_PCI_BUS``: Return the PCI bus number.
>> * ``PIPE_CAP_PCI_DEVICE``: Return the PCI device number.
>> * ``PIPE_CAP_PCI_FUNCTION``: Return the PCI function number.
>> +* ``PIPE_CAP_MSAA_MODES``:
>> + A bitmask of the supported MSAA modes the hardware supports. e.g.,
>> + (1 << 5) | .. | (1 << 1). If non-zero, rendering to framebuffers with
>> no
>> + surface attachments is supported. N.B., The maximum number of layers
>> + supported for rasterizing a primitive on a layer is obtained from
>> + ``PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS`` even though it can be larger than
>> + the number of layers supported by either rendering or textures.
>>
>>
>> .. _pipe_capf:
>> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c
>> b/src/gallium/drivers/freedreno/freedreno_screen.c
>> index d47cb07..8b6ebe8 100644
>> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
>> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
>> @@ -255,6 +255,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum
>> pipe_cap param)
>> case PIPE_CAP_INVALIDATE_BUFFER:
>> case PIPE_CAP_GENERATE_MIPMAP:
>> case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_MAX_VIEWPORTS:
>> diff --git a/src/gallium/drivers/i915/i915_screen.c
>> b/src/gallium/drivers/i915/i915_screen.c
>> index f4aa310..02457c5 100644
>> --- a/src/gallium/drivers/i915/i915_screen.c
>> +++ b/src/gallium/drivers/i915/i915_screen.c
>> @@ -269,6 +269,7 @@ i915_get_param(struct pipe_screen *screen, enum
>> pipe_cap cap)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
>> diff --git a/src/gallium/drivers/ilo/ilo_screen.c
>> b/src/gallium/drivers/ilo/ilo_screen.c
>> index 548d215..49fe658 100644
>> --- a/src/gallium/drivers/ilo/ilo_screen.c
>> +++ b/src/gallium/drivers/ilo/ilo_screen.c
>> @@ -497,6 +497,7 @@ ilo_get_param(struct pipe_screen *screen, enum
>> pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_VENDOR_ID:
>> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c
>> b/src/gallium/drivers/llvmpipe/lp_screen.c
>> index 2529b54..db3eff7 100644
>> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
>> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
>> @@ -319,6 +319,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum
>> pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>> }
>> /* should only get here on unhandled cases */
>> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
>> b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
>> index b105c6a..4fcadb8 100644
>> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
>> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
>> @@ -192,6 +192,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_VENDOR_ID:
>> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>> b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>> index 5836bb2..6c8e930 100644
>> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>> @@ -236,6 +236,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_VENDOR_ID:
>> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> index 3c5b1da..910143f 100644
>> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> @@ -229,6 +229,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_VENDOR_ID:
>> diff --git a/src/gallium/drivers/r300/r300_screen.c
>> b/src/gallium/drivers/r300/r300_screen.c
>> index 1c3bb64..5ca49b2 100644
>> --- a/src/gallium/drivers/r300/r300_screen.c
>> +++ b/src/gallium/drivers/r300/r300_screen.c
>> @@ -214,6 +214,7 @@ static int r300_get_param(struct pipe_screen* pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
>> case PIPE_CAP_QUERY_BUFFER_OBJECT:
>> case PIPE_CAP_QUERY_MEMORY_INFO:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> /* SWTCL-only features. */
>> diff --git a/src/gallium/drivers/r600/r600_pipe.c
>> b/src/gallium/drivers/r600/r600_pipe.c
>> index 7018088..0d22faa 100644
>> --- a/src/gallium/drivers/r600/r600_pipe.c
>> +++ b/src/gallium/drivers/r600/r600_pipe.c
>> @@ -369,6 +369,7 @@ static int r600_get_param(struct pipe_screen* pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_GENERATE_MIPMAP:
>> case PIPE_CAP_STRING_MARKER:
>> case PIPE_CAP_QUERY_BUFFER_OBJECT:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
>> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c
>> b/src/gallium/drivers/radeonsi/si_pipe.c
>> index 8b50a49..46fa592 100644
>> --- a/src/gallium/drivers/radeonsi/si_pipe.c
>> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
>> @@ -357,6 +357,7 @@ static int si_get_param(struct pipe_screen* pscreen,
>> enum pipe_cap param)
>> case PIPE_CAP_GENERATE_MIPMAP:
>> case PIPE_CAP_STRING_MARKER:
>> case PIPE_CAP_QUERY_BUFFER_OBJECT:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
>> diff --git a/src/gallium/drivers/softpipe/sp_screen.c
>> b/src/gallium/drivers/softpipe/sp_screen.c
>> index bfd3598..eec449a 100644
>> --- a/src/gallium/drivers/softpipe/sp_screen.c
>> +++ b/src/gallium/drivers/softpipe/sp_screen.c
>> @@ -270,6 +270,7 @@ softpipe_get_param(struct pipe_screen *screen, enum
>> pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>> }
>> /* should only get here on unhandled cases */
>> diff --git a/src/gallium/drivers/svga/svga_screen.c
>> b/src/gallium/drivers/svga/svga_screen.c
>> index bcc5120..2c89830 100644
>> --- a/src/gallium/drivers/svga/svga_screen.c
>> +++ b/src/gallium/drivers/svga/svga_screen.c
>> @@ -404,6 +404,7 @@ svga_get_param(struct pipe_screen *screen, enum
>> pipe_cap param)
>> case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
>> case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
>> case PIPE_CAP_QUERY_BUFFER_OBJECT:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>> }
>>
>> diff --git a/src/gallium/drivers/vc4/vc4_screen.c
>> b/src/gallium/drivers/vc4/vc4_screen.c
>> index 92d910b..801e9ba 100644
>> --- a/src/gallium/drivers/vc4/vc4_screen.c
>> +++ b/src/gallium/drivers/vc4/vc4_screen.c
>> @@ -207,6 +207,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum
>> pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>>
>> /* Stream output. */
>> diff --git a/src/gallium/drivers/virgl/virgl_screen.c
>> b/src/gallium/drivers/virgl/virgl_screen.c
>> index 8126bde..4ee0890 100644
>> --- a/src/gallium/drivers/virgl/virgl_screen.c
>> +++ b/src/gallium/drivers/virgl/virgl_screen.c
>> @@ -239,6 +239,7 @@ virgl_get_param(struct pipe_screen *screen, enum
>> pipe_cap param)
>> case PIPE_CAP_PCI_BUS:
>> case PIPE_CAP_PCI_DEVICE:
>> case PIPE_CAP_PCI_FUNCTION:
>> + case PIPE_CAP_MSAA_MODES:
>> return 0;
>> case PIPE_CAP_VENDOR_ID:
>> return 0x1af4;
>> diff --git a/src/gallium/include/pipe/p_defines.h
>> b/src/gallium/include/pipe/p_defines.h
>> index bdd76ab..bafc7b1 100644
>> --- a/src/gallium/include/pipe/p_defines.h
>> +++ b/src/gallium/include/pipe/p_defines.h
>> @@ -681,6 +681,7 @@ enum pipe_cap
>> PIPE_CAP_PCI_BUS,
>> PIPE_CAP_PCI_DEVICE,
>> PIPE_CAP_PCI_FUNCTION,
>> + PIPE_CAP_MSAA_MODES,
>> };
>>
>> #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)
>> diff --git a/src/mesa/state_tracker/st_extensions.c
>> b/src/mesa/state_tracker/st_extensions.c
>> index 3666ece..275fe55 100644
>> --- a/src/mesa/state_tracker/st_extensions.c
>> +++ b/src/mesa/state_tracker/st_extensions.c
>> @@ -565,6 +565,7 @@ void st_init_extensions(struct pipe_screen *screen,
>> { o(ARB_fragment_program_shadow), PIPE_CAP_TEXTURE_SHADOW_MAP
>> },
>> { o(ARB_framebuffer_object),
>> PIPE_CAP_MIXED_FRAMEBUFFER_SIZES },
>> { o(ARB_indirect_parameters),
>> PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS },
>> + { o(ARB_framebuffer_no_attachments), PIPE_CAP_MSAA_MODES
>> },
>> { o(ARB_instanced_arrays),
>> PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR },
>> { o(ARB_occlusion_query), PIPE_CAP_OCCLUSION_QUERY
>> },
>> { o(ARB_occlusion_query2), PIPE_CAP_OCCLUSION_QUERY
>> },
>> --
>> 2.5.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
More information about the mesa-dev
mailing list