Mesa (master): mesa: pass correct constant type to _mesa_fetch_state()

Brian Paul brianp at kemper.freedesktop.org
Thu Aug 4 15:02:38 PDT 2011


Module: Mesa
Branch: master
Commit: bf8d06c518a8e17e485b18ba03be3e1b45cc7327
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf8d06c518a8e17e485b18ba03be3e1b45cc7327

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug  4 16:01:27 2011 -0600

mesa: pass correct constant type to _mesa_fetch_state()

Fixes assorted warnings about float vs. gl_constant_value pointers.

---

 src/mesa/program/prog_statevars.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 16f9690..6aa2409 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -1111,7 +1111,7 @@ _mesa_load_state_parameters(struct gl_context *ctx,
       if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
          _mesa_fetch_state(ctx,
 			   paramList->Parameters[i].StateIndexes,
-                           paramList->ParameterValues[i]);
+                           &paramList->ParameterValues[i][0].f);
       }
    }
 }



More information about the mesa-commit mailing list