Move MatrixLoadFlags from vktTestCase.hpp

vktTestCase.hpp is wildly inappropriate place for such data type. Both
UBO and SSBO tests use it currently and it is now duplicated to both of
them. UBO and SSBO tests do contain a quite bit of duplication already
(describing blocks, layout computation, etc.) and dedup should be done
as a part of bigger refactoring.

Change-Id: I5d4b8a947522192ba0dd4e807e04c940c1770eef

diff --git a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.hpp b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.hpp
index 2cb765711366e1403b78191d05b892b6bd40f654..fe954dddf5f934241eb19798cccf492e68d448da 100644 (file)
--- a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.hpp
+++ b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.hpp
@@ -54,6 +54,12 @@ enum BufferVarFlags
        ACCESS_WRITE            = (1<<10),      //!< Buffer variable is written in the shader.
 };
 
+enum MatrixLoadFlags
+{
+       LOAD_FULL_MATRIX                = 0,
+       LOAD_MATRIX_COMPONENTS  = 1,
+};
+
 class BufferVar
 {
 public:

diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
index bb7cdef890367f35617c1e3043f4c1c39b747483..4f70d735a7ccf2632f3aad398c97c3aef4d3a51d 100644 (file)
--- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
+++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
@@ -61,6 +61,12 @@ enum UniformFlags
        UNUSED_BOTH                     = UNUSED_VERTEX|UNUSED_FRAGMENT
 };
 
+enum MatrixLoadFlags
+{
+       LOAD_FULL_MATRIX                = 0,
+       LOAD_MATRIX_COMPONENTS  = 1,
+};
+
 class StructType;
 
 class VarType

diff --git a/external/vulkancts/modules/vulkan/vktTestCase.hpp b/external/vulkancts/modules/vulkan/vktTestCase.hpp
index 2a99b1b34bef35f2fe04fcb274e9fd1bf4ee77c8..379d86c67a7dab44b70b08269f974cefbb4fbbd7 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktTestCase.hpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.hpp
@@ -45,12 +45,6 @@ struct SourceCollections;
 namespace vkt
 {
 
-enum MatrixLoadFlags
-{
-       LOAD_FULL_MATRIX                = 0,
-       LOAD_MATRIX_COMPONENTS  = 1,
-};
-
 class DefaultDevice;
 
 class Context