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

mesa: replace LOGF, EXPF with logf, expf

Browse Source 
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Brian Paul
2015-02-24 09:01:51 -07:00
parent e25f7772ca
commit 79b480ccc0
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/c99_math.h
View File

@@ -92,6 +92,16 @@ static inline float ldexpf(float x, int exp)
return (float) ldexp(x, exp);
}
static inline float logf(float x)
{
return (float) log(x);
}
static inline float expf(float x)
{
return (float) exp(x);
}
#else
/* Work-around an extra semi-colon in VS 2005 logf definition */

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

@@ -207,22 +207,16 @@ static inline GLfloat LOG2(GLfloat x)
*** CEILF: ceiling of float
*** FLOORF: floor of float
*** FABSF: absolute value of float
*** LOGF: the natural logarithm (base e) of the value
*** EXPF: raise e to the value
***/
#if defined(__gnu_linux__)
/* C99 functions */
#define CEILF(x) ceilf(x)
#define FLOORF(x) floorf(x)
#define FABSF(x) fabsf(x)
#define LOGF(x) logf(x)
#define EXPF(x) expf(x)
#else
#define CEILF(x) ((GLfloat) ceil(x))
#define FLOORF(x) ((GLfloat) floor(x))
#define FABSF(x) ((GLfloat) fabs(x))
#define LOGF(x) ((GLfloat) log(x))
#define EXPF(x) ((GLfloat) exp(x))
#endif

2
src/mesa/swrast/s_aaline.c
View File

@@ -203,7 +203,7 @@ compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
if (rho2 == 0.0F)
return 0.0;
else
return (GLfloat) (LOGF(rho2) * 1.442695 * 0.5);/* 1.442695 = 1/log(2) */
return logf(rho2) * 1.442695f * 0.5f;/* 1.442695 = 1/log(2) */
}

9
src/mesa/swrast/s_fog.c
View File

@@ -23,6 +23,7 @@
*/
#include "c99_math.h"
#include "main/glheader.h"
#include "main/colormac.h"
#include "main/macros.h"
@@ -49,12 +50,12 @@ _swrast_z_to_fogfactor(struct gl_context *ctx, GLfloat z)
return CLAMP(f, 0.0F, 1.0F);
case GL_EXP:
d = ctx->Fog.Density;
f = EXPF(-d * z);
f = expf(-d * z);
f = CLAMP(f, 0.0F, 1.0F);
return f;
case GL_EXP2:
d = ctx->Fog.Density;
f = EXPF(-(d * d * z * z));
f = expf(-(d * d * z * z));
f = CLAMP(f, 0.0F, 1.0F);
return f;
default:
@@ -66,14 +67,14 @@ _swrast_z_to_fogfactor(struct gl_context *ctx, GLfloat z)
#define LINEAR_FOG(f, coord) f = (fogEnd - coord) * fogScale
#define EXP_FOG(f, coord) f = EXPF(density * coord)
#define EXP_FOG(f, coord) f = expf(density * coord)
#define EXP2_FOG(f, coord) \
do { \
GLfloat tmp = negDensitySquared * coord * coord; \
if (tmp < FLT_MIN_10_EXP) \
tmp = FLT_MIN_10_EXP; \
f = EXPF(tmp); \
f = expf(tmp); \
} while(0)

3
src/mesa/tnl/t_vb_fog.c
View File

@@ -26,6 +26,7 @@
*/
#include "c99_math.h"
#include "main/glheader.h"
#include "main/colormac.h"
#include "main/macros.h"
@@ -78,7 +79,7 @@ init_static_data( void )
GLfloat f = 0.0F;
GLint i = 0;
for ( ; i < FOG_EXP_TABLE_SIZE ; i++, f += FOG_INCR) {
exp_table[i] = EXPF(-f);
exp_table[i] = expf(-f);
}
inited = 1;
}