projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: simplify tgsi_full_immediate struct
[mesa.git]
/
src
/
gallium
/
auxiliary
/
tgsi
/
tgsi_dump_c.c
diff --git
a/src/gallium/auxiliary/tgsi/tgsi_dump_c.c
b/src/gallium/auxiliary/tgsi/tgsi_dump_c.c
index c575b6c3e1fd55a7324191e5f794a94239d51dc0..c944760ca67fd540e0c48d6f46d1bc8e7f17d3b3 100644
(file)
--- a/
src/gallium/auxiliary/tgsi/tgsi_dump_c.c
+++ b/
src/gallium/auxiliary/tgsi/tgsi_dump_c.c
@@
-25,7
+25,7
@@
*
**************************************************************************/
*
**************************************************************************/
-#include "
pipe/p
_debug.h"
+#include "
util/u
_debug.h"
#include "util/u_string.h"
#include "tgsi_dump_c.h"
#include "tgsi_build.h"
#include "util/u_string.h"
#include "tgsi_dump_c.h"
#include "tgsi_build.h"
@@
-283,12
+283,13
@@
dump_immediate_verbose(
UIX( imm->Immediate.Padding );
}
UIX( imm->Immediate.Padding );
}
- for( i = 0; i < imm->Immediate.Size - 1; i++ ) {
+ assert( imm->Immediate.NrTokens <= 4 + 1 );
+ for( i = 0; i < imm->Immediate.NrTokens - 1; i++ ) {
EOL();
switch( imm->Immediate.DataType ) {
case TGSI_IMM_FLOAT32:
TXT( "\nFloat: " );
EOL();
switch( imm->Immediate.DataType ) {
case TGSI_IMM_FLOAT32:
TXT( "\nFloat: " );
- FLT( imm->u
.ImmediateFloat32
[i].Float );
+ FLT( imm->u[i].Float );
break;
default:
break;
default:
@@
-675,7
+676,7
@@
tgsi_dump_c(
ENM( parse.FullToken.Token.Type, TGSI_TOKEN_TYPES );
if( ignored ) {
TXT( "\nSize : " );
ENM( parse.FullToken.Token.Type, TGSI_TOKEN_TYPES );
if( ignored ) {
TXT( "\nSize : " );
- UID( parse.FullToken.Token.
Size
);
+ UID( parse.FullToken.Token.
NrTokens
);
if( deflt || parse.FullToken.Token.Extended ) {
TXT( "\nExtended : " );
UID( parse.FullToken.Token.Extended );
if( deflt || parse.FullToken.Token.Extended ) {
TXT( "\nExtended : " );
UID( parse.FullToken.Token.Extended );