diff options
author | Brian Paul <brianp@vmware.com> | 2009-01-06 08:42:40 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-01-06 08:42:40 -0700 |
commit | 20156ce5da7743f527b920add663f4fa65527dcd (patch) | |
tree | 92e085dae003e2eccc9536d8afd0186f2cf85d2b /src/mesa/shader/prog_instruction.h | |
parent | 6b05708ce2c4120921f43d82f1751e039306e0d6 (diff) |
mesa: allow relative indexing into all register files and indirect dst register indexing
(cherry picked from commit f4361540f8dd3016571523863b33481cba7a0c07)
Conflicts:
src/mesa/shader/prog_execute.c
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
-rw-r--r-- | src/mesa/shader/prog_instruction.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 711166f9dd..a8842c68c7 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 + * Version: 7.3 * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2008 Brian Paul 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"), @@ -280,13 +280,10 @@ struct prog_src_register */ struct prog_dst_register { - /** - * One of the PROGRAM_* register file values. - */ - GLuint File:4; - + GLuint File:4; /**< One of the PROGRAM_* register file values */ GLuint Index:8; GLuint WriteMask:4; + GLuint RelAddr:1; /** * \name Conditional destination update control. @@ -318,7 +315,7 @@ struct prog_dst_register GLuint CondSrc:1; /*@}*/ - GLuint pad:31; + GLuint pad:30; }; |