Skip to content

Test hosting the depth buffer in OpenGL land. #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Test hosting the depth buffer in OpenGL land. #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/GLWpfControl/DXGLContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public DxGlContext(GLWpfControlSettings settings)
AutoDepthStencilFormat = Format.Unknown,
BackBufferCount = 1,
EnableAutoDepthStencil = 0,
// Add D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL?
Flags = 0,
FullScreen_RefreshRateInHz = 0,
MultiSampleQuality = 0,
Expand Down
111 changes: 56 additions & 55 deletions src/GLWpfControl/GLWpfControlRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ public bool SupportsMSAATest()
out DXInterop.IDirect3DSurface9 dxColorRenderTarget,
ref dxColorRenderTargetShareHandle);

IntPtr dxDepthStencilRenderTargetShareHandle = IntPtr.Zero;
_context.DxDevice.CreateDepthStencilSurface(
FramebufferWidth,
FramebufferHeight,
Format.D24S8,
MultisampleType.D3DMULTISAMPLE_2_SAMPLES,
0,
false,
out DXInterop.IDirect3DSurface9 dxDepthStencilRenderTarget,
ref dxDepthStencilRenderTargetShareHandle);
DxDepthStencilRenderTarget = dxDepthStencilRenderTarget;
//IntPtr dxDepthStencilRenderTargetShareHandle = IntPtr.Zero;
//_context.DxDevice.CreateDepthStencilSurface(
// FramebufferWidth,
// FramebufferHeight,
// Format.D24S8,
// MultisampleType.D3DMULTISAMPLE_2_SAMPLES,
// 0,
// false,
// out DXInterop.IDirect3DSurface9 dxDepthStencilRenderTarget,
// ref dxDepthStencilRenderTargetShareHandle);
//DxDepthStencilRenderTarget = dxDepthStencilRenderTarget;

dxColorRenderTarget.Release();
dxDepthStencilRenderTarget.Release();
//dxDepthStencilRenderTarget.Release();

return true;
}
Expand Down Expand Up @@ -158,23 +158,23 @@ public void ReallocateFramebufferIfNeeded(double width, double height, double dp
Debug.WriteLine("Failed to set resource share handle for color render target.");
}

IntPtr dxDepthStencilRenderTargetShareHandle = IntPtr.Zero;
_context.DxDevice.CreateDepthStencilSurface(
FramebufferWidth,
FramebufferHeight,
Format.D24S8,
msaaType,
0,
false,
out DXInterop.IDirect3DSurface9 dxDepthStencilRenderTarget,
ref dxDepthStencilRenderTargetShareHandle);
DxDepthStencilRenderTarget = dxDepthStencilRenderTarget;

success = Wgl.DXSetResourceShareHandleNV(dxDepthStencilRenderTarget.Handle, dxDepthStencilRenderTargetShareHandle);
if (success == false)
{
Debug.WriteLine("Failed to set resource share handle for depth stencil render target.");
}
//IntPtr dxDepthStencilRenderTargetShareHandle = IntPtr.Zero;
//_context.DxDevice.CreateDepthStencilSurface(
// FramebufferWidth,
// FramebufferHeight,
// Format.D24S8,
// msaaType,
// 0,
// false,
// out DXInterop.IDirect3DSurface9 dxDepthStencilRenderTarget,
// ref dxDepthStencilRenderTargetShareHandle);
//DxDepthStencilRenderTarget = dxDepthStencilRenderTarget;

//success = Wgl.DXSetResourceShareHandleNV(dxDepthStencilRenderTarget.Handle, dxDepthStencilRenderTargetShareHandle);
//if (success == false)
//{
// Debug.WriteLine("Failed to set resource share handle for depth stencil render target.");
//}

#if DEBUG
{
Expand All @@ -183,11 +183,11 @@ public void ReallocateFramebufferIfNeeded(double width, double height, double dp
Debug.WriteLine($"Render target desc: {desc.Format}, {desc.Type}, {desc.Usage}, {desc.Pool}, {desc.MultiSampleType}, {desc.MultiSampleQuality}, {desc.Width}, {desc.Height}");
}

{
DxDepthStencilRenderTarget.GetDesc(out DXInterop.D3DSURFACE_DESC desc);

Debug.WriteLine($"Render target desc: {desc.Format}, {desc.Type}, {desc.Usage}, {desc.Pool}, {desc.MultiSampleType}, {desc.MultiSampleQuality}, {desc.Width}, {desc.Height}");
}
//{
// DxDepthStencilRenderTarget.GetDesc(out DXInterop.D3DSURFACE_DESC desc);
//
// Debug.WriteLine($"Render target desc: {desc.Format}, {desc.Type}, {desc.Usage}, {desc.Pool}, {desc.MultiSampleType}, {desc.MultiSampleQuality}, {desc.Width}, {desc.Height}");
//}
#endif

GLFramebufferHandle = GL.GenFramebuffer();
Expand All @@ -207,16 +207,21 @@ public void ReallocateFramebufferIfNeeded(double width, double height, double dp
}

GLSharedDepthRenderRenderbufferHandle = GL.GenRenderbuffer();
DxInteropDepthStencilRenderTargetRegisteredHandle = Wgl.DXRegisterObjectNV(
_context.GLDeviceHandle,
DxDepthStencilRenderTarget.Handle,
(uint)GLSharedDepthRenderRenderbufferHandle,
(uint)RenderbufferTarget.Renderbuffer,
WGL_NV_DX_interop.AccessReadWrite);
if (DxInteropDepthStencilRenderTargetRegisteredHandle == IntPtr.Zero)
{
Debug.WriteLine($"Could not register depth stencil render target. 0x{DXInterop.GetLastError():X8}");
}
GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, GLSharedDepthRenderRenderbufferHandle);
GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Depth24Stencil8, FramebufferWidth, FramebufferHeight);
// FIXME: proper reset?
GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, 0);

//DxInteropDepthStencilRenderTargetRegisteredHandle = Wgl.DXRegisterObjectNV(
// _context.GLDeviceHandle,
// DxDepthStencilRenderTarget.Handle,
// (uint)GLSharedDepthRenderRenderbufferHandle,
// (uint)RenderbufferTarget.Renderbuffer,
// WGL_NV_DX_interop.AccessReadWrite);
//if (DxInteropDepthStencilRenderTargetRegisteredHandle == IntPtr.Zero)
//{
// Debug.WriteLine($"Could not register depth stencil render target. 0x{DXInterop.GetLastError():X8}");
//}

GL.BindFramebuffer(FramebufferTarget.Framebuffer, GLFramebufferHandle);

Expand All @@ -229,13 +234,7 @@ public void ReallocateFramebufferIfNeeded(double width, double height, double dp
// FIXME: If we have a combined format, maybe set both at the same time?
GL.FramebufferRenderbuffer(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to comment this function call to avoid error from #156

FramebufferTarget.Framebuffer,
FramebufferAttachment.DepthAttachment,
RenderbufferTarget.Renderbuffer,
GLSharedDepthRenderRenderbufferHandle);

GL.FramebufferRenderbuffer(
FramebufferTarget.Framebuffer,
FramebufferAttachment.StencilAttachment,
FramebufferAttachment.DepthStencilAttachment,
RenderbufferTarget.Renderbuffer,
GLSharedDepthRenderRenderbufferHandle);

Expand Down Expand Up @@ -266,9 +265,9 @@ public void ReleaseFramebufferResources()
if (D3dImage != null)
{
Wgl.DXUnregisterObjectNV(_context.GLDeviceHandle, DxInteropColorRenderTargetRegisteredHandle);
Wgl.DXUnregisterObjectNV(_context.GLDeviceHandle, DxInteropDepthStencilRenderTargetRegisteredHandle);
//Wgl.DXUnregisterObjectNV(_context.GLDeviceHandle, DxInteropDepthStencilRenderTargetRegisteredHandle);
DxColorRenderTarget.Release();
DxDepthStencilRenderTarget.Release();
//DxDepthStencilRenderTarget.Release();
GL.DeleteFramebuffer(GLFramebufferHandle);
GL.DeleteRenderbuffer(GLSharedDepthRenderRenderbufferHandle);
GL.DeleteRenderbuffer(GLSharedColorRenderbufferHandle);
Expand All @@ -292,7 +291,8 @@ public void Render(DrawingContext drawingContext)
// Lock the interop object, DX calls to the framebuffer are no longer valid
D3dImage.Lock();
D3dImage.SetBackBuffer(System.Windows.Interop.D3DResourceType.IDirect3DSurface9, DxColorRenderTarget.Handle, true);
bool success = Wgl.DXLockObjectsNV(_context.GLDeviceHandle, 2, new[] { DxInteropColorRenderTargetRegisteredHandle, DxInteropDepthStencilRenderTargetRegisteredHandle });
//bool success = Wgl.DXLockObjectsNV(_context.GLDeviceHandle, 2, new[] { DxInteropColorRenderTargetRegisteredHandle, DxInteropDepthStencilRenderTargetRegisteredHandle });
bool success = Wgl.DXLockObjectsNV(_context.GLDeviceHandle, 1, new[] { DxInteropColorRenderTargetRegisteredHandle });
if (success == false)
{
Debug.WriteLine("Failed to lock objects!");
Expand All @@ -305,7 +305,8 @@ public void Render(DrawingContext drawingContext)
GLAsyncRender?.Invoke();

// Unlock the interop object, this acts as a synchronization point. OpenGL draws to the framebuffer are no longer valid.
success = Wgl.DXUnlockObjectsNV(_context.GLDeviceHandle, 2, new[] { DxInteropColorRenderTargetRegisteredHandle, DxInteropDepthStencilRenderTargetRegisteredHandle });
//success = Wgl.DXUnlockObjectsNV(_context.GLDeviceHandle, 2, new[] { DxInteropColorRenderTargetRegisteredHandle, DxInteropDepthStencilRenderTargetRegisteredHandle });
success = Wgl.DXUnlockObjectsNV(_context.GLDeviceHandle, 1, new[] { DxInteropColorRenderTargetRegisteredHandle });
if (success == false)
{
Debug.WriteLine("Failed to unlock objects!");
Expand Down
2 changes: 1 addition & 1 deletion src/GLWpfControl/Interop/DXInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static void Direct3DCreate9Ex(uint SdkVersion, out IDirect3D9Ex context)
private delegate uint NativeGetAdapterCount(IDirect3D9Ex contextHandle);
private delegate int NativeCheckDeviceMultiSampleType(IDirect3D9Ex contextHandle, uint Adapter, DeviceType DeviceType, Format SurfaceFormat, bool Windowed, MultisampleType MultiSampleType, out uint pQualityLevels);
private delegate int NativeCreateDeviceEx(IDirect3D9Ex contextHandle, int adapter, DeviceType deviceType, IntPtr focusWindowHandle, CreateFlags behaviorFlags, ref PresentationParameters presentationParameters, IntPtr fullscreenDisplayMode, out IDirect3DDevice9Ex deviceHandle);
private delegate int NativeCreateRenderTarget(IDirect3DDevice9Ex deviceHandle, int width, int height, Format format, MultisampleType multisample, int multisampleQuality, bool lockable, out IDirect3DSurface9 surfaceHandle, ref IntPtr sharedHandle);
private delegate int NativeCreateRenderTarget(IDirect3DDevice9Ex deviceHandle, int width, int height, Format format, MultisampleType multisample, int multisampleQuality, [MarshalAs(UnmanagedType.Bool)] bool lockable, out IDirect3DSurface9 surfaceHandle, ref IntPtr sharedHandle);
private delegate int NativeCreateDepthStencilSurface(IDirect3DDevice9Ex deviceHandle, int width, int height, Format format, MultisampleType multisample, int multisampleQuality, bool discard, out IDirect3DSurface9 surfaceHandle, ref IntPtr sharedHandle);
private delegate uint NativeRelease(IntPtr resourceHandle);

Expand Down