From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 24 Jul 2017 00:11:04 +0000 (+1000)
Subject: glsl: add get_internal_ifc_packing() type helper
X-Git-Tag: upstream/18.1.0~6660
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12e1f0c69676c256279f29309c36ece584f02c17;p=platform%2Fupstream%2Fmesa.git

glsl: add get_internal_ifc_packing() type helper

This is used to avoid code duplication when selecting the
packing type for shared and packed layouts.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index f67465e..3c18f6c 100644
--- a/src/compiler/glsl_types.h
+++ b/src/compiler/glsl_types.h
@@ -817,6 +817,27 @@ struct glsl_type {
    }
 
    /**
+    * Get the type interface packing used internally. For shared and packing
+    * layouts this is implementation defined.
+    */
+   enum glsl_interface_packing get_internal_ifc_packing(bool std430_supported) const
+   {
+      enum glsl_interface_packing packing = this->get_interface_packing();
+      if (packing == GLSL_INTERFACE_PACKING_STD140 ||
+          (!std430_supported &&
+           (packing == GLSL_INTERFACE_PACKING_SHARED ||
+            packing == GLSL_INTERFACE_PACKING_PACKED))) {
+         return GLSL_INTERFACE_PACKING_STD140;
+      } else {
+         assert(packing == GLSL_INTERFACE_PACKING_STD430 ||
+                (std430_supported &&
+                 (packing == GLSL_INTERFACE_PACKING_SHARED ||
+                  packing == GLSL_INTERFACE_PACKING_PACKED)));
+         return GLSL_INTERFACE_PACKING_STD430;
+      }
+   }
+
+   /**
     * Check if the type interface is row major
     */
    bool get_interface_row_major() const