diff options
| author | Marek Olšák <[email protected]> | 2017-11-18 17:53:34 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-11-25 17:16:56 +0100 |
| commit | 8caf7d51a9cbed2bbe3293b33c48d1b4cad7407b (patch) | |
| tree | 53165bea549ab250e29f1f396bcc5bd1f6b1712a /src/gallium/auxiliary | |
| parent | 65433c3fd06ad2d080fb40bce139bc814cd76215 (diff) | |
gallium/hud: don't use hud->pipe in hud_parse_env_var
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/hud/hud_context.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index 92d607fdee6..810c2ea3363 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -1107,7 +1107,8 @@ has_pipeline_stats_query(struct pipe_screen *screen) } static void -hud_parse_env_var(struct hud_context *hud, const char *env) +hud_parse_env_var(struct hud_context *hud, struct pipe_screen *screen, + const char *env) { unsigned num, i; char name_a[256], s[256]; @@ -1251,7 +1252,7 @@ hud_parse_env_var(struct hud_context *hud, const char *env) } #endif else if (strcmp(name, "samples-passed") == 0 && - has_occlusion_query(hud->pipe->screen)) { + has_occlusion_query(screen)) { hud_pipe_query_install(&hud->batch_query, pane, "samples-passed", PIPE_QUERY_OCCLUSION_COUNTER, 0, 0, @@ -1260,7 +1261,7 @@ hud_parse_env_var(struct hud_context *hud, const char *env) 0); } else if (strcmp(name, "primitives-generated") == 0 && - has_streamout(hud->pipe->screen)) { + has_streamout(screen)) { hud_pipe_query_install(&hud->batch_query, pane, "primitives-generated", PIPE_QUERY_PRIMITIVES_GENERATED, 0, 0, @@ -1272,7 +1273,7 @@ hud_parse_env_var(struct hud_context *hud, const char *env) boolean processed = FALSE; /* pipeline statistics queries */ - if (has_pipeline_stats_query(hud->pipe->screen)) { + if (has_pipeline_stats_query(screen)) { static const char *pipeline_statistics_names[] = { "ia-vertices", @@ -1303,7 +1304,7 @@ hud_parse_env_var(struct hud_context *hud, const char *env) /* driver queries */ if (!processed) { if (!hud_driver_query_install(&hud->batch_query, pane, - hud->pipe->screen, name)) { + screen, name)) { fprintf(stderr, "gallium_hud: unknown driver query '%s'\n", name); fflush(stderr); } @@ -1707,7 +1708,7 @@ hud_create(struct cso_context *cso) } #endif - hud_parse_env_var(hud, env); + hud_parse_env_var(hud, screen, env); return hud; } |