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

Fix problem introduced in previous commit in which a state variable (uniform) is written to. (see bug 12239)

Browse source 
Also, added some assertions to the emit_arg() and emit_dst() functions to
catch this kind of error in the future.
This commit is contained in:
Brian 2007-08-31 16:42:05 -06:00
parent 47768ce0e5
commit 6dd98e9853
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mesa/tnl/t_vp_build.c
View file

@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 6.5
* Version: 7.1
*
* Copyright (C) 2006 Tungsten Graphics All Rights Reserved.
* Copyright (C) 2007 Tungsten Graphics All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -457,9 +457,13 @@ static void register_matrix_param5( struct tnl_program *p,
}
/**
* Convert a ureg source register to a prog_src_register.
*/
static void emit_arg( struct prog_src_register *src,
struct ureg reg )
{
assert(reg.file != PROGRAM_OUTPUT);
src->File = reg.file;
src->Index = reg.idx;
src->Swizzle = reg.swz;
@ -469,9 +473,18 @@ static void emit_arg( struct prog_src_register *src,
src->RelAddr = 0;
}
/**
* Convert a ureg dest register to a prog_dst_register.
*/
static void emit_dst( struct prog_dst_register *dst,
struct ureg reg, GLuint mask )
{
/* Check for legal output register type. UNDEFINED will occur in
* instruction that don't produce a result (like END).
*/
assert(reg.file == PROGRAM_TEMPORARY ||
reg.file == PROGRAM_OUTPUT ||
reg.file == PROGRAM_UNDEFINED);
dst->File = reg.file;
dst->Index = reg.idx;
/* allow zero as a shorthand for xyzw */
@ -956,18 +969,19 @@ static void build_lighting( struct tnl_program *p )
STATE_POSITION);
struct ureg V = get_eye_position(p);
struct ureg dist = get_temp(p);
struct ureg tmpPpli = get_temp(p);
VPpli = get_temp(p);
half = get_temp(p);
/* In homogeneous object coordinates
*/
emit_op1(p, OPCODE_RCP, dist, 0, swizzle1(Ppli, W));
emit_op2(p, OPCODE_MUL, Ppli, 0, Ppli, dist);
/* In homogeneous object coordinates
*/
emit_op1(p, OPCODE_RCP, dist, 0, swizzle1(Ppli, W));
emit_op2(p, OPCODE_MUL, tmpPpli, 0, Ppli, dist);
/* Calulate VPpli vector
/* Calculate VPpli vector
*/
emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V);
emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V);
/* Normalize VPpli. The dist value also used in
* attenuation below.
@ -999,6 +1013,7 @@ static void build_lighting( struct tnl_program *p )
emit_normalize_vec3(p, half, half);
release_temp(p, dist);
release_temp(p, tmpPpli);
}
/* Calculate dot products: