Mesa (gallium-llvmpipe): llvmpipe: Fix shader variant key construction.

[Jose Fonseca]

Module: Mesa
Branch: gallium-llvmpipe
Commit: 0a2166f9bda9c28eb5d36b0aa633abae2852ddd7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a2166f9bda9c28eb5d36b0aa633abae2852ddd7

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Aug 24 15:55:15 2009 +0100

llvmpipe: Fix shader variant key construction.

Fixes the blank screen on non-64bit mode.

---

 src/gallium/drivers/llvmpipe/lp_state_fs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 361b306..4981432 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);
 }