Module: Mesa Branch: main Commit: 921c770d49adffba84d9d142d64860cf056a18af URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=921c770d49adffba84d9d142d64860cf056a18af
Author: Marek Olšák <[email protected]> Date: Wed Sep 1 04:50:03 2021 -0400 driconf: remove leftover code for allow_incorrect_primitive_id Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12809> --- src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 1 - src/gallium/auxiliary/util/u_driconf.c | 1 - src/gallium/include/frontend/api.h | 1 - src/util/00-mesa-defaults.conf | 2 -- src/util/driconf.h | 4 ---- 5 files changed, 9 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h index 2ec793e125a..051d74a381f 100644 --- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h @@ -31,7 +31,6 @@ DRI_CONF_SECTION_DEBUG DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD(false) DRI_CONF_GLSL_IGNORE_WRITE_TO_READONLY_VAR(false) DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER(false) - DRI_CONF_ALLOW_INCORRECT_PRIMITIVE_ID(false) DRI_CONF_FORCE_COMPAT_PROFILE(false) DRI_CONF_FORCE_GL_NAMES_REUSE(false) DRI_CONF_TRANSCODE_ETC(false) diff --git a/src/gallium/auxiliary/util/u_driconf.c b/src/gallium/auxiliary/util/u_driconf.c index 0cd84e9a11d..3098ade81aa 100644 --- a/src/gallium/auxiliary/util/u_driconf.c +++ b/src/gallium/auxiliary/util/u_driconf.c @@ -57,7 +57,6 @@ u_driconf_fill_st_options(struct st_config_options *options, query_bool_option(force_glsl_abs_sqrt); query_bool_option(allow_glsl_cross_stage_interpolation_mismatch); query_bool_option(allow_draw_out_of_order); - query_bool_option(allow_incorrect_primitive_id); query_bool_option(ignore_map_unsynchronized); query_bool_option(force_gl_names_reuse); query_bool_option(transcode_etc); diff --git a/src/gallium/include/frontend/api.h b/src/gallium/include/frontend/api.h index 4fa1256f07a..1b131367119 100644 --- a/src/gallium/include/frontend/api.h +++ b/src/gallium/include/frontend/api.h @@ -233,7 +233,6 @@ struct st_config_options bool force_glsl_abs_sqrt; bool allow_glsl_cross_stage_interpolation_mismatch; bool allow_draw_out_of_order; - bool allow_incorrect_primitive_id; bool ignore_map_unsynchronized; bool force_integer_tex_nearest; bool force_gl_names_reuse; diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf index 0650adf2a7f..a8e1a6f419d 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf @@ -306,8 +306,6 @@ TODO: document the other workarounds. <option name="force_gl_vendor" value="NVIDIA Corporation" /> <!-- creo-02 doesn't enable GL_EXT_shader_image_load_store in GLSL --> <option name="force_glsl_extensions_warn" value="true" /> - <!-- Enable draw merging inside display list for snx-03 --> - <option name="allow_incorrect_primitive_id" value="true" /> <option name="allow_draw_out_of_order" value="true" /> <option name="mesa_glthread" value="true" /> <option name="mesa_no_error" value="true" /> diff --git a/src/util/driconf.h b/src/util/driconf.h index 35f1941a8d2..6248957df25 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -216,10 +216,6 @@ DRI_CONF_OPT_B(allow_draw_out_of_order, def, \ "Allow out-of-order draw optimizations. Set when Z fighting doesn't have to be accurate.") -#define DRI_CONF_ALLOW_INCORRECT_PRIMITIVE_ID(def) \ - DRI_CONF_OPT_B(allow_incorrect_primitive_id, def, \ - "Allows drawing display list using merged draws (might cause invalid gl_PrimitiveID values).") - #define DRI_CONF_FORCE_GL_VENDOR() \ DRI_CONF_OPT_S_NODEF(force_gl_vendor, "Override GPU vendor string.")
