summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_simplify.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-07-29 17:43:35 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-07-29 17:43:35 -0600
commit016701f6860a840e079cb4c5f844a8cced712cd8 (patch)
tree217bbdbb61654ebf06220b19ecca7388024076c0 /src/mesa/shader/slang/slang_simplify.c
parentb26a80aa12f1f8316da495b4fdeb94e75ba5d740 (diff)
mesa: Silence compiler warnings on Windows.
Diffstat (limited to 'src/mesa/shader/slang/slang_simplify.c')
-rw-r--r--src/mesa/shader/slang/slang_simplify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/shader/slang/slang_simplify.c
index b729ceca7e..d45e71574c 100644
--- a/src/mesa/shader/slang/slang_simplify.c
+++ b/src/mesa/shader/slang/slang_simplify.c
@@ -69,7 +69,7 @@ _slang_lookup_constant(const char *name)
for (i = 0; info[i].Name; i++) {
if (strcmp(info[i].Name, name) == 0) {
/* found */
- GLint value = -1.0;
+ GLint value = -1;
_mesa_GetIntegerv(info[i].Token, &value);
ASSERT(value >= 0); /* sanity check that glGetFloatv worked */
return value;
@@ -103,7 +103,7 @@ _slang_simplify(slang_operation *oper,
oper->literal[0] =
oper->literal[1] =
oper->literal[2] =
- oper->literal[3] = value;
+ oper->literal[3] = (GLfloat) value;
oper->type = SLANG_OPER_LITERAL_INT;
return;
}