From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 24 Aug 2009 14:55:15 +0000 (+0100)
Subject: llvmpipe: Fix shader variant key construction.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8aa62cead71b4d06e49fccf02405c1ce649186fd;p=mesa.git

llvmpipe: Fix shader variant key construction.

Fixes the blank screen on non-64bit mode.
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 361b30699c6..4981432eb38 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -663,14 +663,14 @@ make_variant_key(struct llvmpipe_context *lp,
 {
    memset(key, 0, sizeof *key);
 
-   memcpy(&key->depth, &lp->depth_stencil->depth, sizeof &key->depth);
+   memcpy(&key->depth, &lp->depth_stencil->depth, sizeof key->depth);
 
    key->alpha.enabled = lp->depth_stencil->alpha.enabled;
    if(key->alpha.enabled)
       key->alpha.func = lp->depth_stencil->alpha.func;
    /* alpha.ref_value is passed in jit_context */
 
-   memcpy(&key->blend, lp->blend, sizeof &key->blend);
+   memcpy(&key->blend, lp->blend, sizeof key->blend);
 }