OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove DEG2RAD macro

Browse Source 
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Brian Paul
2015-02-24 15:26:34 -07:00
parent ab68219a59
commit 88ff8dee02
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/main/imports.h
View File

@@ -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 defined(_MSC_VER)
#if _MSC_VER < 1800 /* Not req'd on VS2013 and above */ #if _MSC_VER < 1800 /* Not req'd on VS2013 and above */
#define strtoll(p, e, b) _strtoi64(p, e, b) #define strtoll(p, e, b) _strtoi64(p, e, b)

2
src/mesa/main/light.c
View File

@@ -156,7 +156,7 @@ _mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *pa
return; return;
FLUSH_VERTICES(ctx, _NEW_LIGHT); FLUSH_VERTICES(ctx, _NEW_LIGHT);
light->SpotCutoff = params[0]; 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) if (light->_CosCutoff < 0)
light->_CosCutoff = 0; light->_CosCutoff = 0;
if (light->SpotCutoff != 180.0F) if (light->SpotCutoff != 180.0F)

4
src/mesa/math/m_matrix.c
View File

@@ -799,8 +799,8 @@ _math_matrix_rotate( GLmatrix *mat,
GLfloat m[16]; GLfloat m[16];
GLboolean optimized; GLboolean optimized;
s = (GLfloat) sin( angle * DEG2RAD ); s = (GLfloat) sin( angle * M_PI / 180.0 );
c = (GLfloat) cos( angle * DEG2RAD ); c = (GLfloat) cos( angle * M_PI / 180.0 );
memcpy(m, Identity, sizeof(GLfloat)*16); memcpy(m, Identity, sizeof(GLfloat)*16);
optimized = GL_FALSE; optimized = GL_FALSE;