Skip to content

Commit 3bd8d71

Browse files
Don't call command stream receiver's cleanupResources twice
Change-Id: I9cce3eacbb805770658be91c55e1fa69dc4bae5d Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 36c8c6f commit 3bd8d71

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

runtime/command_stream/command_stream_receiver.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ class CommandStreamReceiver {
115115

116116
void setPreemptionCsrAllocation(GraphicsAllocation *allocation) { preemptionCsrAllocation = allocation; }
117117

118-
void cleanupResources();
119-
120118
void requestThreadArbitrationPolicy(uint32_t requiredPolicy) { this->requiredThreadArbitrationPolicy = requiredPolicy; }
121119
void requestStallingPipeControlOnNextFlush() { stallingPipeControlOnNextFlushRequired = true; }
122120

@@ -154,6 +152,7 @@ class CommandStreamReceiver {
154152
AllocationsList &getAllocationsForReuse() { return allocationsForReuse; }
155153

156154
protected:
155+
void cleanupResources();
157156
void setDisableL3Cache(bool val) {
158157
disableL3Cache = val;
159158
}

runtime/os_interface/windows/wddm_device_command_stream.inl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ WddmCommandStreamReceiver<GfxFamily>::WddmCommandStreamReceiver(const HardwareIn
7373

7474
template <typename GfxFamily>
7575
WddmCommandStreamReceiver<GfxFamily>::~WddmCommandStreamReceiver() {
76-
this->cleanupResources();
77-
7876
if (commandBufferHeader)
7977
delete commandBufferHeader;
8078
}

unit_tests/libult/ult_command_stream_receiver.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily> {
2828
using BaseClass::iohState;
2929
using BaseClass::programPreamble;
3030
using BaseClass::sshState;
31+
using BaseClass::CommandStreamReceiver::cleanupResources;
3132
using BaseClass::CommandStreamReceiver::commandStream;
3233
using BaseClass::CommandStreamReceiver::disableL3Cache;
3334
using BaseClass::CommandStreamReceiver::dispatchMode;

0 commit comments

Comments
 (0)