Mesa (master): zink: rename zink vs pipe variables

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: df82fb58d04fcbad90b418013e164247578366e0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=df82fb58d04fcbad90b418013e164247578366e0

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jan  6 09:44:14 2021 +0100

zink: rename zink vs pipe variables

The general convention we use is "pscreen" for the pipe_screen, and
"screen" for the zink_screen, so let's stick with that here also.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8402>

---

 src/gallium/drivers/zink/zink_compiler.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index a3036cf3504..14f84e24e35 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -244,14 +244,14 @@ static const struct nir_shader_compiler_options softfp_nir_options = {
 };
 
 const void *
-zink_get_compiler_options(struct pipe_screen *screen,
+zink_get_compiler_options(struct pipe_screen *pscreen,
                           enum pipe_shader_ir ir,
                           enum pipe_shader_type shader)
 {
    assert(ir == PIPE_SHADER_IR_NIR);
-   struct zink_screen *zscreen = zink_screen(screen);
+   struct zink_screen *screen = zink_screen(pscreen);
    /* do we actually want this? fails a lot and not just from bugs I've added */
-   if (!zscreen->info.feats.features.shaderFloat64)
+   if (!screen->info.feats.features.shaderFloat64)
       return &softfp_nir_options;
    return &nir_options;
 }