Change makeResident to be non virtual function.

- remove wddm version, not a lot of value there as residency is logged
in processResidency anyway.

Change-Id: Icb2814cfce0e8f3cd75445f1fd2e2f8535d476cc
Signed-off-by: Michal Mrozek <michal.mrozek@intel.com>
This commit is contained in:
Michal Mrozek
2019-12-03 18:22:29 +01:00
committed by sys_ocldev
parent ec63a03337
commit e234c89ee4
7 changed files with 2 additions and 39 deletions

View File

@@ -14,6 +14,7 @@ template <typename GfxFamily>
class TestedDrmCommandStreamReceiver : public DrmCommandStreamReceiver<GfxFamily> {
public:
using CommandStreamReceiver::commandStream;
using CommandStreamReceiver::makeResident;
using DrmCommandStreamReceiver<GfxFamily>::makeResidentBufferObjects;
using DrmCommandStreamReceiver<GfxFamily>::residency;
using CommandStreamReceiverHw<GfxFamily>::CommandStreamReceiver::lastSentSliceCount;

View File

@@ -1096,18 +1096,6 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, GivenTwoAllocationsWhenBackingS
csr->getResidencyAllocations().clear();
}
HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, makeResidentSizeZero) {
std::unique_ptr<BufferObject> buffer(this->createBO(0));
DrmAllocation allocation(0, GraphicsAllocation::AllocationType::UNKNOWN, buffer.get(), nullptr, buffer->peekSize(), (osHandle)0u, MemoryPool::MemoryNull);
EXPECT_EQ(nullptr, allocation.getUnderlyingBuffer());
EXPECT_EQ(buffer->peekSize(), allocation.getUnderlyingBufferSize());
csr->makeResident(allocation);
csr->processResidency(csr->getResidencyAllocations());
EXPECT_FALSE(isResident<FamilyType>(buffer.get()));
}
HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, Flush) {
auto &cs = csr->getCS();
auto commandBuffer = static_cast<DrmAllocation *>(cs.getGraphicsAllocation());