GNOME.org
 

[gtk+/wip/otte/shader: 169/176] gsksl: Move access chain API to GskSlVariable

commit c580277fd989cc805e565f41397fe605d6f20b06
Author: Benjamin Otte <otte redhat com>
Date:   Tue Oct 24 04:47:56 2017 +0200

    gsksl: Move access chain API to GskSlVariable
    
    An access chain is used to access a variable after all.

 gsk/gskslexpression.c      |    2 +-
 gsk/gskslvariable.c        |  255 +++++++++++++++++++++++++++++++++++++++++++-
 gsk/gskslvariableprivate.h |   19 +++-
 gsk/gskspvwriter.c         |  251 -------------------------------------------
 gsk/gskspvwriterprivate.h  |   16 ---
 5 files changed, 273 insertions(+), 270 deletions(-)
---
diff --git a/gsk/gskslexpression.c b/gsk/gskslexpression.c
index e57d23a..8d2dc9b 100644
--- a/gsk/gskslexpression.c
+++ b/gsk/gskslexpression.c
@@ -829,7 +829,7 @@ gsk_sl_expression_reference_get_spv_access_chain (const GskSlExpression *express
 {
   GskSlExpressionReference *reference = (GskSlExpressionReference *) expression;
 
-  return gsk_spv_access_chain_new (writer, reference->variable);
+  return gsk_sl_variable_get_access_chain (reference->variable, writer);
 }
 
 static const GskSlExpressionClass GSK_SL_EXPRESSION_REFERENCE = {
diff --git a/gsk/gskslvariable.c b/gsk/gskslvariable.c
index b0f20df..10da0c2 100644
--- a/gsk/gskslvariable.c
+++ b/gsk/gskslvariable.c
@@ -20,6 +20,7 @@
 
 #include "gskslvariableprivate.h"
 
+#include "gskslexpressionprivate.h"
 #include "gskslprinterprivate.h"
 #include "gskslqualifierprivate.h"
 #include "gsksltypeprivate.h"
@@ -527,7 +528,7 @@ gsk_sl_variable_is_constant (const GskSlVariable *variable)
   return gsk_sl_qualifier_is_constant (&variable->qualifier);
 }
 
-gboolean
+static gboolean
 gsk_sl_variable_is_direct_access_spv (const GskSlVariable *variable)
 {
   return variable->class->is_direct_access_spv (variable);
@@ -555,3 +556,255 @@ gsk_sl_variable_store_spv (GskSlVariable *variable,
   variable->class->store_spv (variable, writer, value);
 }
 
+/* ACCESS CHAIN */
+
+struct _GskSpvAccessChain
+{
+  GskSpvWriter *writer;
+  GskSlVariable *variable;
+  GskSlType *type;
+  GArray *chain;
+  GSList *pending_indexes;
+  guint32 swizzle[4];
+  guint swizzle_length;
+};
+
+GskSpvAccessChain *
+gsk_sl_variable_get_access_chain (GskSlVariable *variable,
+                                  GskSpvWriter  *writer)
+{
+  GskSpvAccessChain *chain;
+
+  if (!gsk_sl_variable_is_direct_access_spv (variable))
+    return NULL;
+
+  chain = g_slice_new0 (GskSpvAccessChain);
+
+  chain->writer = gsk_spv_writer_ref (writer);
+  chain->variable = gsk_sl_variable_ref (variable);
+  chain->type = gsk_sl_type_ref (gsk_sl_variable_get_type (variable));
+
+  return chain;
+}
+
+void
+gsk_spv_access_chain_free (GskSpvAccessChain *chain)
+{
+  if (chain->chain)
+    g_array_free (chain->chain, TRUE);
+  g_slist_free_full (chain->pending_indexes, (GDestroyNotify) gsk_sl_expression_unref);
+  gsk_sl_type_unref (chain->type);
+  gsk_sl_variable_unref (chain->variable);
+  gsk_spv_writer_unref (chain->writer);
+
+  g_slice_free (GskSpvAccessChain, chain);
+}
+
+void
+gsk_spv_access_chain_add_index (GskSpvAccessChain *chain,
+                                GskSlType         *type,
+                                guint32            index_id)
+{
+  g_assert (!gsk_spv_access_chain_has_swizzle (chain));
+
+  if (chain->chain == NULL)
+    chain->chain = g_array_new (FALSE, FALSE, sizeof (guint32));
+  gsk_sl_type_unref (chain->type);
+  chain->type = gsk_sl_type_ref (type);
+
+  g_array_append_val (chain->chain, index_id);
+}
+
+void
+gsk_spv_access_chain_add_dynamic_index (GskSpvAccessChain *chain,
+                                        GskSlType         *type,
+                                        GskSlExpression   *expr)
+{
+  gsk_spv_access_chain_add_index (chain, type, 0);
+
+  chain->pending_indexes = g_slist_prepend (chain->pending_indexes, gsk_sl_expression_ref (expr));
+}
+
+gboolean
+gsk_spv_access_chain_has_swizzle (GskSpvAccessChain *chain)
+{
+  return chain->swizzle_length > 0;
+}
+
+void
+gsk_spv_access_chain_swizzle (GskSpvAccessChain *chain,
+                              const guint       *indexes,
+                              guint              length)
+{
+  guint tmp[4];
+  guint i;
+
+  if (length == 1)
+    {
+      GskSlValue *value;
+      guint32 new_index;
+
+      if (chain->swizzle_length != 0)
+        new_index = chain->swizzle[indexes[0]];
+      else
+        new_index = indexes[0];
+      chain->swizzle_length = 0;
+
+      value = gsk_sl_value_new_for_data (gsk_sl_type_get_scalar (GSK_SL_UINT),
+                                         &new_index,
+                                         NULL, NULL);
+      gsk_spv_access_chain_add_index (chain,
+                                      gsk_sl_type_get_index_type (chain->type),
+                                      gsk_spv_writer_get_id_for_value (chain->writer, value));
+      gsk_sl_value_free (value);
+      return;
+    }
+
+  if (chain->swizzle_length != 0)
+    {
+      g_assert (length <= chain->swizzle_length);
+
+      for (i = 0; i < length; i++)
+        {
+          tmp[i] = chain->swizzle[indexes[i]];
+        }
+      indexes = tmp;
+    }
+
+  /* Mean trick to do optimization: We only assign a swizzle_length
+   * If something is actually swizzled. If we're doing an identity
+   * swizzle, ignore it.
+   */
+  if (length < gsk_sl_type_get_n_components (chain->type))
+    chain->swizzle_length = length;
+  else
+    chain->swizzle_length = 0;
+
+  for (i = 0; i < length; i++)
+    {
+      chain->swizzle[i] = indexes[i];
+      if (indexes[i] != i)
+        chain->swizzle_length = length;
+    }
+}
+
+static void
+gsk_spv_access_resolve_pending (GskSpvAccessChain *chain)
+{
+  GSList *l;
+  guint i;
+
+  if (chain->pending_indexes == NULL)
+    return;
+  
+  i = chain->chain->len;
+  l = chain->pending_indexes;
+  while (i-- > 0)
+    {
+      if (g_array_index (chain->chain, guint32, i) != 0)
+        continue;
+
+      g_array_index (chain->chain, guint32, i) = gsk_sl_expression_write_spv (l->data, chain->writer, NULL);
+      l = l->next;
+    }
+
+  g_slist_free_full (chain->pending_indexes, (GDestroyNotify) gsk_sl_expression_unref);
+  chain->pending_indexes = NULL;
+}
+
+static guint32
+gsk_spv_access_get_variable (GskSpvAccessChain *chain)
+{
+  guint32 variable_id;
+    
+  gsk_spv_access_resolve_pending (chain);
+
+  variable_id = gsk_spv_writer_get_id_for_variable (chain->writer,
+                                                    chain->variable);
+
+  if (chain->chain)
+    variable_id = gsk_spv_writer_access_chain (chain->writer,
+                                               chain->type,
+                                               gsk_sl_qualifier_get_storage_class 
(gsk_sl_variable_get_qualifier (chain->variable),
+                                                                                   gsk_sl_variable_get_type 
(chain->variable)),
+                                               variable_id,
+                                               (guint32 *) chain->chain->data,
+                                               chain->chain->len);
+
+  return variable_id;
+}
+
+static GskSlType *
+gsk_spv_access_chain_get_swizzle_type (GskSpvAccessChain *chain)
+{
+  g_assert (chain->swizzle_length != 0);
+
+  if (chain->swizzle_length == 1)
+    return gsk_sl_type_get_scalar (gsk_sl_type_get_scalar_type (chain->type));
+  else
+    return gsk_sl_type_get_vector (gsk_sl_type_get_scalar_type (chain->type), chain->swizzle_length);
+}
+
+guint32
+gsk_spv_access_chain_load (GskSpvAccessChain *chain)
+{
+  guint result_id;
+  
+  result_id = gsk_spv_writer_load (chain->writer,
+                                   chain->type,
+                                   gsk_spv_access_get_variable (chain),
+                                   0);
+
+  if (chain->swizzle_length)
+    result_id = gsk_spv_writer_vector_shuffle (chain->writer,
+                                               gsk_spv_access_chain_get_swizzle_type (chain),
+                                               result_id,
+                                               result_id,
+                                               chain->swizzle,
+                                               chain->swizzle_length);
+
+  return result_id;
+}
+
+void
+gsk_spv_access_chain_store (GskSpvAccessChain *chain,
+                            guint32            value)
+{
+  guint32 chain_id;
+  
+  chain_id = gsk_spv_access_get_variable (chain);
+
+  if (chain->swizzle_length)
+    {
+      guint32 indexes[4] = { 0, };
+      guint32 merge;
+      guint i, n;
+      
+      merge = gsk_spv_writer_load (chain->writer,
+                                   chain->type,
+                                   chain_id,
+                                   0);
+
+      n = gsk_sl_type_get_n_components (chain->type);
+      for (i = 0; i < n; i++)
+        {
+          if (i < chain->swizzle_length)
+            indexes[chain->swizzle[i]] = n + i;
+          if (indexes[i] == 0)
+            indexes[i] = i;
+        }
+
+      value = gsk_spv_writer_vector_shuffle (chain->writer,
+                                             chain->type,
+                                             merge,
+                                             value,
+                                             indexes,
+                                             n);
+    }
+
+  gsk_spv_writer_store (chain->writer,
+                        chain_id,
+                        value,
+                        0);
+}
+
diff --git a/gsk/gskslvariableprivate.h b/gsk/gskslvariableprivate.h
index 5d59cd9..cf38c2b 100644
--- a/gsk/gskslvariableprivate.h
+++ b/gsk/gskslvariableprivate.h
@@ -47,7 +47,9 @@ const char *            gsk_sl_variable_get_name                (const GskSlVari
 const GskSlValue *      gsk_sl_variable_get_initial_value       (const GskSlVariable    *variable);
 gboolean                gsk_sl_variable_is_constant             (const GskSlVariable    *variable);
 
-gboolean                gsk_sl_variable_is_direct_access_spv    (const GskSlVariable    *variable);
+GskSpvAccessChain *     gsk_sl_variable_get_access_chain        (GskSlVariable          *variable,
+                                                                 GskSpvWriter           *writer);
+                                                                 
 guint32                 gsk_sl_variable_write_spv               (const GskSlVariable    *variable,
                                                                  GskSpvWriter           *writer);
 guint32                 gsk_sl_variable_load_spv                (GskSlVariable          *variable,
@@ -56,6 +58,21 @@ void                    gsk_sl_variable_store_spv               (GskSlVariable
                                                                  GskSpvWriter           *writer,
                                                                  guint32                 value);
 
+void                    gsk_spv_access_chain_free               (GskSpvAccessChain      *chain);
+void                    gsk_spv_access_chain_add_index          (GskSpvAccessChain      *chain,
+                                                                 GskSlType              *type,
+                                                                 guint32                 index_id);
+void                    gsk_spv_access_chain_add_dynamic_index  (GskSpvAccessChain      *chain,
+                                                                 GskSlType              *type,
+                                                                 GskSlExpression        *expr);
+void                    gsk_spv_access_chain_swizzle            (GskSpvAccessChain      *chain,
+                                                                 const guint            *indexes,
+                                                                 guint                   n_indexes);
+gboolean                gsk_spv_access_chain_has_swizzle        (GskSpvAccessChain      *chain);
+guint32                 gsk_spv_access_chain_load               (GskSpvAccessChain      *chain);
+void                    gsk_spv_access_chain_store              (GskSpvAccessChain      *chain,
+                                                                 guint32                 value);
+
 G_END_DECLS
 
 #endif /* __GSK_SL_VARIABLE_PRIVATE_H__ */
diff --git a/gsk/gskspvwriter.c b/gsk/gskspvwriter.c
index 7dbe4c0..b4a5fb8 100644
--- a/gsk/gskspvwriter.c
+++ b/gsk/gskspvwriter.c
@@ -20,7 +20,6 @@
 
 #include "gskspvwriterprivate.h"
 
-#include "gskslexpressionprivate.h"
 #include "gskslfunctionprivate.h"
 #include "gskslfunctiontypeprivate.h"
 #include "gskslimagetypeprivate.h"
@@ -808,253 +807,3 @@ gsk_spv_writer_convert (GskSpvWriter *writer,
     }
 }
 
-struct _GskSpvAccessChain
-{
-  GskSpvWriter *writer;
-  GskSlVariable *variable;
-  GskSlType *type;
-  GArray *chain;
-  GSList *pending_indexes;
-  guint32 swizzle[4];
-  guint swizzle_length;
-};
-
-GskSpvAccessChain *
-gsk_spv_access_chain_new (GskSpvWriter  *writer,
-                          GskSlVariable *variable)
-{
-  GskSpvAccessChain *chain;
-
-  if (!gsk_sl_variable_is_direct_access_spv (variable))
-    return NULL;
-
-  chain = g_slice_new0 (GskSpvAccessChain);
-
-  chain->writer = gsk_spv_writer_ref (writer);
-  chain->variable = gsk_sl_variable_ref (variable);
-  chain->type = gsk_sl_type_ref (gsk_sl_variable_get_type (variable));
-
-  return chain;
-}
-
-void
-gsk_spv_access_chain_free (GskSpvAccessChain *chain)
-{
-  if (chain->chain)
-    g_array_free (chain->chain, TRUE);
-  g_slist_free_full (chain->pending_indexes, (GDestroyNotify) gsk_sl_expression_unref);
-  gsk_sl_type_unref (chain->type);
-  gsk_sl_variable_unref (chain->variable);
-  gsk_spv_writer_unref (chain->writer);
-
-  g_slice_free (GskSpvAccessChain, chain);
-}
-
-void
-gsk_spv_access_chain_add_index (GskSpvAccessChain *chain,
-                                GskSlType         *type,
-                                guint32            index_id)
-{
-  g_assert (!gsk_spv_access_chain_has_swizzle (chain));
-
-  if (chain->chain == NULL)
-    chain->chain = g_array_new (FALSE, FALSE, sizeof (guint32));
-  gsk_sl_type_unref (chain->type);
-  chain->type = gsk_sl_type_ref (type);
-
-  g_array_append_val (chain->chain, index_id);
-}
-
-void
-gsk_spv_access_chain_add_dynamic_index (GskSpvAccessChain *chain,
-                                        GskSlType         *type,
-                                        GskSlExpression   *expr)
-{
-  gsk_spv_access_chain_add_index (chain, type, 0);
-
-  chain->pending_indexes = g_slist_prepend (chain->pending_indexes, gsk_sl_expression_ref (expr));
-}
-
-gboolean
-gsk_spv_access_chain_has_swizzle (GskSpvAccessChain *chain)
-{
-  return chain->swizzle_length > 0;
-}
-
-void
-gsk_spv_access_chain_swizzle (GskSpvAccessChain *chain,
-                              const guint       *indexes,
-                              guint              length)
-{
-  guint tmp[4];
-  guint i;
-
-  if (length == 1)
-    {
-      GskSlValue *value;
-      guint32 new_index;
-
-      if (chain->swizzle_length != 0)
-        new_index = chain->swizzle[indexes[0]];
-      else
-        new_index = indexes[0];
-      chain->swizzle_length = 0;
-
-      value = gsk_sl_value_new_for_data (gsk_sl_type_get_scalar (GSK_SL_UINT),
-                                         &new_index,
-                                         NULL, NULL);
-      gsk_spv_access_chain_add_index (chain,
-                                      gsk_sl_type_get_index_type (chain->type),
-                                      gsk_spv_writer_get_id_for_value (chain->writer, value));
-      gsk_sl_value_free (value);
-      return;
-    }
-
-  if (chain->swizzle_length != 0)
-    {
-      g_assert (length <= chain->swizzle_length);
-
-      for (i = 0; i < length; i++)
-        {
-          tmp[i] = chain->swizzle[indexes[i]];
-        }
-      indexes = tmp;
-    }
-
-  /* Mean trick to do optimization: We only assign a swizzle_length
-   * If something is actually swizzled. If we're doing an identity
-   * swizzle, ignore it.
-   */
-  if (length < gsk_sl_type_get_n_components (chain->type))
-    chain->swizzle_length = length;
-  else
-    chain->swizzle_length = 0;
-
-  for (i = 0; i < length; i++)
-    {
-      chain->swizzle[i] = indexes[i];
-      if (indexes[i] != i)
-        chain->swizzle_length = length;
-    }
-}
-
-static void
-gsk_spv_access_resolve_pending (GskSpvAccessChain *chain)
-{
-  GSList *l;
-  guint i;
-
-  if (chain->pending_indexes == NULL)
-    return;
-  
-  i = chain->chain->len;
-  l = chain->pending_indexes;
-  while (i-- > 0)
-    {
-      if (g_array_index (chain->chain, guint32, i) != 0)
-        continue;
-
-      g_array_index (chain->chain, guint32, i) = gsk_sl_expression_write_spv (l->data, chain->writer, NULL);
-      l = l->next;
-    }
-
-  g_slist_free_full (chain->pending_indexes, (GDestroyNotify) gsk_sl_expression_unref);
-  chain->pending_indexes = NULL;
-}
-
-static guint32
-gsk_spv_access_get_variable (GskSpvAccessChain *chain)
-{
-  guint32 variable_id;
-    
-  gsk_spv_access_resolve_pending (chain);
-
-  variable_id = gsk_spv_writer_get_id_for_variable (chain->writer,
-                                                    chain->variable);
-
-  if (chain->chain)
-    variable_id = gsk_spv_writer_access_chain (chain->writer,
-                                               chain->type,
-                                               gsk_sl_qualifier_get_storage_class 
(gsk_sl_variable_get_qualifier (chain->variable),
-                                                                                   gsk_sl_variable_get_type 
(chain->variable)),
-                                               variable_id,
-                                               (guint32 *) chain->chain->data,
-                                               chain->chain->len);
-
-  return variable_id;
-}
-
-static GskSlType *
-gsk_spv_access_chain_get_swizzle_type (GskSpvAccessChain *chain)
-{
-  g_assert (chain->swizzle_length != 0);
-
-  if (chain->swizzle_length == 1)
-    return gsk_sl_type_get_scalar (gsk_sl_type_get_scalar_type (chain->type));
-  else
-    return gsk_sl_type_get_vector (gsk_sl_type_get_scalar_type (chain->type), chain->swizzle_length);
-}
-
-guint32
-gsk_spv_access_chain_load (GskSpvAccessChain *chain)
-{
-  guint result_id;
-  
-  result_id = gsk_spv_writer_load (chain->writer,
-                                   chain->type,
-                                   gsk_spv_access_get_variable (chain),
-                                   0);
-
-  if (chain->swizzle_length)
-    result_id = gsk_spv_writer_vector_shuffle (chain->writer,
-                                               gsk_spv_access_chain_get_swizzle_type (chain),
-                                               result_id,
-                                               result_id,
-                                               chain->swizzle,
-                                               chain->swizzle_length);
-
-  return result_id;
-}
-
-void
-gsk_spv_access_chain_store (GskSpvAccessChain *chain,
-                            guint32            value)
-{
-  guint32 chain_id;
-  
-  chain_id = gsk_spv_access_get_variable (chain);
-
-  if (chain->swizzle_length)
-    {
-      guint32 indexes[4] = { 0, };
-      guint32 merge;
-      guint i, n;
-      
-      merge = gsk_spv_writer_load (chain->writer,
-                                   chain->type,
-                                   chain_id,
-                                   0);
-
-      n = gsk_sl_type_get_n_components (chain->type);
-      for (i = 0; i < n; i++)
-        {
-          if (i < chain->swizzle_length)
-            indexes[chain->swizzle[i]] = n + i;
-          if (indexes[i] == 0)
-            indexes[i] = i;
-        }
-
-      value = gsk_spv_writer_vector_shuffle (chain->writer,
-                                             chain->type,
-                                             merge,
-                                             value,
-                                             indexes,
-                                             n);
-    }
-
-  gsk_spv_writer_store (chain->writer,
-                        chain_id,
-                        value,
-                        0);
-}
-
diff --git a/gsk/gskspvwriterprivate.h b/gsk/gskspvwriterprivate.h
index bf84788..b9bcedd 100644
--- a/gsk/gskspvwriterprivate.h
+++ b/gsk/gskspvwriterprivate.h
@@ -98,22 +98,6 @@ void                    gsk_spv_writer_start_code_block         (GskSpvWriter
                                                                  guint32                 continue_id,
                                                                  guint32                 break_id);
 
-GskSpvAccessChain *     gsk_spv_access_chain_new                (GskSpvWriter           *writer,
-                                                                 GskSlVariable          *variable);
-void                    gsk_spv_access_chain_free               (GskSpvAccessChain      *chain);
-void                    gsk_spv_access_chain_add_index          (GskSpvAccessChain      *chain,
-                                                                 GskSlType              *type,
-                                                                 guint32                 index_id);
-void                    gsk_spv_access_chain_add_dynamic_index  (GskSpvAccessChain      *chain,
-                                                                 GskSlType              *type,
-                                                                 GskSlExpression        *expr);
-void                    gsk_spv_access_chain_swizzle            (GskSpvAccessChain      *chain,
-                                                                 const guint            *indexes,
-                                                                 guint                   n_indexes);
-gboolean                gsk_spv_access_chain_has_swizzle        (GskSpvAccessChain      *chain);
-guint32                 gsk_spv_access_chain_load               (GskSpvAccessChain      *chain);
-void                    gsk_spv_access_chain_store              (GskSpvAccessChain      *chain,
-                                                                 guint32                 value);
 
 #include "gskspvwritergeneratedprivate.h"
 #include "gskspvwritergeneratedglslprivate.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]