intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 18:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

change ARRAY_COUNT macro to constexpr

Browse Source 
Change-Id: I027c4e70e3b901f3ffb3c0971935ae67e971db07
This commit is contained in:
Kamil Diedrich
2018-08-13 09:27:49 +02:00
committed by sys_ocldev
parent d51c7ccdd4
commit d3d8b6f905
11 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unit_tests/mem_obj/image_snorm_tests.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -29,10 +29,10 @@ using namespace OCLRT;
const cl_mem_flags flagsForTests[] = {CL_MEM_READ_ONLY, CL_MEM_WRITE_ONLY, CL_MEM_READ_WRITE};
const std::tuple<const SurfaceFormatInfo *, const size_t> paramsForSnormTests[] = {
std::make_tuple(readOnlySurfaceFormats, numReadOnlySurfaceFormats),
std::make_tuple(writeOnlySurfaceFormats, numWriteOnlySurfaceFormats),
std::make_tuple(readWriteSurfaceFormats, numReadWriteSurfaceFormats),
const std::tuple<const SurfaceFormatInfo *, const size_t *> paramsForSnormTests[] = {
std::make_tuple(readOnlySurfaceFormats, &numReadOnlySurfaceFormats),
std::make_tuple(writeOnlySurfaceFormats, &numWriteOnlySurfaceFormats),
std::make_tuple(readWriteSurfaceFormats, &numReadWriteSurfaceFormats),
};
const std::array<SurfaceFormatInfo, 6> referenceSnormSurfaceFormats = {{
@@ -60,11 +60,11 @@ TEST_P(SnormSurfaceFormatAccessFlagsTests, givenSnormFormatWhenGetSurfaceFormatF
}
}
using SnormSurfaceFormatTests = ::testing::TestWithParam<std::tuple<const SurfaceFormatInfo *, const size_t>>;
using SnormSurfaceFormatTests = ::testing::TestWithParam<std::tuple<const SurfaceFormatInfo *, const size_t *>>;
TEST_P(SnormSurfaceFormatTests, givenSnormOclFormatWhenCheckingrReadOnlySurfaceFormatsThenFindExactCount) {
const SurfaceFormatInfo *formatsTable = std::get<0>(GetParam());
size_t formatsTableCount = std::get<1>(GetParam());
size_t formatsTableCount = *std::get<1>(GetParam());
size_t snormFormatsFound = 0;
for (size_t i = 0; i < formatsTableCount; i++) {

2
unit_tests/mem_obj/image_validate_tests.cpp
View File

@@ -809,7 +809,7 @@ TEST_P(ValidParentImageFormatTest, givenParentChannelOrderWhenTestWithAllChannel
image.imageFormat = parentImageFormat;
bool retVal;
for (unsigned int i = 0; i < ARRAY_COUNT(allChannelOrders); i++) {
for (unsigned int i = 0; i < arrayCount(allChannelOrders); i++) {
imageFormat.image_channel_order = allChannelOrders[i];
retVal = image.hasValidParentImageFormat(imageFormat);
EXPECT_EQ(imageFormat.image_channel_order == validChannelOrder, retVal);