mesa: remove DEG2RAD macro

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 356f0e1837645cf0c2f3c043fbbe3bb6035e4b8c..d8864272e11be3294f8796928108d70b45673c38 100644 (file)
--- 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 c4d3a532ef594bac454576fe5a32d345322169df..4021dbef922a131d4c5bd80a491299783006d899 100644 (file)
--- 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 9d51021feda88cc88c20ac9c099936aa574e6a7e..0475a7ab23480f62c2934e0898d4f4253a6b57e8 100644 (file)
--- 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;