Skip to content

Commit 6bd1016

Browse files
Remove bitwise operations on bools from os_interface
Change-Id: If3cfb3daf9deefb0dac040b2c3e709764c7d3155 Signed-off-by: Filip Hazubski <[email protected]>
1 parent ff0d132 commit 6bd1016

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ bool setupArbSyncObject(GLSharingFunctions &sharing, OSInterface &osInterface, C
9393
glSyncInfo.submissionSynchronizationObject = submissionSyncEventInfo.hSyncObject;
9494
glSyncInfo.waitCalled = false;
9595

96-
bool setupFailed = false;
97-
setupFailed |= (glSyncInfo.event == nullptr);
98-
setupFailed |= (glSyncInfo.submissionEvent == nullptr);
99-
setupFailed |= (0 != serverSyncInitStatus);
100-
setupFailed |= (0 != clientSyncInitStatus);
101-
setupFailed |= (0 != submissionSyncInitStatus);
96+
bool setupFailed =
97+
(glSyncInfo.event == nullptr) ||
98+
(glSyncInfo.submissionEvent == nullptr) ||
99+
(0 != serverSyncInitStatus) ||
100+
(0 != clientSyncInitStatus) ||
101+
(0 != submissionSyncInitStatus);
102102

103103
if (setupFailed) {
104104
DEBUG_BREAK_IF(true);

runtime/os_interface/windows/hw_info_config.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou
3636
static_cast<bool>(outHwInfo->featureTable.ftrGpGpuMidBatchPreempt));
3737
outHwInfo->capabilityTable.requiredPreemptionSurfaceSize = outHwInfo->gtSystemInfo.CsrSizeInMb * MemoryConstants::megaByte;
3838

39-
outHwInfo->capabilityTable.instrumentationEnabled &= haveInstrumentation;
39+
outHwInfo->capabilityTable.instrumentationEnabled =
40+
(outHwInfo->capabilityTable.instrumentationEnabled && haveInstrumentation);
4041

4142
auto &kmdNotifyProperties = outHwInfo->capabilityTable.kmdNotifyProperties;
4243
KmdNotifyHelper::overrideFromDebugVariable(DebugManager.flags.OverrideEnableKmdNotify.get(), kmdNotifyProperties.enableKmdNotify);

runtime/os_interface/windows/wddm/wddm.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ bool Wddm::init(HardwareInfo &outHardwareInfo) {
8787

8888
outHardwareInfo.capabilityTable = hardwareInfoTable[productFamily]->capabilityTable;
8989
outHardwareInfo.capabilityTable.maxRenderFrequency = maxRenderFrequency;
90-
outHardwareInfo.capabilityTable.instrumentationEnabled &= instrumentationEnabled;
90+
outHardwareInfo.capabilityTable.instrumentationEnabled =
91+
(outHardwareInfo.capabilityTable.instrumentationEnabled && instrumentationEnabled);
9192

9293
HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
9394

0 commit comments

Comments
 (0)