fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: re-implement _mesa_ProgramEnvParameter4fvARB() with memcpy()

Browse source 
This is faster and ensures that NaN floats get stored properly.
Before, NaN values (which might be used with UP2H, UP2US, UP4B and
UP4UB) weren't getting stored properly with gcc -O3.

This is the second part of the fix for the piglit fp-unpack-01 failure
(bug 25973).
This commit is contained in:
Brian Paul 2010-01-22 15:41:08 -07:00
parent 8d1a01d370
commit 099e8ec54d
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/shader/arbprogram.c
View file

@ -561,6 +561,8 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
}
}
/**
* Set a program env parameter register.
* \note Called from the GL API dispatcher.
@ -569,10 +571,35 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
*/
void GLAPIENTRY
_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
const GLfloat *params)
const GLfloat *params)
{
_mesa_ProgramEnvParameter4fARB(target, index, params[0], params[1],
params[2], params[3]);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
if (target == GL_FRAGMENT_PROGRAM_ARB
&& ctx->Extensions.ARB_fragment_program) {
if (index >= ctx->Const.FragmentProgram.MaxEnvParams) {
_mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter4fv(index)");
return;
}
memcpy(ctx->FragmentProgram.Parameters[index], params,
4 * sizeof(GLfloat));
}
else if (target == GL_VERTEX_PROGRAM_ARB /* == GL_VERTEX_PROGRAM_NV */
&& (ctx->Extensions.ARB_vertex_program || ctx->Extensions.NV_vertex_program)) {
if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
_mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter4fv(index)");
return;
}
memcpy(ctx->VertexProgram.Parameters[index], params,
4 * sizeof(GLfloat));
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramEnvParameter4fv(target)");
return;
}
}