From 3f71ed9e7e1a482c27ece40e42a436a341c6dd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Tue, 13 Jun 2023 11:25:38 +0200 Subject: [PATCH] gallium: Rename dri_init_screen_helper into dri_init_screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes it more obvious that this function is actually initializing the dri_screen and not some helper. Signed-off-by: Corentin Noël Reviewed-by: Emil Velikov Part-of: --- src/gallium/frontends/dri/dri2.c | 4 ++-- src/gallium/frontends/dri/dri_screen.c | 4 ++-- src/gallium/frontends/dri/dri_screen.h | 4 ++-- src/gallium/frontends/dri/drisw.c | 2 +- src/gallium/frontends/dri/kopper.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index cfba4649503..bf11a86c64f 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -2299,7 +2299,7 @@ dri2_init_screen(struct dri_screen *screen) if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_PROTECTED_CONTEXT)) screen->has_protected_context = true; - configs = dri_init_screen_helper(screen, pscreen); + configs = dri_init_screen(screen, pscreen); if (!configs) goto fail; @@ -2351,7 +2351,7 @@ dri_swrast_kms_init_screen(struct dri_screen *screen) dri_init_options(screen); dri2_init_screen_extensions(screen, pscreen, true); - configs = dri_init_screen_helper(screen, pscreen); + configs = dri_init_screen(screen, pscreen); if (!configs) goto fail; diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c index d5a38d8f5b1..bb84af5dcfc 100644 --- a/src/gallium/frontends/dri/dri_screen.c +++ b/src/gallium/frontends/dri/dri_screen.c @@ -829,8 +829,8 @@ dri_set_background_context(struct st_context *st, } const __DRIconfig ** -dri_init_screen_helper(struct dri_screen *screen, - struct pipe_screen *pscreen) +dri_init_screen(struct dri_screen *screen, + struct pipe_screen *pscreen) { screen->base.screen = pscreen; screen->base.get_egl_image = dri_get_egl_image; diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h index 564517bcd90..13c5d0a6c1b 100644 --- a/src/gallium/frontends/dri/dri_screen.h +++ b/src/gallium/frontends/dri/dri_screen.h @@ -219,8 +219,8 @@ void dri_init_options(struct dri_screen *screen); const __DRIconfig ** -dri_init_screen_helper(struct dri_screen *screen, - struct pipe_screen *pscreen); +dri_init_screen(struct dri_screen *screen, + struct pipe_screen *pscreen); void dri_release_screen(struct dri_screen * screen); diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c index cdca90e8bc1..3abee577e2e 100644 --- a/src/gallium/frontends/dri/drisw.c +++ b/src/gallium/frontends/dri/drisw.c @@ -568,7 +568,7 @@ drisw_init_screen(struct dri_screen *screen) goto fail; dri_init_options(screen); - configs = dri_init_screen_helper(screen, pscreen); + configs = dri_init_screen(screen, pscreen); if (!configs) goto fail; diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 2fc16034146..ac2763fc3da 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -140,7 +140,7 @@ kopper_init_screen(struct dri_screen *screen) dri_init_options(screen); screen->unwrapped_screen = trace_screen_unwrap(pscreen); - configs = dri_init_screen_helper(screen, pscreen); + configs = dri_init_screen(screen, pscreen); if (!configs) goto fail;