diff --git a/docs/features.txt b/docs/features.txt index 2ea9a56316d..894b7aceca4 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -196,7 +196,7 @@ GL 4.4, GLSL 4.40 -- all DONE: freedreno/a6xx, nvc0, r600, radeonsi, llvmpipe, v GL_MAX_VERTEX_ATTRIB_STRIDE DONE (all drivers) GL_ARB_buffer_storage DONE (freedreno, nv50, v3d, vc4, lima, panfrost, asahi, d3d12, softpipe, etnaviv, crocus) - GL_ARB_clear_texture DONE (freedreno/a6xx, nv50, softpipe, crocus) + GL_ARB_clear_texture DONE (all drivers) GL_ARB_enhanced_layouts DONE (freedreno/a3xx+, nv50, softpipe, crocus) - compile-time constant expressions DONE - explicit byte offsets for blocks DONE diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index 728e0e95b4c..581ea8278d8 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -324,8 +324,6 @@ The integer capabilities: * ``PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS``: Whether copying between compressed and plain formats is supported where a compressed block is copied to/from a plain pixel of the same size. -* ``PIPE_CAP_CLEAR_TEXTURE``: Whether ``clear_texture`` will be - available in contexts. * ``PIPE_CAP_CLEAR_SCISSORED``: Whether ``clear`` can accept a scissored bounding box. * ``PIPE_CAP_DRAW_PARAMETERS``: Whether ``TGSI_SEMANTIC_BASEVERTEX``, diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index 9c3dcb59b31..40218d26205 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -272,7 +272,6 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, return 1; case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_CLEAR_SCISSORED: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_SHADER_PACK_HALF_FLOAT: diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index 2082f3281fd..3473a1723d6 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -178,7 +178,6 @@ crocus_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_POLYGON_OFFSET_CLAMP: case PIPE_CAP_TGSI_TEX_TXF_LZ: case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_VS_WINDOW_SPACE_POSITION: case PIPE_CAP_TEXTURE_GATHER_SM5: diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index d6ae872d617..de4b9606dff 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -215,7 +215,6 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_MULTI_DRAW_INDIRECT: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index b3d16a23419..079e2b0b9d0 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -272,7 +272,6 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_CLOCK: case PIPE_CAP_SHADER_BALLOT: case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_CLEAR_SCISSORED: case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_VS_WINDOW_SPACE_POSITION: diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 3b7f579a9b1..c5e83895550 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -297,8 +297,6 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: return 1; - case PIPE_CAP_CLEAR_TEXTURE: - return 1; case PIPE_CAP_MAX_VARYINGS: return 32; case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index c65dc50e77c..eff6df65c77 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -190,7 +190,6 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FORCE_PERSAMPLE_INTERP: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_SHAREABLE_SHADERS: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_SHADER_PACK_HALF_FLOAT: case PIPE_CAP_FS_POSITION_IS_SYSVAL: diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 7a1e12a9cd3..5cdac587320 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -237,7 +237,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_DEPTH_BOUNDS_TEST: case PIPE_CAP_TEXTURE_QUERY_SAMPLES: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_STRING_MARKER: diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index a9dd435bc97..9d06a25bb85 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -267,7 +267,6 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_QUERY_SAMPLES: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_FORCE_PERSAMPLE_INTERP: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_SHADER_PACK_HALF_FLOAT: case PIPE_CAP_MULTI_DRAW_INDIRECT: diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 64b6f614e96..82213a503b5 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -314,7 +314,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_QUERY_MEMORY_INFO: case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_LEGACY_MATH_RULES: case PIPE_CAP_CAN_BIND_CONST_BUFFER_AS_VERTEX: case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION: diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index b0f16c0e0e9..53506a09483 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -115,7 +115,6 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_STRING_MARKER: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_CULL_DISTANCE: case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_SHADER_CAN_READ_OUTPUTS: diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 42f53b314c2..7d7006555ee 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -297,8 +297,6 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_TGSI_TEXCOORD: return 1; - case PIPE_CAP_CLEAR_TEXTURE: - return 1; case PIPE_CAP_MAX_VARYINGS: return TGSI_EXEC_MAX_INPUT_ATTRIBS; case PIPE_CAP_PCI_GROUP: diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 15b4fd2b90f..06904701aa5 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -437,8 +437,6 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: return sws->have_vgpu10; - case PIPE_CAP_CLEAR_TEXTURE: - return sws->have_vgpu10; case PIPE_CAP_DOUBLES: return sws->have_sm5; case PIPE_CAP_UMA: diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index e5c6bbb8131..2431236f102 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -317,8 +317,6 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_PCI_FUNCTION: case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION: return 0; - case PIPE_CAP_CLEAR_TEXTURE: - return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_CLEAR_TEXTURE; case PIPE_CAP_CLIP_HALFZ: return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_CLIP_HALFZ; case PIPE_CAP_MAX_GS_INVOCATIONS: diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 7f38a370157..d3cf9578e17 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -570,7 +570,6 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_DRAW_INDIRECT: case PIPE_CAP_TEXTURE_QUERY_LOD: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: - case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_FORCE_PERSAMPLE_INTERP: case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 44979ac382e..a555a16ceac 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -833,7 +833,6 @@ enum pipe_cap PIPE_CAP_FORCE_PERSAMPLE_INTERP, PIPE_CAP_SHAREABLE_SHADERS, PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS, - PIPE_CAP_CLEAR_TEXTURE, PIPE_CAP_CLEAR_SCISSORED, PIPE_CAP_DRAW_PARAMETERS, PIPE_CAP_SHADER_PACK_HALF_FLOAT, diff --git a/src/mesa/main/consts_exts.h b/src/mesa/main/consts_exts.h index d1e745db8ec..0245a06707c 100644 --- a/src/mesa/main/consts_exts.h +++ b/src/mesa/main/consts_exts.h @@ -55,7 +55,6 @@ struct gl_extensions GLboolean ARB_bindless_texture; GLboolean ARB_blend_func_extended; GLboolean ARB_buffer_storage; - GLboolean ARB_clear_texture; GLboolean ARB_clip_control; GLboolean ARB_color_buffer_float; GLboolean ARB_compatibility; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index ff4081535b7..f411322df86 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -44,7 +44,7 @@ EXT(ARB_bindless_texture , ARB_bindless_texture EXT(ARB_blend_func_extended , ARB_blend_func_extended , GLL, GLC, x , x , 2009) EXT(ARB_buffer_storage , ARB_buffer_storage , GLL, GLC, x , x , 2013) EXT(ARB_clear_buffer_object , dummy_true , GLL, GLC, x , x , 2012) -EXT(ARB_clear_texture , ARB_clear_texture , GLL, GLC, x , x , 2013) +EXT(ARB_clear_texture , dummy_true , GLL, GLC, x , x , 2013) EXT(ARB_clip_control , ARB_clip_control , GLL, GLC, x , x , 2014) EXT(ARB_color_buffer_float , ARB_color_buffer_float , GLL, GLC, x , x , 2004) EXT(ARB_compatibility , ARB_compatibility , GLL, x , x , x , 2009) @@ -223,7 +223,7 @@ EXT(EXT_blend_func_separate , dummy_true EXT(EXT_blend_minmax , dummy_true , GLL, x , ES1, ES2, 1995) EXT(EXT_blend_subtract , dummy_true , GLL, x , x , x , 1995) EXT(EXT_buffer_storage , ARB_buffer_storage , x , x , x , 31, 2015) -EXT(EXT_clear_texture , ARB_clear_texture , x , x , x , 31, 2016) +EXT(EXT_clear_texture , dummy_true , x , x , x , 31, 2016) EXT(EXT_clip_control , ARB_clip_control , x , x , x , ES2, 2017) EXT(EXT_clip_cull_distance , ARB_cull_distance , x , x , x , 30, 2016) EXT(EXT_color_buffer_float , dummy_true , x , x , x , 30, 2013) diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 987f598bd3e..685decad30b 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -375,7 +375,6 @@ compute_version(const struct gl_extensions *extensions, consts->GLSLVersion >= 440 && consts->MaxVertexAttribStride >= 2048 && extensions->ARB_buffer_storage && - extensions->ARB_clear_texture && extensions->ARB_enhanced_layouts && extensions->ARB_query_buffer_object && extensions->ARB_texture_mirror_clamp_to_edge && diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 0921391b756..c19f3084ad0 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -759,7 +759,6 @@ void st_init_extensions(struct pipe_screen *screen, { o(ARB_base_instance), PIPE_CAP_START_INSTANCE }, { o(ARB_bindless_texture), PIPE_CAP_BINDLESS_TEXTURE }, { o(ARB_buffer_storage), PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT }, - { o(ARB_clear_texture), PIPE_CAP_CLEAR_TEXTURE }, { o(ARB_clip_control), PIPE_CAP_CLIP_HALFZ }, { o(ARB_color_buffer_float), PIPE_CAP_VERTEX_COLOR_UNCLAMPED }, { o(ARB_conditional_render_inverted), PIPE_CAP_CONDITIONAL_RENDER_INVERTED },