summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-02-24 15:26:34 -0700
committerBrian Paul <[email protected]>2015-02-24 17:10:28 -0700
commit88ff8dee02d43a55d72a22a0172b92e7cd988bbf (patch)
tree90e3e58d3b9ae19009a48856505d1a37cd961851 /src
parentab68219a59c128e018ba68a287228c24890b8f4f (diff)
mesa: remove DEG2RAD macro
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/imports.h8
-rw-r--r--src/mesa/main/light.c2
-rw-r--r--src/mesa/math/m_matrix.c4
3 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 356f0e18376..d8864272e11 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -79,14 +79,6 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type;
-/**********************************************************************
- * Math macros
- */
-
-/* Degrees to radians conversion: */
-#define DEG2RAD (M_PI/180.0)
-
-
#if defined(_MSC_VER)
#if _MSC_VER < 1800 /* Not req'd on VS2013 and above */
#define strtoll(p, e, b) _strtoi64(p, e, b)
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index c4d3a532ef5..4021dbef922 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -156,7 +156,7 @@ _mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *pa
return;
FLUSH_VERTICES(ctx, _NEW_LIGHT);
light->SpotCutoff = params[0];
- light->_CosCutoff = (GLfloat) (cos(light->SpotCutoff * DEG2RAD));
+ light->_CosCutoff = (GLfloat) (cos(light->SpotCutoff * M_PI / 180.0));
if (light->_CosCutoff < 0)
light->_CosCutoff = 0;
if (light->SpotCutoff != 180.0F)
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index 9d51021feda..0475a7ab234 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -799,8 +799,8 @@ _math_matrix_rotate( GLmatrix *mat,
GLfloat m[16];
GLboolean optimized;
- s = (GLfloat) sin( angle * DEG2RAD );
- c = (GLfloat) cos( angle * DEG2RAD );
+ s = (GLfloat) sin( angle * M_PI / 180.0 );
+ c = (GLfloat) cos( angle * M_PI / 180.0 );
memcpy(m, Identity, sizeof(GLfloat)*16);
optimized = GL_FALSE;