resolve merge conflicts of cfeb3c0 to nyc-dev
am: 518f489214

* commit '518f4892140466feacb6c7c772357c76a86c3a27':
  Remove GLES2-texture.wrap tests from mustpass

Change-Id: I23fadf595d2733a9898baedd17e8e6fe9679fa63
tree: 0499a82b4b6536377735d7314e0ba60b262229a4
  1. android/
  2. data/
  3. doc/
  4. execserver/
  5. executor/
  6. external/
  7. framework/
  8. modules/
  9. scripts/
  10. targets/
  11. .gitignore
  12. Android.mk
  13. CMakeLists.txt
  14. LICENSE
  15. MODULE_LICENSE_APACHE2
  16. NOTICE
  17. README.md
README.md

dEQP README

This repository contains a GPU testing suite called dEQP (drawElements Quality Program). dEQP contains tests for several graphics APIs, including OpenGL ES, EGL, and Vulkan.

Documentation

Up-to-date documentation for the dEQP is available at Android Open Source Project site.

Khronos Vulkan Conformance Tests

This repository includes Khronos Vulkan CTS under external/vulkancts directory. For more information see Vulkan CTS README.