summaryrefslogtreecommitdiff
path: root/src/mesa/shader
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-07-28 00:11:10 +0000
committerIan Romanick <idr@us.ibm.com>2005-07-28 00:11:10 +0000
commit9f23a3a1bff6c8af93e651273c9887bbf119f555 (patch)
tree0bdc6e08b24ee9f855aa7132944d5a26e1edf37c /src/mesa/shader
parent3e36986e5a59c734b7bd198a16fb9af3314860de (diff)
Fix SPARC assembly for 64-bit
- The test for whether or not we're building for 64-bit is '#ifdef __arch64__'. This appears to be correct on both Linux and Solaris. - The test for Solaris is now '#if defined(SVR4) || defined(__SVR4) || defined(__svr4__)'. GCC 3.4.0 has all three defined on Solaris 9. - Enables assembly language clip routines. - Fixes to make GLSL code build on Solaris. - Update gl_SPARC_asm.py.
Diffstat (limited to 'src/mesa/shader')
-rw-r--r--src/mesa/shader/grammar/grammar.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/shader/grammar/grammar.c b/src/mesa/shader/grammar/grammar.c
index 2d307f43fe..0b767c02cd 100644
--- a/src/mesa/shader/grammar/grammar.c
+++ b/src/mesa/shader/grammar/grammar.c
@@ -565,24 +565,24 @@ static void emit_destroy (emit **em)
static unsigned int emit_size (emit *_E)
{
- unsigned int _N = 0;
+ unsigned int n = 0;
while (_E != NULL)
{
if (_E->m_emit_dest == ed_output)
{
if (_E->m_emit_type == et_position)
- _N += 4; /* position is a 32-bit unsigned integer */
+ n += 4; /* position is a 32-bit unsigned integer */
else
- _N++;
+ n++;
}
_E = _E->m_next;
}
- return _N;
+ return n;
}
-static int emit_push (emit *_E, byte *_P, byte _C, unsigned int _Pos, regbyte_ctx **_Ctx)
+static int emit_push (emit *_E, byte *_P, byte c, unsigned int _Pos, regbyte_ctx **_Ctx)
{
while (_E != NULL)
{
@@ -591,7 +591,7 @@ static int emit_push (emit *_E, byte *_P, byte _C, unsigned int _Pos, regbyte_ct
if (_E->m_emit_type == et_byte)
*_P++ = _E->m_byte;
else if (_E->m_emit_type == et_stream)
- *_P++ = _C;
+ *_P++ = c;
else /* _Em->type == et_position */
{
*_P++ = (byte) (_Pos);
@@ -614,7 +614,7 @@ static int emit_push (emit *_E, byte *_P, byte _C, unsigned int _Pos, regbyte_ct
if (_E->m_emit_type == et_byte)
new_rbc->m_current_value = _E->m_byte;
else if (_E->m_emit_type == et_stream)
- new_rbc->m_current_value = _C;
+ new_rbc->m_current_value = c;
}
_E = _E->m_next;
@@ -1013,22 +1013,22 @@ static void bytepool_create (bytepool **by, int len)
}
}
-static int bytepool_reserve (bytepool *by, unsigned int _N)
+static int bytepool_reserve (bytepool *by, unsigned int n)
{
byte *_P;
- if (_N <= by->_Siz)
+ if (n <= by->_Siz)
return 0;
/* byte pool can only grow and at least by doubling its size */
- _N = _N >= by->_Siz * 2 ? _N : by->_Siz * 2;
+ n = n >= by->_Siz * 2 ? n : by->_Siz * 2;
/* reallocate the memory and adjust pointers to the new memory location */
- _P = (byte *) (mem_realloc (by->_F, sizeof (byte) * by->_Siz, sizeof (byte) * _N));
+ _P = (byte *) (mem_realloc (by->_F, sizeof (byte) * by->_Siz, sizeof (byte) * n));
if (_P != NULL)
{
by->_F = _P;
- by->_Siz = _N;
+ by->_Siz = n;
return 0;
}