st/xorg: adjust enums in preperation for gradients

diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index 7fa36fda51e7538814c7db06ad32d61bf270b34d..c708ac317029443f1faf269d15ca6eece1121a23 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -393,8 +393,8 @@ bind_shaders(struct exa_context *exa, int op,
    if (pSrcPicture) {
       if (pSrcPicture->pSourcePict) {
          if (pSrcPicture->pSourcePict->type == SourcePictTypeSolidFill) {
-            fs_traits |= FS_FILL;
-            vs_traits |= VS_FILL;
+            fs_traits |= FS_SOLID_FILL;
+            vs_traits |= VS_SOLID_FILL;
             pixel_to_float4(pSrcPicture->pFormat,
                             pSrcPicture->pSourcePict->solidFill.color,
                             exa->solid_color);

diff --git a/src/gallium/state_trackers/xorg/xorg_exa_tgsi.h b/src/gallium/state_trackers/xorg/xorg_exa_tgsi.h
index 003e5d8caf4aad45b784bc91932b137966254002..1535a0c8c30c145f03389bb9cc47cd34a171fc74 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_exa_tgsi.h
+++ b/src/gallium/state_trackers/xorg/xorg_exa_tgsi.h
@@ -6,16 +6,24 @@
 enum xorg_vs_traits {
    VS_COMPOSITE        = 1 << 0,
    VS_MASK             = 1 << 1,
-   VS_FILL             = 1 << 2
-   /*VS_TRANSFORM      = 1 << 3*/
+   VS_SOLID_FILL       = 1 << 2,
+   VS_LINGRAD_FILL     = 1 << 3,
+   VS_RADGRAD_FILL     = 1 << 4,
+   VS_FILL             = (VS_SOLID_FILL |
+                          VS_LINGRAD_FILL |
+                          VS_RADGRAD_FILL)
+   /*VS_TRANSFORM      = 1 << 5*/
 };
 
 enum xorg_fs_traits {
    FS_COMPOSITE        = 1 << 0,
    FS_MASK             = 1 << 1,
-   FS_FILL             = 1 << 2,
-   FS_LINEAR_GRADIENT  = 1 << 3,
-   FS_RADIAL_GRADIENT  = 1 << 4
+   FS_SOLID_FILL       = 1 << 2,
+   FS_LINGRAD_FILL     = 1 << 3,
+   FS_RADGRAD_FILL     = 1 << 4,
+   FS_FILL             = (FS_SOLID_FILL |
+                          FS_LINGRAD_FILL |
+                          FS_RADGRAD_FILL)
 };
 
 struct xorg_shader {