From 7cfc8d3ab9d5834cf7a2330301cf235746c81517 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Thu, 14 Dec 2023 13:12:23 +0200 Subject: [PATCH] mesa: fix enum support for EXT_clip_cull_distance MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Extension was enabled but required enums not. Fixes: 979bcb9f428 ("glsl: add EXT_clip_cull_distance support based on ARB_cull_distance") Signed-off-by: Tapani Pälli Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 629b15f446a41492fc5057c04008c6de9c52b078) --- .pick_status.json | 2 +- src/mesa/main/get_hash_params.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8a54d9b..1fcc51a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -174,7 +174,7 @@ "description": "mesa: fix enum support for EXT_clip_cull_distance", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "979bcb9f4288564fb6c5807bcfbfd0a78176c3ef", "notes": null diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 90d09c4..267efa5 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -494,6 +494,10 @@ descriptor=[ # GL_EXT_framebuffer_EXT / GLES 3.0 + EXT_sRGB_write_control [ "FRAMEBUFFER_SRGB_EXT", "CONTEXT_BOOL(Color.sRGBEnabled), extra_EXT_framebuffer_sRGB" ], + +# GL_ARB_cull_distance, GL_EXT_clip_cull_distance + [ "MAX_CULL_DISTANCES", "CONTEXT_INT(Const.MaxClipPlanes), extra_ARB_cull_distance" ], + [ "MAX_COMBINED_CLIP_AND_CULL_DISTANCES", "CONTEXT_INT(Const.MaxClipPlanes), extra_ARB_cull_distance" ], ]}, { "apis": ["GLES", "GLES2"], "params": [ @@ -1009,10 +1013,6 @@ descriptor=[ [ "GPU_MEMORY_INFO_EVICTION_COUNT_NVX", "LOC_CUSTOM, TYPE_INT, NO_OFFSET, extra_NVX_gpu_memory_info" ], [ "GPU_MEMORY_INFO_EVICTED_MEMORY_NVX", "LOC_CUSTOM, TYPE_INT, NO_OFFSET, extra_NVX_gpu_memory_info" ], -# GL_ARB_cull_distance - [ "MAX_CULL_DISTANCES", "CONTEXT_INT(Const.MaxClipPlanes), extra_ARB_cull_distance" ], - [ "MAX_COMBINED_CLIP_AND_CULL_DISTANCES", "CONTEXT_INT(Const.MaxClipPlanes), extra_ARB_cull_distance" ], - # GL_ARB_compute_variable_group_size [ "MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB", "CONTEXT_INT(Const.MaxComputeVariableGroupInvocations), extra_ARB_compute_variable_group_size" ], -- 2.7.4