Module: Mesa Branch: main Commit: 350329feb1dc81aa063e0b2e9f463640a78352e6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=350329feb1dc81aa063e0b2e9f463640a78352e6
Author: Erik Faye-Lund <[email protected]> Date: Mon Mar 14 09:33:45 2022 +0100 gallium: rename sysval caps These aren't spiecic to TGSI any more, so let's rename them to reflect reality. Reviewed-by: Adam Jackson <[email protected]> Acked-by: Ian Romanick <[email protected]> Reviewed-by: Juan A. Suarez <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15316> --- docs/gallium/screen.rst | 10 +++++----- src/gallium/auxiliary/draw/draw_pipe_pstipple.c | 2 +- src/gallium/auxiliary/nir/tgsi_to_nir.c | 6 +++--- src/gallium/auxiliary/util/u_screen.c | 6 +++--- src/gallium/auxiliary/vl/vl_mc.c | 2 +- src/gallium/drivers/asahi/agx_pipe.c | 6 +++--- src/gallium/drivers/crocus/crocus_screen.c | 4 ++-- src/gallium/drivers/d3d12/d3d12_screen.cpp | 2 +- src/gallium/drivers/etnaviv/etnaviv_screen.c | 6 +++--- src/gallium/drivers/freedreno/freedreno_screen.c | 6 +++--- src/gallium/drivers/iris/iris_screen.c | 4 ++-- src/gallium/drivers/lima/lima_screen.c | 6 +++--- src/gallium/drivers/llvmpipe/lp_screen.c | 2 +- src/gallium/drivers/nouveau/nv30/nv30_screen.c | 4 ++-- src/gallium/drivers/nouveau/nv50/nv50_screen.c | 6 +++--- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 +++--- src/gallium/drivers/panfrost/pan_screen.c | 6 +++--- src/gallium/drivers/radeonsi/si_get.c | 4 ++-- src/gallium/drivers/v3d/v3d_screen.c | 2 +- src/gallium/drivers/vc4/vc4_screen.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- src/gallium/frontends/nine/nine_ff.c | 2 +- src/gallium/frontends/nine/nine_shader.c | 4 ++-- src/gallium/include/pipe/p_defines.h | 6 +++--- src/mesa/state_tracker/st_extensions.c | 6 +++--- src/mesa/state_tracker/st_pbo.c | 2 +- 26 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index d6debf90f7a..69bbdfc4d4e 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -329,11 +329,11 @@ The integer capabilities: supported in vertex shaders. * ``PIPE_CAP_SHADER_PACK_HALF_FLOAT``: Whether packed 16-bit float packing/unpacking opcodes are supported. -* ``PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL``: If gallium frontends should use - a system value for the POSITION fragment shader input. -* ``PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL``: If gallium frontends should use - a system value for the POINT fragment shader input. -* ``PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL``: If gallium frontends should use +* ``PIPE_CAP_FS_POSITION_IS_SYSVAL``: If gallium frontends should use a + system value for the POSITION fragment shader input. +* ``PIPE_CAP_FS_POINT_IS_SYSVAL``: If gallium frontends should use a system + value for the POINT fragment shader input. +* ``PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL``: If gallium frontends should use a system value for the FACE fragment shader input. Also, the FACE system value is integer, not float. * ``PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT``: Describes the required diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c index d5f757eb136..409be3ef4ed 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c +++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c @@ -133,7 +133,7 @@ generate_pstip_fs(struct pstip_stage *pstip) struct pipe_shader_state pstip_fs; enum tgsi_file_type wincoord_file; - wincoord_file = screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL) ? + wincoord_file = screen->get_param(screen, PIPE_CAP_FS_POSITION_IS_SYSVAL) ? TGSI_FILE_SYSTEM_VALUE : TGSI_FILE_INPUT; pstip_fs = *orig_fs; /* copy to init */ diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 0aa045e09b6..3823089719e 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -2273,9 +2273,9 @@ ttn_read_pipe_caps(struct ttn_compile *c, struct pipe_screen *screen) { c->cap_samplers_as_deref = screen->get_param(screen, PIPE_CAP_NIR_SAMPLERS_AS_DEREF); - c->cap_face_is_sysval = screen->get_param(screen, PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL); - c->cap_position_is_sysval = screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL); - c->cap_point_is_sysval = screen->get_param(screen, PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL); + c->cap_face_is_sysval = screen->get_param(screen, PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL); + c->cap_position_is_sysval = screen->get_param(screen, PIPE_CAP_FS_POSITION_IS_SYSVAL); + c->cap_point_is_sysval = screen->get_param(screen, PIPE_CAP_FS_POINT_IS_SYSVAL); } /** diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index cdc45109b44..f790273692e 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -249,9 +249,9 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_SHADER_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_POINT_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 0; case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: diff --git a/src/gallium/auxiliary/vl/vl_mc.c b/src/gallium/auxiliary/vl/vl_mc.c index d331da1d5fa..74fecc78ce7 100644 --- a/src/gallium/auxiliary/vl/vl_mc.c +++ b/src/gallium/auxiliary/vl/vl_mc.c @@ -86,7 +86,7 @@ calc_line(struct pipe_screen *screen, struct ureg_program *shader) tmp = ureg_DECL_temporary(shader); - if (screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL)) + if (screen->get_param(screen, PIPE_CAP_FS_POSITION_IS_SYSVAL)) pos = ureg_DECL_system_value(shader, TGSI_SEMANTIC_POSITION, 0); else pos = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_POSITION, VS_O_VPOS, diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index 024900a6901..cde7805483c 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -786,12 +786,12 @@ agx_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_FS_COORD_PIXEL_CENTER_HALF_INTEGER: case PIPE_CAP_FS_COORD_PIXEL_CENTER_INTEGER: case PIPE_CAP_TGSI_TEXCOORD: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: case PIPE_CAP_SEAMLESS_CUBE_MAP: case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: return true; - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: return false; case PIPE_CAP_MAX_VERTEX_ELEMENT_SRC_OFFSET: diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index 158e370389f..6360e2b995a 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -189,8 +189,8 @@ crocus_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_ARRAY_COMPONENTS: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: case PIPE_CAP_NIR_COMPACT_ARRAYS: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: case PIPE_CAP_CS_DERIVED_SYSTEM_VALUES_SUPPORTED: diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index 0c3b9114edf..21d64ba6154 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -223,7 +223,7 @@ d3d12_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FS_COORD_ORIGIN_UPPER_LEFT: return 1; - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 1; case PIPE_CAP_ACCELERATED: diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 2802bc9de91..3e803c8a2bd 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -158,10 +158,10 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_NATIVE_FENCE_FD: return screen->drm_version >= ETNA_DRM_VERSION_FENCE_FD; - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: /* note: not integer */ + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: /* note: not integer */ return 1; - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: return 0; /* Memory */ diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index 9d4617009f3..3edc026df91 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -451,14 +451,14 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 0; case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: case PIPE_CAP_TGSI_TEXCOORD: if (is_ir3(screen)) return 1; return 0; - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 1; - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: return is_a2xx(screen); case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index e04a08df33e..a767149790a 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -233,8 +233,8 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_LOAD_CONSTBUF: case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_DRAW_PARAMETERS: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_COMPUTE_SHADER_DERIVATIVES: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: diff --git a/src/gallium/drivers/lima/lima_screen.c b/src/gallium/drivers/lima/lima_screen.c index a93753084b9..6215b2bc7e9 100644 --- a/src/gallium/drivers/lima/lima_screen.c +++ b/src/gallium/drivers/lima/lima_screen.c @@ -119,9 +119,9 @@ lima_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FS_COORD_PIXEL_CENTER_HALF_INTEGER: return 1; - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 1; case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 0390707cdfb..a00fb6627ba 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -345,7 +345,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return LP_MAX_TGSI_SHADER_BUFFER_SIZE; case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: case PIPE_CAP_TGSI_TG4_COMPONENT_IN_SWIZZLE: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: case PIPE_CAP_IMAGE_STORE_FORMATTED: return 1; diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index e9773234a68..7df2b9b4ee8 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -193,8 +193,8 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_SHADER_PACK_HALF_FLOAT: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_GENERATE_MIPMAP: diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 2b35afa0c64..c173708ee4d 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -242,7 +242,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_TXQS: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_CLEAR_TEXTURE: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_STRING_MARKER: case PIPE_CAP_CULL_DISTANCE: @@ -313,8 +313,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_SHADER_PACK_HALF_FLOAT: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: case PIPE_CAP_GENERATE_MIPMAP: case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index a586aa8b2ff..3050d896bba 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -278,7 +278,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_PACK_HALF_FLOAT: case PIPE_CAP_MULTI_DRAW_INDIRECT: case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_QUERY_BUFFER_OBJECT: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_STRING_MARKER: @@ -372,8 +372,8 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: case PIPE_CAP_VERTEXID_NOBASE: case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: case PIPE_CAP_GENERATE_MIPMAP: case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index eb635cb5a2e..c1a696b71aa 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -234,9 +234,9 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; /* We would prefer varyings on Midgard, but proper sysvals on Bifrost */ - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_POINT_IS_SYSVAL: return dev->arch >= 6; case PIPE_CAP_SEAMLESS_CUBE_MAP: diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index a9da503c9d4..579f0f887d9 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -113,8 +113,8 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_TXQS: case PIPE_CAP_FORCE_PERSAMPLE_INTERP: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_POSITION_IS_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: case PIPE_CAP_QUERY_BUFFER_OBJECT: diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c index 78191bba551..4379a50a323 100644 --- a/src/gallium/drivers/v3d/v3d_screen.c +++ b/src/gallium/drivers/v3d/v3d_screen.c @@ -136,7 +136,7 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_PACK_HALF_FLOAT: case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_TGSI_TEXCOORD: case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE: case PIPE_CAP_SAMPLER_VIEW_TARGET: diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c index 0004960aa50..5a85fedc439 100644 --- a/src/gallium/drivers/vc4/vc4_screen.c +++ b/src/gallium/drivers/vc4/vc4_screen.c @@ -163,7 +163,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FS_COORD_ORIGIN_UPPER_LEFT: case PIPE_CAP_FS_COORD_PIXEL_CENTER_HALF_INTEGER: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 1; case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES: diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 7b5e72116b5..9ba3e95c2db 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -710,7 +710,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_NIR_COMPACT_ARRAYS: return 1; - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: + case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: return 1; case PIPE_CAP_VIEWPORT_TRANSFORM_LOWERED: diff --git a/src/gallium/frontends/nine/nine_ff.c b/src/gallium/frontends/nine/nine_ff.c index 56e2f5aa173..6c9f896ad21 100644 --- a/src/gallium/frontends/nine/nine_ff.c +++ b/src/gallium/frontends/nine/nine_ff.c @@ -1510,7 +1510,7 @@ nine_ff_build_ps(struct NineDevice9 *device, struct nine_ff_ps_key *key) struct ureg_dst rFog = ureg_writemask(ps.rTmp, TGSI_WRITEMASK_X); struct ureg_src vPos; if (device->screen->get_param(device->screen, - PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL)) { + PIPE_CAP_FS_POSITION_IS_SYSVAL)) { vPos = ureg_DECL_system_value(ureg, TGSI_SEMANTIC_POSITION, 0); } else { vPos = ureg_DECL_fs_input(ureg, TGSI_SEMANTIC_POSITION, 0, diff --git a/src/gallium/frontends/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c index aa63ea25e29..f8ac83e45d5 100644 --- a/src/gallium/frontends/nine/nine_shader.c +++ b/src/gallium/frontends/nine/nine_shader.c @@ -3627,8 +3627,8 @@ tx_ctor(struct shader_translator *tx, struct pipe_screen *screen, struct nine_sh tx->shift_wpos = !GET_CAP(FS_COORD_PIXEL_CENTER_INTEGER); tx->texcoord_sn = tx->want_texcoord ? TGSI_SEMANTIC_TEXCOORD : TGSI_SEMANTIC_GENERIC; - tx->wpos_is_sysval = GET_CAP(TGSI_FS_POSITION_IS_SYSVAL); - tx->face_is_sysval_integer = GET_CAP(TGSI_FS_FACE_IS_INTEGER_SYSVAL); + tx->wpos_is_sysval = GET_CAP(FS_POSITION_IS_SYSVAL); + tx->face_is_sysval_integer = GET_CAP(FS_FACE_IS_INTEGER_SYSVAL); if (IS_VS) { tx->num_constf_allowed = NINE_MAX_CONST_F; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 61af45d558f..27316aef6b0 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -859,9 +859,9 @@ enum pipe_cap PIPE_CAP_SHADER_PACK_HALF_FLOAT, PIPE_CAP_MULTI_DRAW_INDIRECT, PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS, - PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL, - PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL, - PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL, + PIPE_CAP_FS_POSITION_IS_SYSVAL, + PIPE_CAP_FS_POINT_IS_SYSVAL, + PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL, PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT, PIPE_CAP_INVALIDATE_BUFFER, PIPE_CAP_GENERATE_MIPMAP, diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index a766c02f5ec..6f2fe1eb74e 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -505,11 +505,11 @@ void st_init_limits(struct pipe_screen *screen, } c->GLSLFragCoordIsSysVal = - screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL); + screen->get_param(screen, PIPE_CAP_FS_POSITION_IS_SYSVAL); c->GLSLPointCoordIsSysVal = - screen->get_param(screen, PIPE_CAP_TGSI_FS_POINT_IS_SYSVAL); + screen->get_param(screen, PIPE_CAP_FS_POINT_IS_SYSVAL); c->GLSLFrontFacingIsSysVal = - screen->get_param(screen, PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL); + screen->get_param(screen, PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL); /* GL_ARB_get_program_binary */ if (screen->get_disk_shader_cache && screen->get_disk_shader_cache(screen)) diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c index 09ca41b4940..f32578405f9 100644 --- a/src/mesa/state_tracker/st_pbo.c +++ b/src/mesa/state_tracker/st_pbo.c @@ -414,7 +414,7 @@ create_fs(struct st_context *st, bool download, const nir_shader_compiler_options *options = st_get_nir_compiler_options(st, MESA_SHADER_FRAGMENT); bool pos_is_sysval = - screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL); + screen->get_param(screen, PIPE_CAP_FS_POSITION_IS_SYSVAL); nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options, download ?
