Keith Whitwell pisze:
On Wed, 2009-11-25 at 06:28 -0800, michal wrote:
Keith Whitwell pisze:
I've pushed a feature branch with some tgsi simplifications in it. With
these I've removed the biggest remaining oddities of that language, and
it's getting to a place where I'm starting to be happy with it as a
foundation for future work.
Most of the surprising stuff like multiple negate flags, etc, is gone
now, and the core tokens are quite a bit easier to understand than in
previous iterations.
I've still got my eye on reducing the verbosity of the names in the
tgsi_parse.h "FullToken" world, and promoting the tgsi_any_token union
into p_shader_tokens.h.
It would be good if people can review the interface changes and provide
feedback, and also test out their drivers on this branch. I've done
minimal softpipe testing so far but will do more over the next few days.
All looks good to me, I'm happy somebody had the guts to cut off all the
cruft in one shot.
I see some compile errors on windows build -- I will fix those along
with other minor bugs I have spotted.
Now, looking at the interface, I'm thinking about removing some more tokens.
1) Remove tgsi_dimension and use tgsi_src_register directly with some
well-defined constraints.
2) Do the same to tgsi_instruction_predicate. Really, it's just an
optional src operand with some restrictions.
Interesting. I'd be keen to see a patch.
Attached. But the more I look at it the more lame it gets.
Another option would be to define tgsi_any_register that would have
File, Index, Indirect and Dimension fields. Then there would be more
specialised tgsi_*_register tokens, that would be binary compatible with
the first one. One could cast them using a union and avoid more mistakes
at compile time. That way we don't have to put the constraints in
comments, but be more strict and use the compiler to enforce them. I
will follow up with a patch.
diff --git a/src/gallium/include/pipe/p_shader_tokens.h
b/src/gallium/include/pipe/p_shader_tokens.h
index 7d73d7d..7bea99a 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -290,7 +290,9 @@ union tgsi_immediate_data
* respectively. For a given operation code, those numbers are fixed and are
* present here only for convenience.
*
- * If Predicate is TRUE, tgsi_instruction_predicate token immediately follows.
+ * If Predicate is TRUE, tgsi_src_register token immediately follows. Only
+ * the File, Index, Negate and Swizzle* fields are valid. File must be set
+ * to TGSI_FILE_PREDICATE and Swizzle is either set to identity or replicate.
*
* Saturate controls how are final results in destination registers modified.
*/
@@ -350,21 +352,6 @@ struct tgsi_instruction_texture
unsigned Padding : 24;
};
-/*
- * For SM3, the following constraint applies.
- * - Swizzle is either set to identity or replicate.
- */
-struct tgsi_instruction_predicate
-{
- int Index : 16; /* SINT */
- unsigned SwizzleX : 2; /* TGSI_SWIZZLE_x */
- unsigned SwizzleY : 2; /* TGSI_SWIZZLE_x */
- unsigned SwizzleZ : 2; /* TGSI_SWIZZLE_x */
- unsigned SwizzleW : 2; /* TGSI_SWIZZLE_x */
- unsigned Negate : 1; /* BOOL */
- unsigned Padding : 7;
-};
-
/**
* File specifies the register array to access.
*
@@ -396,23 +383,12 @@ struct tgsi_src_register
};
/**
- * If tgsi_src_register::Modifier is TRUE, tgsi_src_register_modifier follows.
- *
- * Then, if tgsi_src_register::Indirect is TRUE, another tgsi_src_register
- * follows.
+ * If tgsi_src_register::Indirect is TRUE, tgsi_src_register follows.
*
- * Then, if tgsi_src_register::Dimension is TRUE, tgsi_dimension follows.
+ * If tgsi_src_register::Dimension is TRUE, tgsi_src_register follows.
+ * Only the Indirect, Dimension and Index fields are valid.
*/
-
-struct tgsi_dimension
-{
- unsigned Indirect : 1; /* BOOL */
- unsigned Dimension : 1; /* BOOL */
- unsigned Padding : 14;
- int Index : 16; /* SINT */
-};
-
struct tgsi_dst_register
{
unsigned File : 4; /* TGSI_FILE_ */
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
