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

fix errors in RoughApproxPower(), do_LIT(), _tnl_program_string()

Browse Source
This commit is contained in:
Brian Paul
2005-10-29 15:56:53 +00:00
parent 4570364097
commit db02ab767f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/tnl/t_vb_arbprogram.c
View File

@@ -91,7 +91,10 @@ static GLfloat RoughApproxExp2(GLfloat t)
static GLfloat RoughApproxPower(GLfloat x, GLfloat y) static GLfloat RoughApproxPower(GLfloat x, GLfloat y)
{ {
return RoughApproxExp2(y * RoughApproxLog2(x)); if (x == 0.0 && y == 0.0)
return 1.0; /* spec requires this */
else
return RoughApproxExp2(y * RoughApproxLog2(x));
} }
@@ -336,17 +339,15 @@ static void do_LIT( struct arb_vp_machine *m, union instruction op )
GLfloat tmp[4]; GLfloat tmp[4];
tmp[0] = 1.0; tmp[0] = 1.0;
tmp[1] = 0.0; tmp[1] = arg0[0];
tmp[2] = 0.0; if (arg0[0] > 0.0) {
tmp[2] = RoughApproxPower(arg0[1], arg0[3]);
}
else {
tmp[2] = 0.0;
}
tmp[3] = 1.0; tmp[3] = 1.0;
if (arg0[0] > 0.0) {
tmp[1] = arg0[0];
if (arg0[1] > 0.0) {
tmp[2] = RoughApproxPower(arg0[1], arg0[3]);
}
}
COPY_4V(result, tmp); COPY_4V(result, tmp);
} }
@@ -1485,7 +1486,7 @@ const struct tnl_pipeline_stage _tnl_arb_vertex_program_stage =
void void
_tnl_program_string(GLcontext *ctx, GLenum target, struct program *program) _tnl_program_string(GLcontext *ctx, GLenum target, struct program *program)
{ {
if (target == GL_VERTEX_PROGRAM_ARB) { if (program->Target == GL_VERTEX_PROGRAM_ARB) {
/* free any existing tnl data hanging off the program */ /* free any existing tnl data hanging off the program */
struct vertex_program *vprog = (struct vertex_program *) program; struct vertex_program *vprog = (struct vertex_program *) program;
if (vprog->TnlData) { if (vprog->TnlData) {