Revert "Update new_editor inspector layout and host rendering"
This reverts commit 5d81a64ef3.
This commit is contained in:
@@ -7,9 +7,6 @@ D3D12WindowRenderLoopAttachResult D3D12WindowRenderLoop::Attach(
|
||||
D3D12WindowRenderer& windowRenderer) {
|
||||
m_uiRenderer = &uiRenderer;
|
||||
m_windowRenderer = &windowRenderer;
|
||||
m_nativeUiRenderer.AttachWindowRenderer(windowRenderer);
|
||||
m_nativeUiRenderer.SetTextureDataSource(&uiRenderer);
|
||||
m_nativeUiRenderer.SetDpiScale(uiRenderer.GetDpiScale());
|
||||
|
||||
D3D12WindowRenderLoopAttachResult result = {};
|
||||
result.hasViewportSurfacePresentation = m_uiRenderer->AttachWindowRenderer(*m_windowRenderer);
|
||||
@@ -28,16 +25,10 @@ void D3D12WindowRenderLoop::Detach() {
|
||||
m_uiRenderer->DetachWindowRenderer();
|
||||
}
|
||||
|
||||
m_nativeUiRenderer.SetTextureDataSource(nullptr);
|
||||
m_nativeUiRenderer.DetachWindowRenderer();
|
||||
m_uiRenderer = nullptr;
|
||||
m_windowRenderer = nullptr;
|
||||
}
|
||||
|
||||
void D3D12WindowRenderLoop::SetDpiScale(float dpiScale) {
|
||||
m_nativeUiRenderer.SetDpiScale(dpiScale);
|
||||
}
|
||||
|
||||
D3D12WindowRenderLoopFrameContext D3D12WindowRenderLoop::BeginFrame() const {
|
||||
D3D12WindowRenderLoopFrameContext context = {};
|
||||
if (!HasViewportSurfacePresentation()) {
|
||||
@@ -113,28 +104,14 @@ D3D12WindowRenderLoopResizeResult D3D12WindowRenderLoop::ApplyResize(UINT width,
|
||||
}
|
||||
|
||||
D3D12WindowRenderLoopPresentResult D3D12WindowRenderLoop::Present(
|
||||
const ::XCEngine::UI::UIDrawData& drawData) {
|
||||
const ::XCEngine::UI::UIDrawData& drawData) const {
|
||||
D3D12WindowRenderLoopPresentResult result = {};
|
||||
if (m_uiRenderer == nullptr) {
|
||||
result.warning = "window render loop has no ui renderer.";
|
||||
return result;
|
||||
}
|
||||
|
||||
m_nativeUiRenderer.AnalyzeFrame(drawData);
|
||||
|
||||
if (HasViewportSurfacePresentation()) {
|
||||
std::string nativeUnsupportedReason = {};
|
||||
if (m_nativeUiRenderer.CanRender(drawData, &nativeUnsupportedReason)) {
|
||||
result.framePresented = m_nativeUiRenderer.Render(drawData);
|
||||
if (!result.framePresented) {
|
||||
const std::string& nativeError = m_nativeUiRenderer.GetLastError();
|
||||
result.warning = nativeError.empty()
|
||||
? "native d3d12 ui rendering failed."
|
||||
: "native d3d12 ui rendering failed: " + nativeError;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
result.framePresented = m_uiRenderer->RenderToWindowRenderer(drawData);
|
||||
if (!result.framePresented) {
|
||||
const std::string& composeError = m_uiRenderer->GetLastRenderError();
|
||||
|
||||
Reference in New Issue
Block a user