From eca01605f2dd5e1f5e58e19d3cbbff868921bc2b Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Wed, 11 Sep 2019 11:00:39 +0200
Subject: [PATCH] shader: Move winsys_adjust_y_emitted from the shader key into
 the dump context

The value should never haven been part of the shader key.

Fixes #132

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
---
 src/vrend_renderer.c | 1 -
 src/vrend_shader.c   | 5 +++--
 src/vrend_shader.h   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index f88ff88..785f15a 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -3083,7 +3083,6 @@ static inline void vrend_fill_shader_key(struct vrend_context *ctx,
 
    key->invert_fs_origin = !ctx->sub->inverted_fbo_content;
    key->coord_replace = ctx->sub->rs_state.point_quad_rasterization ? ctx->sub->rs_state.sprite_coord_enable : 0;
-   key->winsys_adjust_y_emitted = false;
 
    if (type == PIPE_SHADER_FRAGMENT)
       key->fs_swizzle_output_rgb_to_bgr = ctx->sub->swizzle_output_rgb_to_bgr;
diff --git a/src/vrend_shader.c b/src/vrend_shader.c
index fce6a55..2303196 100644
--- a/src/vrend_shader.c
+++ b/src/vrend_shader.c
@@ -248,6 +248,7 @@ struct dump_ctx {
    bool early_depth_stencil;
    bool has_file_memory;
    bool force_color_two_side;
+   bool winsys_adjust_y_emitted;
 
    int tcs_vertices_out;
    int tes_prim_mode;
@@ -6123,9 +6124,9 @@ static void emit_ios_fs(struct dump_ctx *ctx)
          emit_ios_generic(ctx, io_in, prefixes, &ctx->inputs[i], "in", "");
       }
 
-      if (ctx->cfg->use_gles && !ctx->key->winsys_adjust_y_emitted &&
+      if (ctx->cfg->use_gles && !ctx->winsys_adjust_y_emitted &&
           (ctx->key->coord_replace & (1 << ctx->inputs[i].sid))) {
-         ctx->key->winsys_adjust_y_emitted = true;
+         ctx->winsys_adjust_y_emitted = true;
          emit_hdr(ctx, "uniform float winsys_adjust_y;\n");
       }
    }
diff --git a/src/vrend_shader.h b/src/vrend_shader.h
index bd80228..4d5ccf0 100644
--- a/src/vrend_shader.h
+++ b/src/vrend_shader.h
@@ -95,7 +95,6 @@ struct vrend_shader_info {
 
 struct vrend_shader_key {
    uint32_t coord_replace;
-   bool winsys_adjust_y_emitted;
    bool invert_fs_origin;
    bool pstipple_tex;
    bool add_alpha_test;