1
0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00

Update devcontainer configuration and working in CreateDevice call

This commit is contained in:
root 2024-03-06 03:45:51 +00:00
parent 5a4b6e6919
commit 31106b8091
4 changed files with 23 additions and 6 deletions

View File

@ -1,7 +1,15 @@
{ {
"name": "ubuntu-jammy", "name": "ubuntu",
"image": "ubuntu-latest", "image": "docker.io/library/ubuntu",
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools-extension-pack"
]
}
},
"features": { "features": {
}, },
"onCreateCommand": "apt update && apt install sudo git",
"postCreateCommand": "sudo ./build.sh" "postCreateCommand": "sudo ./build.sh"
} }

View File

@ -3,4 +3,4 @@
#define DEBUG true #define DEBUG true
//PREPROCESSING ONLY!!! //PREPROCESSING ONLY!!!
#define PROJECT_SOURCE_DIR "/home/eduardo/Documentos/proj/OpenDX/" #define PROJECT_SOURCE_DIR "/workspaces/OpenDX/"

View File

@ -12,6 +12,9 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
//TODO: add ifdefs when implementing another gpu
#include <drm/i915_drm.h>
IDirect3D9::IDirect3D9 (UINT SDKVersion) { IDirect3D9::IDirect3D9 (UINT SDKVersion) {
#ifdef DEBUG #ifdef DEBUG
std::cout << "libd3d9.so: IDirect3D9::IDirect3D9()" << std::endl; std::cout << "libd3d9.so: IDirect3D9::IDirect3D9()" << std::endl;
@ -93,7 +96,13 @@ HRESULT IDirect3D9::CreateDevice(
D3DPRESENT_PARAMETERS *pPresentationParameters, D3DPRESENT_PARAMETERS *pPresentationParameters,
IDirect3DDevice9 **ppReturnedDeviceInterface IDirect3DDevice9 **ppReturnedDeviceInterface
) { ) {
return 0; #ifdef DEBUG
std::cout << "libd3d9.so: IDirect3D9::CreateDevice()" << std::endl;
#endif
//get hwnd size
RECT rect;
GetClientRect(hFocusWindow, &rect);
} }
ULONG IDirect3D9::Release() { ULONG IDirect3D9::Release() {

View File

@ -28,7 +28,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
//ZeroMemory(&pp, sizeof(pp)); //ZeroMemory(&pp, sizeof(pp));
pp.Windowed = TRUE; pp.Windowed = TRUE;
pp.SwapEffect = D3DSWAPEFFECT_DISCARD; pp.SwapEffect = D3DSWAPEFFECT_DISCARD;
//pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &pp, &pDevice); pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd, 0/*D3DCREATE_HARDWARE_VERTEXPROCESSING*/, &pp, &pDevice);
// Enter the message loop // Enter the message loop
MSG msg; MSG msg;