commit dcbb5537584117430b3ad6ce4e2c0819b471e30c
author Michael Lentine <mlentine@google.com> Tue Nov 24 09:50:46 2015 -0600
committer Mark Lobodzinski <mark@lunarg.com> Thu Nov 26 13:09:10 2015 -0700
tree 740a0c0fb3b3fd0acfe31cb85928e8004445e1b3
parent 55a913ff3679e31a0c8abe3c767c1bcd5831be4b

tests: Fix android build

tests/vktestframeworkandroid.cpp

diff --git a/tests/vktestframeworkandroid.cpp b/tests/vktestframeworkandroid.cpp
index fabfa95..8b09d79 100644
--- a/tests/vktestframeworkandroid.cpp
+++ b/tests/vktestframeworkandroid.cpp
@@ -28,9 +28,9 @@
 
 bool VkTestFramework::m_use_glsl = true;
 
-bool VkTestFramework::GLSLtoSPV(const VkShaderStage shader_type,
-                                 const char *pshader,
-                                 std::vector<unsigned int> &spirv)
+bool VkTestFramework::GLSLtoSPV(const VkShaderStageFlagBits shader_type,
+                                const char *pshader,
+                                std::vector<unsigned int> &spv)
 {
     assert(false);
 }

tests/vktestframeworkandroid.h

diff --git a/tests/vktestframeworkandroid.h b/tests/vktestframeworkandroid.h
index bcd3f03..00ade20 100644
--- a/tests/vktestframeworkandroid.h
+++ b/tests/vktestframeworkandroid.h
@@ -47,7 +47,7 @@
     static void InitArgs(int *argc, char *argv[]);
     static void Finish();
 
-    bool GLSLtoSPV(const VkShaderStage shader_type,
+    bool GLSLtoSPV(const VkShaderStageFlagBits shader_type,
                    const char *pshader,
                    std::vector<unsigned int> &spv);