[Mesa-dev] Mesa (master): util: Add small caps checker helper
Keith Whitwell
keithw at vmware.com
Thu Apr 29 09:11:23 PDT 2010
Jakob,
A couple of these are a bit misleading - DX10 & DX11 aren't fully
supportable without further changes & extensions to gallium, so it seems
misleading to have these ever return true - at least until those changes
are done.
Would it make sense to have a UTIL_CHECK_NONIMPLEMENTED or similar that
always fails, which we can remove once proper support is in gallium?
Keith
On Thu, 2010-04-29 at 09:02 -0700, Jakob Bornecrantz wrote:
> Module: Mesa
> Branch: master
> Commit: 110a956a645f900e100062fbbe19c5835f9b5476
> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=110a956a645f900e100062fbbe19c5835f9b5476
>
> Author: Jakob Bornecrantz <jakob at vmware.com>
> Date: Thu Apr 29 16:20:14 2010 +0100
>
> util: Add small caps checker helper
>
> ---
>
> src/gallium/auxiliary/Makefile | 1 +
> src/gallium/auxiliary/SConscript | 1 +
> src/gallium/auxiliary/util/u_caps.c | 206 +++++++++++++++++++++++++++++++++++
> src/gallium/auxiliary/util/u_caps.h | 63 +++++++++++
> 4 files changed, 271 insertions(+), 0 deletions(-)
>
> diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
> index f8e65cf..2daed38 100644
> --- a/src/gallium/auxiliary/Makefile
> +++ b/src/gallium/auxiliary/Makefile
> @@ -101,6 +101,7 @@ C_SOURCES = \
> util/u_blit.c \
> util/u_blitter.c \
> util/u_cache.c \
> + util/u_caps.c \
> util/u_cpu_detect.c \
> util/u_dl.c \
> util/u_draw_quad.c \
> diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
> index db3a1e7..a0673df 100644
> --- a/src/gallium/auxiliary/SConscript
> +++ b/src/gallium/auxiliary/SConscript
> @@ -144,6 +144,7 @@ source = [
> 'util/u_blit.c',
> 'util/u_blitter.c',
> 'util/u_cache.c',
> + 'util/u_caps.c',
> 'util/u_cpu_detect.c',
> 'util/u_debug.c',
> 'util/u_debug_memory.c',
> diff --git a/src/gallium/auxiliary/util/u_caps.c b/src/gallium/auxiliary/util/u_caps.c
> new file mode 100644
> index 0000000..ba3490d
> --- /dev/null
> +++ b/src/gallium/auxiliary/util/u_caps.c
> @@ -0,0 +1,206 @@
> +/**************************************************************************
> + *
> + * Copyright 2010 Vmware, Inc.
> + * All Rights Reserved.
> + *
> + * 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, sub license, 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 NON-INFRINGEMENT.
> + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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_format.h"
> +#include "util/u_debug.h"
> +#include "u_caps.h"
> +
> +boolean
> +util_check_caps_out(struct pipe_screen *screen, unsigned *list, int *out)
> +{
> + int i, tmpi;
> + float tmpf;
> +
> + for (i = 0; list[i];) {
> + switch(list[i++]) {
> + case UTIL_CAPS_CHECK_CAP:
> + if (!screen->get_param(screen, list[i++])) {
> + *out = i - 2;
> + return FALSE;
> + }
> + break;
> + case UTIL_CAPS_CHECK_INT:
> + tmpi = screen->get_param(screen, list[i++]);
> + if (tmpi < (int)list[i++]) {
> + *out = i - 3;
> + return FALSE;
> + }
> + break;
> + case UTIL_CAPS_CHECK_FLOAT:
> + tmpf = screen->get_paramf(screen, list[i++]);
> + if (tmpf < (float)list[i++]) {
> + *out = i - 3;
> + return FALSE;
> + }
> + break;
> + case UTIL_CAPS_CHECK_FORMAT:
> + if (!screen->is_format_supported(screen,
> + list[i++],
> + PIPE_TEXTURE_2D,
> + PIPE_BIND_SAMPLER_VIEW,
> + 0)) {
> + *out = i - 2;
> + return FALSE;
> + }
> + break;
> + default:
> + assert(!"Unsupported check");
> + return FALSE;
> + }
> + }
> + return TRUE;
> +}
> +
> +boolean
> +util_check_caps(struct pipe_screen *screen, unsigned *list)
> +{
> + int out;
> + return util_check_caps_out(screen, list, &out);
> +}
> +
> +/* DX 9_1 */
> +static unsigned caps_dx_9_1[] = {
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 1),
> + UTIL_CHECK_INT(MAX_TEXTURE_2D_LEVELS, 12), /* 2048 */
> + UTIL_CHECK_INT(MAX_TEXTURE_3D_LEVELS, 9), /* 256 */
> + UTIL_CHECK_INT(MAX_TEXTURE_CUBE_LEVELS, 10), /* 512 */
> + UTIL_CHECK_FLOAT(MAX_TEXTURE_ANISOTROPY, 2),
> + UTIL_CHECK_TERMINATE
> +};
> +
> +/* DX 9_2 */
> +static unsigned caps_dx_9_2[] = {
> + UTIL_CHECK_CAP(OCCLUSION_QUERY),
> + UTIL_CHECK_CAP(BLEND_EQUATION_SEPARATE),
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 1),
> + UTIL_CHECK_INT(MAX_TEXTURE_2D_LEVELS, 12), /* 2048 */
> + UTIL_CHECK_INT(MAX_TEXTURE_3D_LEVELS, 9), /* 256 */
> + UTIL_CHECK_INT(MAX_TEXTURE_CUBE_LEVELS, 10), /* 512 */
> + UTIL_CHECK_FLOAT(MAX_TEXTURE_ANISOTROPY, 16),
> + UTIL_CHECK_TERMINATE
> +};
> +
> +/* DX 9_3 */
> +static unsigned caps_dx_9_3[] = {
> + UTIL_CHECK_CAP(SM3),
> + //UTIL_CHECK_CAP(INSTANCING),
> + UTIL_CHECK_CAP(OCCLUSION_QUERY),
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 4),
> + UTIL_CHECK_INT(MAX_TEXTURE_2D_LEVELS, 13), /* 4096 */
> + UTIL_CHECK_INT(MAX_TEXTURE_3D_LEVELS, 9), /* 256 */
> + UTIL_CHECK_INT(MAX_TEXTURE_CUBE_LEVELS, 10), /* 512 */
> + UTIL_CHECK_FLOAT(MAX_TEXTURE_ANISOTROPY, 16),
> + UTIL_CHECK_TERMINATE
> +};
> +
> +/* DX 10 */
> +static unsigned caps_dx_10[] = {
> + UTIL_CHECK_CAP(SM3),
> + //UTIL_CHECK_CAP(INSTANCING),
> + UTIL_CHECK_CAP(OCCLUSION_QUERY),
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 8),
> + UTIL_CHECK_INT(MAX_TEXTURE_2D_LEVELS, 14), /* 8192 */
> + UTIL_CHECK_INT(MAX_TEXTURE_3D_LEVELS, 12), /* 2048 */
> + UTIL_CHECK_INT(MAX_TEXTURE_CUBE_LEVELS, 14), /* 8192 */
> + UTIL_CHECK_FLOAT(MAX_TEXTURE_ANISOTROPY, 16),
> + UTIL_CHECK_TERMINATE
> +};
> +
> +/* DX 11 */
> +static unsigned caps_dx_11[] = {
> + UTIL_CHECK_CAP(SM3),
> + //UTIL_CHECK_CAP(INSTANCING),
> + UTIL_CHECK_CAP(OCCLUSION_QUERY),
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 8),
> + UTIL_CHECK_INT(MAX_TEXTURE_2D_LEVELS, 14), /* 16384 */
> + UTIL_CHECK_INT(MAX_TEXTURE_3D_LEVELS, 12), /* 2048 */
> + UTIL_CHECK_INT(MAX_TEXTURE_CUBE_LEVELS, 14), /* 16384 */
> + UTIL_CHECK_FLOAT(MAX_TEXTURE_ANISOTROPY, 16),
> + UTIL_CHECK_FORMAT(B8G8R8A8_UNORM),
> + UTIL_CHECK_TERMINATE
> +};
> +
> +/* OpenGL 2.1 */
> +static unsigned caps_opengl_2_1[] = {
> + UTIL_CHECK_CAP(GLSL),
> + UTIL_CHECK_CAP(OCCLUSION_QUERY),
> + UTIL_CHECK_CAP(TWO_SIDED_STENCIL),
> + UTIL_CHECK_CAP(BLEND_EQUATION_SEPARATE),
> + UTIL_CHECK_INT(MAX_RENDER_TARGETS, 2), /* XXX 4? */
> + UTIL_CHECK_TERMINATE
> +};
> +
> +void util_caps_print_debug(struct pipe_screen *screen)
> +{
> + struct {
> + char* name;
> + unsigned *list;
> + } list[] = {
> + {"DX 9.1", caps_dx_9_1},
> + {"DX 9.2", caps_dx_9_2},
> + {"DX 9.3", caps_dx_9_3},
> + {"DX 10", caps_dx_10},
> + {"DX 11", caps_dx_11},
> + {"OpenGL 2.1", caps_opengl_2_1},
> + {NULL, NULL}
> + };
> + int i, out = 0;
> +
> + for (i = 0; list[i].name; i++) {
> + if (util_check_caps_out(screen, list[i].list, &out)) {
> + debug_printf("%s: %s yes\n", __func__, list[i].name);
> + continue;
> + }
> + switch (list[i].list[out]) {
> + case UTIL_CAPS_CHECK_CAP:
> + debug_printf("%s: %s no (cap %u not supported)\n", __func__,
> + list[i].name,
> + list[i].list[out + 1]);
> + break;
> + case UTIL_CAPS_CHECK_INT:
> + debug_printf("%s: %s no (cap %u less then %u)\n", __func__,
> + list[i].name,
> + list[i].list[out + 1],
> + list[i].list[out + 2]);
> + break;
> + case UTIL_CAPS_CHECK_FLOAT:
> + debug_printf("%s: %s no (cap %u less then %f)\n", __func__,
> + list[i].name,
> + list[i].list[out + 1],
> + (double)(int)list[i].list[out + 2]);
> + break;
> + case UTIL_CAPS_CHECK_FORMAT:
> + debug_printf("%s: %s no (format %s not supported)\n", __func__,
> + list[i].name,
> + util_format_name(list[i].list[out + 1]) + 12);
> + break;
> + default:
> + assert(!"Unsupported check");
> + }
> + }
> +}
> diff --git a/src/gallium/auxiliary/util/u_caps.h b/src/gallium/auxiliary/util/u_caps.h
> new file mode 100644
> index 0000000..649af8e
> --- /dev/null
> +++ b/src/gallium/auxiliary/util/u_caps.h
> @@ -0,0 +1,63 @@
> +/**************************************************************************
> + *
> + * Copyright 2010 Vmware, Inc.
> + * All Rights Reserved.
> + *
> + * 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, sub license, 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 NON-INFRINGEMENT.
> + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
> + *
> + **************************************************************************/
> +
> +#ifndef U_CAPS_H
> +#define U_CAPS_H
> +
> +#include "pipe/p_compiler.h"
> +
> +struct pipe_screen;
> +
> +enum u_caps_check_enum {
> + UTIL_CAPS_CHECK_TERMINATE = 0,
> + UTIL_CAPS_CHECK_CAP,
> + UTIL_CAPS_CHECK_INT,
> + UTIL_CAPS_CHECK_FLOAT,
> + UTIL_CAPS_CHECK_FORMAT,
> +};
> +
> +#define UTIL_CHECK_CAP(cap) \
> + UTIL_CAPS_CHECK_CAP, PIPE_CAP_##cap
> +
> +#define UTIL_CHECK_INT(cap, higher) \
> + UTIL_CAPS_CHECK_INT, PIPE_CAP_##cap, (unsigned)(higher)
> +
> +/* Floats currently lose precision */
> +#define UTIL_CHECK_FLOAT(cap, higher) \
> + UTIL_CAPS_CHECK_FLOAT, PIPE_CAP_##cap, (unsigned)(int)(higher)
> +
> +#define UTIL_CHECK_FORMAT(format) \
> + UTIL_CAPS_CHECK_FORMAT, PIPE_FORMAT_##format
> +
> +#define UTIL_CHECK_TERMINATE \
> + UTIL_CAPS_CHECK_TERMINATE
> +
> +boolean util_check_caps(struct pipe_screen *screen, unsigned *list);
> +boolean util_check_caps_out(struct pipe_screen *screen, unsigned *list, int *out);
> +void util_caps_print_debug(struct pipe_screen *screen);
> +
> +#endif
>
> _______________________________________________
> mesa-commit mailing list
> mesa-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-commit
More information about the mesa-dev
mailing list