zink: rename zink vs pipe variables
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Wed, 6 Jan 2021 08:44:14 +0000 (09:44 +0100)
committerMarge Bot <eric+marge@anholt.net>
Sun, 10 Jan 2021 13:06:45 +0000 (13:06 +0000)
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@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8402>

src/gallium/drivers/zink/zink_compiler.c

index a3036cf..14f84e2 100644 (file)
@@ -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;
 }