projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add dlist support for indexed colormask and indexed enables/disables
[mesa.git]
/
src
/
mesa
/
main
/
ffvertex_prog.c
diff --git
a/src/mesa/main/ffvertex_prog.c
b/src/mesa/main/ffvertex_prog.c
index 356476e35a5c5b90408a9f971ee4c103935a7e1b..2d1db29cbfe556398c737b6c9c6fa23af8ce44e9 100644
(file)
--- a/
src/mesa/main/ffvertex_prog.c
+++ b/
src/mesa/main/ffvertex_prog.c
@@
-357,7
+357,7
@@
static struct ureg get_temp( struct tnl_program *p )
int bit = _mesa_ffs( ~p->temp_in_use );
if (!bit) {
_mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);
int bit = _mesa_ffs( ~p->temp_in_use );
if (!bit) {
_mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);
-
_mesa_
exit(1);
+ exit(1);
}
if ((GLuint) bit > p->program->Base.NumTemporaries)
}
if ((GLuint) bit > p->program->Base.NumTemporaries)
@@
-438,7
+438,7
@@
static struct ureg register_input( struct tnl_program *p, GLuint input )
*/
static struct ureg register_output( struct tnl_program *p, GLuint output )
{
*/
static struct ureg register_output( struct tnl_program *p, GLuint output )
{
- p->program->Base.OutputsWritten |=
(1<<
output);
+ p->program->Base.OutputsWritten |=
BITFIELD64_BIT(
output);
return make_ureg(PROGRAM_OUTPUT, output);
}
return make_ureg(PROGRAM_OUTPUT, output);
}
@@
-523,7
+523,6
@@
static void emit_dst( struct prog_dst_register *dst,
dst->CondMask = COND_TR; /* always pass cond test */
dst->CondSwizzle = SWIZZLE_NOOP;
dst->CondSrc = 0;
dst->CondMask = COND_TR; /* always pass cond test */
dst->CondSwizzle = SWIZZLE_NOOP;
dst->CondSrc = 0;
- dst->pad = 0;
/* Check that bitfield sizes aren't exceeded */
ASSERT(dst->Index == reg.idx);
}
/* Check that bitfield sizes aren't exceeded */
ASSERT(dst->Index == reg.idx);
}