projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
[platform/upstream/VK-GL-CTS.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
fa93f8b
..
e567d55
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-270,6
+270,7
@@
LOCAL_SRC_FILES := \
modules/egl/teglCreateContextExtTests.cpp \
modules/egl/teglCreateContextTests.cpp \
modules/egl/teglCreateSurfaceTests.cpp \
modules/egl/teglCreateContextExtTests.cpp \
modules/egl/teglCreateContextTests.cpp \
modules/egl/teglCreateSurfaceTests.cpp \
+ modules/egl/teglGetFrameTimestampsTests.cpp \
modules/egl/teglGetProcAddressTests.cpp \
modules/egl/teglGLES1RenderUtil.cpp \
modules/egl/teglGLES2RenderUtil.cpp \
modules/egl/teglGetProcAddressTests.cpp \
modules/egl/teglGLES1RenderUtil.cpp \
modules/egl/teglGLES2RenderUtil.cpp \
@@
-295,6
+296,7
@@
LOCAL_SRC_FILES := \
modules/egl/teglQuerySurfaceTests.cpp \
modules/egl/teglRenderCase.cpp \
modules/egl/teglRenderTests.cpp \
modules/egl/teglQuerySurfaceTests.cpp \
modules/egl/teglRenderCase.cpp \
modules/egl/teglRenderTests.cpp \
+ modules/egl/teglRobustnessTests.cpp \
modules/egl/teglResizeTests.cpp \
modules/egl/teglSimpleConfigCase.cpp \
modules/egl/teglSurfacelessContextTests.cpp \
modules/egl/teglResizeTests.cpp \
modules/egl/teglSimpleConfigCase.cpp \
modules/egl/teglSurfacelessContextTests.cpp \
@@
-591,6
+593,7
@@
LOCAL_SRC_FILES := \
modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \
modules/gles31/functional/es31fNegativeShaderStorageTests.cpp \
modules/gles31/functional/es31fNegativeStateApiTests.cpp \
modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \
modules/gles31/functional/es31fNegativeShaderStorageTests.cpp \
modules/gles31/functional/es31fNegativeStateApiTests.cpp \
+ modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp \
modules/gles31/functional/es31fNegativeTessellationTests.cpp \
modules/gles31/functional/es31fNegativeTestShared.cpp \
modules/gles31/functional/es31fNegativeTextureApiTests.cpp \
modules/gles31/functional/es31fNegativeTessellationTests.cpp \
modules/gles31/functional/es31fNegativeTestShared.cpp \
modules/gles31/functional/es31fNegativeTextureApiTests.cpp \
@@
-639,6
+642,7
@@
LOCAL_SRC_FILES := \
modules/gles31/functional/es31fVertexAttributeBindingTests.cpp \
modules/gles31/functional/es31fCopyImageTests.cpp \
modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp \
modules/gles31/functional/es31fVertexAttributeBindingTests.cpp \
modules/gles31/functional/es31fCopyImageTests.cpp \
modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp \
+ modules/gles31/functional/es31fSRGBDecodeTests.cpp \
modules/gles31/stress/es31sDrawTests.cpp \
modules/gles31/stress/es31sStressTests.cpp \
modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp \
modules/gles31/stress/es31sDrawTests.cpp \
modules/gles31/stress/es31sStressTests.cpp \
modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp \
@@
-905,6
+909,9
@@
LOCAL_SRC_FILES := \
external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \
external/vulkancts/modules/vulkan/vktTestPackage.cpp \
external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \
external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \
external/vulkancts/modules/vulkan/vktTestPackage.cpp \
external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \
+ external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp \
+ external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp \
+ external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp \
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
@@
-982,6
+989,7
@@
deqp_compile_flags := \
-DDEQP_GLES2_RUNTIME_LOAD=1 \
-DQP_SUPPORT_PNG=1 \
-Wconversion \
-DDEQP_GLES2_RUNTIME_LOAD=1 \
-DQP_SUPPORT_PNG=1 \
-Wconversion \
+ -fwrapv \
-Wno-sign-conversion
LOCAL_SHARED_LIBRARIES := \
-Wno-sign-conversion
LOCAL_SHARED_LIBRARIES := \
@@
-1001,7
+1009,7
@@
LOCAL_CFLAGS += \
$(deqp_compile_flags)
LOCAL_SDK_VERSION := 22
$(deqp_compile_flags)
LOCAL_SDK_VERSION := 22
-LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -
fwrapv
+LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -
Wno-delete-non-virtual-dtor
LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_RTTI_FLAG := -frtti -fexceptions
LOCAL_MULTILIB := both
LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_RTTI_FLAG := -frtti -fexceptions
LOCAL_MULTILIB := both