[Mesa-dev] [PATCH] svga: move variant->fs_shadow_compare_units assignment

Brian Paul brianp at vmware.com
Wed Dec 27 18:18:06 UTC 2017


Fixes a crash since the variant object isn't allocated until later
in the function.  Not sure how this got through.
---
 src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 3e4a6ed..2f16935 100644
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -6550,8 +6550,6 @@ svga_tgsi_vgpu10_translate(struct svga_context *svga,
       }
    }
 
-   variant->fs_shadow_compare_units = emit->fs.shadow_compare_units;
-
    if (SVGA_DEBUG & DEBUG_TGSI) {
       debug_printf("#####################################\n");
       debug_printf("### TGSI Shader %u\n", shader->id);
@@ -6666,6 +6664,8 @@ svga_tgsi_vgpu10_translate(struct svga_context *svga,
     */
    variant->uses_flat_interp = emit->uses_flat_interp;
 
+   variant->fs_shadow_compare_units = emit->fs.shadow_compare_units;
+
    if (tokens != shader->tokens) {
       tgsi_free_tokens(tokens);
    }
-- 
1.9.1



More information about the mesa-dev mailing list