CTS: move the shaders together into assets/shaders dir
Test: CtsGraphicsTestCases
Change-Id: Ifac829142f2733310ab6602560e36f3f636640e5
diff --git a/tests/tests/graphics/assets/passthrough_fsh.glsl b/tests/tests/graphics/assets/shaders/passthrough_fsh.glsl
similarity index 100%
rename from tests/tests/graphics/assets/passthrough_fsh.glsl
rename to tests/tests/graphics/assets/shaders/passthrough_fsh.glsl
diff --git a/tests/tests/graphics/assets/passthrough_fsh.spv b/tests/tests/graphics/assets/shaders/passthrough_fsh.spv
similarity index 100%
rename from tests/tests/graphics/assets/passthrough_fsh.spv
rename to tests/tests/graphics/assets/shaders/passthrough_fsh.spv
Binary files differ
diff --git a/tests/tests/graphics/assets/passthrough_vsh.glsl b/tests/tests/graphics/assets/shaders/passthrough_vsh.glsl
similarity index 100%
rename from tests/tests/graphics/assets/passthrough_vsh.glsl
rename to tests/tests/graphics/assets/shaders/passthrough_vsh.glsl
diff --git a/tests/tests/graphics/assets/passthrough_vsh.spv b/tests/tests/graphics/assets/shaders/passthrough_vsh.spv
similarity index 100%
rename from tests/tests/graphics/assets/passthrough_vsh.spv
rename to tests/tests/graphics/assets/shaders/passthrough_vsh.spv
Binary files differ
diff --git a/tests/tests/graphics/jni/VulkanTestHelpers.cpp b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
index 17d952f..bfe94ee 100644
--- a/tests/tests/graphics/jni/VulkanTestHelpers.cpp
+++ b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
@@ -647,7 +647,7 @@
{
AAsset *vertFile =
AAssetManager_open(AAssetManager_fromJava(env, assetMgr),
- "passthrough_vsh.spv", AASSET_MODE_BUFFER);
+ "shaders/passthrough_vsh.spv", AASSET_MODE_BUFFER);
ASSERT(vertFile);
size_t vertShaderLength = AAsset_getLength(vertFile);
std::vector<uint8_t> vertShader;
@@ -658,7 +658,7 @@
AAsset *pixelFile =
AAssetManager_open(AAssetManager_fromJava(env, assetMgr),
- "passthrough_fsh.spv", AASSET_MODE_BUFFER);
+ "shaders/passthrough_fsh.spv", AASSET_MODE_BUFFER);
ASSERT(pixelFile);
size_t pixelShaderLength = AAsset_getLength(pixelFile);
std::vector<uint8_t> pixelShader;
