Mesa (master): glsl: add 'f' suffix to floats to silence MSVC warnings

Brian Paul brianp at kemper.freedesktop.org
Tue Nov 6 15:11:27 UTC 2012


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

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Nov  4 16:43:44 2012 -0700

glsl: add 'f' suffix to floats to silence MSVC warnings

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/glsl/ir.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 1c7aada..7b0a487 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -780,7 +780,7 @@ ir_constant::get_float_component(unsigned i) const
    case GLSL_TYPE_UINT:  return (float) this->value.u[i];
    case GLSL_TYPE_INT:   return (float) this->value.i[i];
    case GLSL_TYPE_FLOAT: return this->value.f[i];
-   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1.0 : 0.0;
+   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1.0f : 0.0f;
    default:              assert(!"Should not get here."); break;
    }
 




More information about the mesa-commit mailing list