From b30f1327f9639c590e5cbcaa4c197900e273bc4f Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 18 Jan 2022 14:09:17 +0200 Subject: [PATCH] gallium: rename PROTECTED_CONTENT cap into PROTECTED_SURFACE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Part-of: --- docs/gallium/screen.rst | 2 +- src/gallium/auxiliary/util/u_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +- src/gallium/drivers/radeonsi/si_get.c | 2 +- src/gallium/frontends/dri/dri_query_renderer.c | 2 +- src/gallium/include/pipe/p_defines.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index d6dedd5ad50..10d30fa9852 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -613,7 +613,7 @@ The integer capabilities: * ``PIPE_CAP_NIR_ATOMICS_AS_DEREF``: Whether NIR atomics instructions should reference atomics as NIR derefs instead of by indices. * ``PIPE_CAP_NO_CLIP_ON_COPY_TEX``: Driver doesn't want x/y/width/height clipped based on src size when doing a copy texture operation (eg: may want out-of-bounds reads that produce 0 instead of leaving the texture content undefined) * ``PIPE_CAP_MAX_TEXTURE_MB``: Maximum texture size in MB (default is 1024) -* ``PIPE_CAP_DEVICE_PROTECTED_CONTENT``: Whether the device support protected / encrypted content. +* ``PIPE_CAP_DEVICE_PROTECTED_SURFACE``: Whether the device support protected / encrypted content. * ``PIPE_CAP_PREFER_REAL_BUFFER_IN_CONSTBUF0``: The state tracker is encouraged to upload constants into a real buffer and bind it into constant buffer 0 instead of binding a user pointer. This may enable a faster codepath in a gallium frontend for drivers that really prefer a real buffer. * ``PIPE_CAP_GL_CLAMP``: Driver natively supports GL_CLAMP. Required for non-NIR drivers with the GL frontend. NIR drivers with the cap unavailable will have GL_CLAMP lowered to txd/txl with a saturate on the coordinates. * ``PIPE_CAP_TEXRECT``: Driver supports rectangle textures. Required for OpenGL on `!prefers_nir` drivers. If this cap is not present, st/mesa will lower the NIR to use normal 2D texture sampling by using either `txs` or `nir_intrinsic_load_texture_scaling` to normalize the texture coordinates. diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index 7f7776a8343..05bdc9bd5be 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -225,7 +225,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: case PIPE_CAP_RESOURCE_FROM_USER_MEMORY_COMPUTE_ONLY: case PIPE_CAP_DEVICE_RESET_STATUS_QUERY: - case PIPE_CAP_DEVICE_PROTECTED_CONTENT: + case PIPE_CAP_DEVICE_PROTECTED_SURFACE: case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: case PIPE_CAP_TEXTURE_FLOAT_LINEAR: case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index a102f57baf8..8efea26757f 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -401,7 +401,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_GLSL_ZERO_INIT: case PIPE_CAP_BLEND_EQUATION_ADVANCED: case PIPE_CAP_NO_CLIP_ON_COPY_TEX: - case PIPE_CAP_DEVICE_PROTECTED_CONTENT: + case PIPE_CAP_DEVICE_PROTECTED_SURFACE: case PIPE_CAP_NIR_IMAGES_AS_DEREF: case PIPE_CAP_SAMPLER_REDUCTION_MINMAX: case PIPE_CAP_SAMPLER_REDUCTION_MINMAX_ARB: diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index cbef66ad57c..e4a30e9e674 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -423,7 +423,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_GLSL_ZERO_INIT: case PIPE_CAP_BLEND_EQUATION_ADVANCED: case PIPE_CAP_NO_CLIP_ON_COPY_TEX: - case PIPE_CAP_DEVICE_PROTECTED_CONTENT: + case PIPE_CAP_DEVICE_PROTECTED_SURFACE: case PIPE_CAP_SAMPLER_REDUCTION_MINMAX_ARB: case PIPE_CAP_DRAW_VERTEX_STATE: case PIPE_CAP_PREFER_POT_ALIGNED_VARYINGS: diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 14149daaa93..ff5292495cd 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -195,7 +195,7 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: return !SI_BIG_ENDIAN && sscreen->info.has_userptr; - case PIPE_CAP_DEVICE_PROTECTED_CONTENT: + case PIPE_CAP_DEVICE_PROTECTED_SURFACE: return sscreen->info.has_tmz_support; case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: diff --git a/src/gallium/frontends/dri/dri_query_renderer.c b/src/gallium/frontends/dri/dri_query_renderer.c index 7272337a5f4..89892062953 100644 --- a/src/gallium/frontends/dri/dri_query_renderer.c +++ b/src/gallium/frontends/dri/dri_query_renderer.c @@ -141,7 +141,7 @@ dri2_query_renderer_integer(__DRIscreen *_screen, int param, case __DRI2_RENDERER_HAS_PROTECTED_SURFACE: value[0] = screen->base.screen->get_param(screen->base.screen, - PIPE_CAP_DEVICE_PROTECTED_CONTENT); + PIPE_CAP_DEVICE_PROTECTED_SURFACE); if (!value[0]) return -1; return 0; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index b196f881731..9fd567c5c2e 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -974,7 +974,7 @@ enum pipe_cap PIPE_CAP_NO_CLIP_ON_COPY_TEX, PIPE_CAP_MAX_TEXTURE_MB, PIPE_CAP_SHADER_ATOMIC_INT64, - PIPE_CAP_DEVICE_PROTECTED_CONTENT, + PIPE_CAP_DEVICE_PROTECTED_SURFACE, PIPE_CAP_PREFER_REAL_BUFFER_IN_CONSTBUF0, PIPE_CAP_GL_CLAMP, PIPE_CAP_TEXRECT,