Mesa (master): Revert "gallium/hud: Use do_once for one-time init"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 25 10:06:38 UTC 2020
Module: Mesa
Branch: master
Commit: b8fb95ce01cb131f4991f807364ce61fa542e5ab
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8fb95ce01cb131f4991f807364ce61fa542e5ab
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Tue Nov 24 23:34:46 2020 +0100
Revert "gallium/hud: Use do_once for one-time init"
This reverts commit 2e81ec5e009e3fbeef3fe1a76f2dfee428b7c160.
Acked-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7760>
---
src/gallium/auxiliary/hud/hud_context.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c
index bea30064221..bb614f76a95 100644
--- a/src/gallium/auxiliary/hud/hud_context.c
+++ b/src/gallium/auxiliary/hud/hud_context.c
@@ -41,7 +41,6 @@
#include "hud/hud_private.h"
#include "cso_cache/cso_context.h"
-#include "util/debug.h"
#include "util/u_draw_quad.h"
#include "util/format/u_format.h"
#include "util/u_inlines.h"
@@ -1812,10 +1811,8 @@ hud_create(struct cso_context *cso, struct hud_context *share)
memset(&action, 0, sizeof(action));
#endif
- do_once {
- huds_visible = debug_get_bool_option("GALLIUM_HUD_VISIBLE", TRUE);
- hud_scale = debug_get_num_option("GALLIUM_HUD_SCALE", 1);
- }
+ huds_visible = debug_get_bool_option("GALLIUM_HUD_VISIBLE", TRUE);
+ hud_scale = debug_get_num_option("GALLIUM_HUD_SCALE", 1);
if (!env || !*env)
return NULL;
More information about the mesa-commit
mailing list