Cold-Air-Networks/mirror-vk-gl-cts
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'aosp/master' into deqp-dev

Browse source 
Change-Id: Ic7c969b1b52cf6b3fee8e8879508bf13de9a354e
This commit is contained in:
Chris Forbes 2018-08-24 09:14:03 -07:00
commit 7e29b7f15a
15 changed files with 134 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -65,4 +65,4 @@ include $(BUILD_SHARED_LIBRARY)
# Build the test APKs using their own makefiles
# include $(call all-makefiles-under,$(LOCAL_PATH)/android)
include $(LOCAL_PATH)/android/package/Android.mk $(LOCAL_PATH)/android/cts/Android.mk
include $(LOCAL_PATH)/android/package/Android.mk

60
android/cts/Android.bp Normal file
View file

@ -0,0 +1,60 @@
// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
filegroup {
name: "deqp_master_caselists",
srcs: [
"master/*.txt",
],
path: "master",
}
genrule {
name: "deqp_nyc_caselists",
srcs: [
"nyc/vk-master.txt",
"nyc/gles31-master.txt",
"nyc/egl-master.txt",
],
out: [
"nyc-vk-master.txt",
"nyc-gles31-master.txt",
"nyc-egl-master.txt",
],
cmd: "for i in $(in); do cp $$i $(genDir)/nyc-$$(basename $$i); done",
}
java_test_host {
name: "CtsDeqpTestCases",
// Tag this module as a cts test artifact
test_suites: [
"cts",
"vts",
"general-tests",
],
srcs: ["runner/src/**/*.java"],
libs: [
"cts-tradefed",
"compatibility-host-util",
"tradefed",
],
data: [
":deqp_master_caselists",
":deqp_nyc_caselists",
],
}

42
android/cts/Android.mk
View file

@ -1,42 +0,0 @@
# Copyright (C) 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := CtsDeqpTestCases
LOCAL_MODULE_TAGS := optional
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_SDK_VERSION := 22
LOCAL_SRC_FILES := $(call all-java-files-under, runner/src)
LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed
DEQP_CASELISTS:=$(sort $(patsubst master/%,%, \
$(shell cd $(LOCAL_PATH) ; \
find -L master -maxdepth 1 -name "*.txt") \
))
LOCAL_COMPATIBILITY_SUPPORT_FILES := $(foreach file, $(DEQP_CASELISTS), $(LOCAL_PATH)/master/$(file):$(file))
LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/vk-master.txt:nyc-vk-master.txt
LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/gles31-master.txt:nyc-gles31-master.txt
LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/egl-master.txt:nyc-egl-master.txt
include $(BUILD_HOST_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

3
android/cts/master/src/vk-test-issues.txt
View file

@ -25,3 +25,6 @@ dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.li
# Issue 702: Tests use invalid conversion operations
dEQP-VK.spirv_assembly.instruction.*.indexing.*u32*
dEQP-VK.spirv_assembly.instruction.*.indexing.*s32*
# b/112540895: Compile time is still unreasonable on low-end parts, revisit for Q
dEQP-VK.ubo.random.all_shared_buffer.48

1
android/cts/master/vk-master.txt
View file

@ -263074,7 +263074,6 @@ dEQP-VK.ubo.random.all_shared_buffer.44
dEQP-VK.ubo.random.all_shared_buffer.45
dEQP-VK.ubo.random.all_shared_buffer.46
dEQP-VK.ubo.random.all_shared_buffer.47
dEQP-VK.ubo.random.all_shared_buffer.48
dEQP-VK.ubo.random.all_shared_buffer.49
dEQP-VK.ubo.random.all_out_of_order_offsets.0
dEQP-VK.ubo.random.all_out_of_order_offsets.1

20
android/cts/runner/Android.mk
View file

@ -1,20 +0,0 @@
# Copyright (C) 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Build all sub-directories
include $(call all-makefiles-under,$(LOCAL_PATH))

32
android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
View file

@ -2097,6 +2097,22 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
mIncludeFilters.addAll(filters);
}
/**
* {@inheritDoc}
*/
@Override
public Set<String> getIncludeFilters() {
return new HashSet<>(mIncludeFilters);
}
/**
* {@inheritDoc}
*/
@Override
public void clearIncludeFilters() {
mIncludeFilters.clear();
}
/**
* {@inheritDoc}
*/
@ -2113,6 +2129,22 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
mExcludeFilters.addAll(filters);
}
/**
* {@inheritDoc}
*/
@Override
public Set<String> getExcludeFilters() {
return new HashSet<>(mExcludeFilters);
}
/**
* {@inheritDoc}
*/
@Override
public void clearExcludeFilters() {
mExcludeFilters.clear();
}
/**
* {@inheritDoc}
*/

28
android/cts/runner/tests/Android.bp Normal file
View file

@ -0,0 +1,28 @@
// Copyright (C) 2010 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
java_test_host {
name: "CtsDeqpRunnerTests",
// Only compile source java files in this lib.
srcs: ["src/**/*.java"],
libs: [
"cts-tradefed",
"compatibility-host-util",
"tradefed",
"CtsDeqpTestCases",
],
static_libs: ["easymock"],
}

27
android/cts/runner/tests/Android.mk
View file

@ -1,27 +0,0 @@
# Copyright (C) 2010 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Only compile source java files in this lib.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := CtsDeqpRunnerTests
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed CtsDeqpTestCases
LOCAL_STATIC_JAVA_LIBRARIES := easymock
include $(BUILD_HOST_JAVA_LIBRARY)

1
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl vendored
View file

@ -6152,6 +6152,7 @@ std::ostream& operator<< (std::ostream& s, const VkAndroidHardwareBufferFormatPr
s << "\tformat = " << value.format << '\n';
s << "\texternalFormat = " << value.externalFormat << '\n';
s << "\tformatFeatures = " << getFormatFeatureFlagsStr(value.formatFeatures) << '\n';
s << "\tsamplerYcbcrConversionComponents = " << value.samplerYcbcrConversionComponents << '\n';
s << "\tsuggestedYcbcrModel = " << value.suggestedYcbcrModel << '\n';
s << "\tsuggestedYcbcrRange = " << value.suggestedYcbcrRange << '\n';
s << "\tsuggestedXChromaOffset = " << value.suggestedXChromaOffset << '\n';

1
external/vulkancts/framework/vulkan/vkStructTypes.inl vendored
View file

@ -2925,6 +2925,7 @@ struct VkAndroidHardwareBufferFormatPropertiesANDROID
VkFormat format;
deUint64 externalFormat;
VkFormatFeatureFlags formatFeatures;
VkComponentMapping samplerYcbcrConversionComponents;
VkSamplerYcbcrModelConversion suggestedYcbcrModel;
VkSamplerYcbcrRange suggestedYcbcrRange;
VkChromaLocation suggestedXChromaOffset;

1
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp vendored
View file

@ -3816,6 +3816,7 @@ bool ValidateAHardwareBuffer(vk::VkFormat format, deUint64 requiredAhbUsage, con
vk::VK_FORMAT_UNDEFINED,
0u,
0u,
{ vk::VK_COMPONENT_SWIZZLE_IDENTITY, vk::VK_COMPONENT_SWIZZLE_IDENTITY, vk::VK_COMPONENT_SWIZZLE_IDENTITY, vk::VK_COMPONENT_SWIZZLE_IDENTITY },
vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY,
vk::VK_SAMPLER_YCBCR_RANGE_ITU_FULL,
vk::VK_CHROMA_LOCATION_COSITED_EVEN,

1
external/vulkancts/scripts/src/vulkan.h.in vendored
View file

@ -7671,6 +7671,7 @@ typedef struct VkAndroidHardwareBufferFormatPropertiesANDROID {
VkFormat format;
uint64_t externalFormat;
VkFormatFeatureFlags formatFeatures;
VkComponentMapping samplerYcbcrConversionComponents;
VkSamplerYcbcrModelConversion suggestedYcbcrModel;
VkSamplerYcbcrRange suggestedYcbcrRange;
VkChromaLocation suggestedXChromaOffset;

5
framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
View file

@ -98,7 +98,10 @@ public:
{
return m_driver;
}
const tcu::FunctionLibrary& getFunctionLibrary (void) const
{
return m_library;
}
private:
const tcu::DynamicFunctionLibrary m_library;
const vk::PlatformDriver m_driver;

3
modules/egl/teglGetFrameTimestampsTests.cpp
View file

@ -263,7 +263,8 @@ void verifyNeighboringFrames (const FrameTimes& frame1, const FrameTimes& frame2
check_lt(result, frame1.dequeueReady, frame2.dequeueReady, "Dequeue ready times not monotonic.");
// GPU timeline.
check_lt(result, frame1.renderingComplete, frame2.renderingComplete, "Rendering complete times not monotonic.");
// Same rendering complete time is fine.
check_le(result, frame1.renderingComplete, frame2.renderingComplete, "Rendering complete times not monotonic.");
if (timestampValid(frame1.firstCompositionGpuFinished) && timestampValid(frame2.firstCompositionGpuFinished))
check_lt(result, frame1.firstCompositionGpuFinished, frame2.firstCompositionGpuFinished, "Composition GPU work complete times not monotonic.");