Skip to content

Commit 52301e6

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Initialize all members in Gdi class
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent a19c3ee commit 52301e6

File tree

2 files changed

+48
-49
lines changed

2 files changed

+48
-49
lines changed

‎shared/source/os_interface/windows/gdi_interface.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ inline const std::string getGdiName() {
1919
}
2020
}
2121

22-
Gdi::Gdi() : gdiDll(getGdiName(), nullptr),
23-
initialized(false) {
22+
Gdi::Gdi() : gdiDll(getGdiName(), nullptr) {
2423
if (gdiDll.isLoaded()) {
2524
initialized = Gdi::getAllProcAddresses();
2625
}

‎shared/source/os_interface/windows/gdi_interface.h‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,56 +23,56 @@ class Gdi {
2323
Gdi();
2424
~Gdi(){};
2525

26-
ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMHDC *> openAdapterFromHdc;
27-
ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMLUID *> openAdapterFromLuid;
28-
ThkWrapper<IN OUT D3DKMT_CREATEALLOCATION *> createAllocation;
29-
ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION *> destroyAllocation;
30-
ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION2 *> destroyAllocation2;
31-
ThkWrapper<IN CONST D3DKMT_QUERYADAPTERINFO *> queryAdapterInfo;
32-
ThkWrapper<IN CONST D3DKMT_CLOSEADAPTER *> closeAdapter;
33-
ThkWrapper<IN OUT D3DKMT_CREATEDEVICE *> createDevice;
34-
ThkWrapper<IN CONST D3DKMT_DESTROYDEVICE *> destroyDevice;
35-
ThkWrapper<IN CONST D3DKMT_ESCAPE *> escape;
36-
ThkWrapper<IN D3DKMT_CREATECONTEXTVIRTUAL *> createContext;
37-
ThkWrapper<IN CONST D3DKMT_DESTROYCONTEXT *> destroyContext;
38-
ThkWrapper<IN OUT D3DKMT_OPENRESOURCE *> openResource;
39-
ThkWrapper<IN OUT D3DKMT_OPENRESOURCEFROMNTHANDLE *> openResourceFromNtHandle;
40-
ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFO *> queryResourceInfo;
41-
ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFOFROMNTHANDLE *> queryResourceInfoFromNtHandle;
42-
ThkWrapper<IN OUT D3DKMT_LOCK *> lock;
43-
ThkWrapper<IN CONST D3DKMT_UNLOCK *> unlock;
44-
ThkWrapper<IN OUT D3DKMT_RENDER *> render;
45-
ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT *> createSynchronizationObject;
46-
ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT2 *> createSynchronizationObject2;
47-
ThkWrapper<IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *> destroySynchronizationObject;
48-
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECT *> signalSynchronizationObject;
49-
ThkWrapper<IN CONST_FROM_WDK_10_0_18328_0 D3DKMT_WAITFORSYNCHRONIZATIONOBJECT *> waitForSynchronizationObject;
50-
ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMCPU *> waitForSynchronizationObjectFromCpu;
51-
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMCPU *> signalSynchronizationObjectFromCpu;
52-
ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMGPU *> waitForSynchronizationObjectFromGpu;
53-
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMGPU *> signalSynchronizationObjectFromGpu;
54-
ThkWrapper<IN OUT D3DKMT_CREATEPAGINGQUEUE *> createPagingQueue;
55-
ThkWrapper<IN OUT D3DDDI_DESTROYPAGINGQUEUE *> destroyPagingQueue;
56-
ThkWrapper<IN OUT D3DKMT_LOCK2 *> lock2;
57-
ThkWrapper<IN CONST D3DKMT_UNLOCK2 *> unlock2;
58-
ThkWrapper<IN OUT D3DDDI_MAPGPUVIRTUALADDRESS *> mapGpuVirtualAddress;
59-
ThkWrapper<IN OUT D3DDDI_RESERVEGPUVIRTUALADDRESS *> reserveGpuVirtualAddress;
60-
ThkWrapper<IN CONST D3DKMT_FREEGPUVIRTUALADDRESS *> freeGpuVirtualAddress;
61-
ThkWrapper<IN CONST D3DKMT_UPDATEGPUVIRTUALADDRESS *> updateGpuVirtualAddress;
62-
ThkWrapper<IN CONST D3DKMT_SUBMITCOMMAND *> submitCommand;
63-
ThkWrapper<IN OUT D3DDDI_MAKERESIDENT *> makeResident;
64-
ThkWrapper<IN D3DKMT_EVICT *> evict;
65-
ThkWrapper<IN D3DKMT_REGISTERTRIMNOTIFICATION *> registerTrimNotification;
66-
ThkWrapper<IN D3DKMT_UNREGISTERTRIMNOTIFICATION *> unregisterTrimNotification;
67-
ThkWrapper<IN CONST D3DKMT_SETALLOCATIONPRIORITY *> setAllocationPriority;
26+
ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMHDC *> openAdapterFromHdc{};
27+
ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMLUID *> openAdapterFromLuid{};
28+
ThkWrapper<IN OUT D3DKMT_CREATEALLOCATION *> createAllocation{};
29+
ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION *> destroyAllocation{};
30+
ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION2 *> destroyAllocation2{};
31+
ThkWrapper<IN CONST D3DKMT_QUERYADAPTERINFO *> queryAdapterInfo{};
32+
ThkWrapper<IN CONST D3DKMT_CLOSEADAPTER *> closeAdapter{};
33+
ThkWrapper<IN OUT D3DKMT_CREATEDEVICE *> createDevice{};
34+
ThkWrapper<IN CONST D3DKMT_DESTROYDEVICE *> destroyDevice{};
35+
ThkWrapper<IN CONST D3DKMT_ESCAPE *> escape{};
36+
ThkWrapper<IN D3DKMT_CREATECONTEXTVIRTUAL *> createContext{};
37+
ThkWrapper<IN CONST D3DKMT_DESTROYCONTEXT *> destroyContext{};
38+
ThkWrapper<IN OUT D3DKMT_OPENRESOURCE *> openResource{};
39+
ThkWrapper<IN OUT D3DKMT_OPENRESOURCEFROMNTHANDLE *> openResourceFromNtHandle{};
40+
ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFO *> queryResourceInfo{};
41+
ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFOFROMNTHANDLE *> queryResourceInfoFromNtHandle{};
42+
ThkWrapper<IN OUT D3DKMT_LOCK *> lock{};
43+
ThkWrapper<IN CONST D3DKMT_UNLOCK *> unlock{};
44+
ThkWrapper<IN OUT D3DKMT_RENDER *> render{};
45+
ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT *> createSynchronizationObject{};
46+
ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT2 *> createSynchronizationObject2{};
47+
ThkWrapper<IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *> destroySynchronizationObject{};
48+
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECT *> signalSynchronizationObject{};
49+
ThkWrapper<IN CONST_FROM_WDK_10_0_18328_0 D3DKMT_WAITFORSYNCHRONIZATIONOBJECT *> waitForSynchronizationObject{};
50+
ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMCPU *> waitForSynchronizationObjectFromCpu{};
51+
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMCPU *> signalSynchronizationObjectFromCpu{};
52+
ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMGPU *> waitForSynchronizationObjectFromGpu{};
53+
ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMGPU *> signalSynchronizationObjectFromGpu{};
54+
ThkWrapper<IN OUT D3DKMT_CREATEPAGINGQUEUE *> createPagingQueue{};
55+
ThkWrapper<IN OUT D3DDDI_DESTROYPAGINGQUEUE *> destroyPagingQueue{};
56+
ThkWrapper<IN OUT D3DKMT_LOCK2 *> lock2{};
57+
ThkWrapper<IN CONST D3DKMT_UNLOCK2 *> unlock2{};
58+
ThkWrapper<IN OUT D3DDDI_MAPGPUVIRTUALADDRESS *> mapGpuVirtualAddress{};
59+
ThkWrapper<IN OUT D3DDDI_RESERVEGPUVIRTUALADDRESS *> reserveGpuVirtualAddress{};
60+
ThkWrapper<IN CONST D3DKMT_FREEGPUVIRTUALADDRESS *> freeGpuVirtualAddress{};
61+
ThkWrapper<IN CONST D3DKMT_UPDATEGPUVIRTUALADDRESS *> updateGpuVirtualAddress{};
62+
ThkWrapper<IN CONST D3DKMT_SUBMITCOMMAND *> submitCommand{};
63+
ThkWrapper<IN OUT D3DDDI_MAKERESIDENT *> makeResident{};
64+
ThkWrapper<IN D3DKMT_EVICT *> evict{};
65+
ThkWrapper<IN D3DKMT_REGISTERTRIMNOTIFICATION *> registerTrimNotification{};
66+
ThkWrapper<IN D3DKMT_UNREGISTERTRIMNOTIFICATION *> unregisterTrimNotification{};
67+
ThkWrapper<IN CONST D3DKMT_SETALLOCATIONPRIORITY *> setAllocationPriority{};
6868

6969
// HW queue
70-
ThkWrapper<IN OUT D3DKMT_CREATEHWQUEUE *> createHwQueue;
71-
ThkWrapper<IN CONST D3DKMT_DESTROYHWQUEUE *> destroyHwQueue;
72-
ThkWrapper<IN CONST D3DKMT_SUBMITCOMMANDTOHWQUEUE *> submitCommandToHwQueue;
70+
ThkWrapper<IN OUT D3DKMT_CREATEHWQUEUE *> createHwQueue{};
71+
ThkWrapper<IN CONST D3DKMT_DESTROYHWQUEUE *> destroyHwQueue{};
72+
ThkWrapper<IN CONST D3DKMT_SUBMITCOMMANDTOHWQUEUE *> submitCommandToHwQueue{};
7373

7474
// For debug purposes
75-
ThkWrapper<IN OUT D3DKMT_GETDEVICESTATE *> getDeviceState;
75+
ThkWrapper<IN OUT D3DKMT_GETDEVICESTATE *> getDeviceState{};
7676

7777
bool isInitialized() {
7878
return initialized;
@@ -82,7 +82,7 @@ class Gdi {
8282

8383
protected:
8484
MOCKABLE_VIRTUAL bool getAllProcAddresses();
85-
bool initialized;
85+
bool initialized = false;
8686
NEO::Windows::OsLibrary gdiDll;
8787
};
8888
} // namespace NEO

0 commit comments

Comments
 (0)