[UI] Image post-processing and full presentation/window rework
[GPU] Add FXAA post-processing [UI] Add FidelityFX FSR and CAS post-processing [UI] Add blue noise dithering from 10bpc to 8bpc [GPU] Apply the DC PWL gamma ramp closer to the spec, supporting fully white color [UI] Allow the GPU CP thread to present on the host directly, bypassing the UI thread OS paint event [UI] Allow variable refresh rate (or tearing) [UI] Present the newest frame (restart) on DXGI [UI] Replace GraphicsContext with a far more advanced Presenter with more coherent surface connection and UI overlay state management [UI] Connect presentation to windows via the Surface class, not native window handles [Vulkan] Switch to simpler Vulkan setup with no instance/device separation due to interdependencies and to pass fewer objects around [Vulkan] Lower the minimum required Vulkan version to 1.0 [UI/GPU] Various cleanup, mainly ComPtr usage [UI] Support per-monitor DPI awareness v2 on Windows [UI] DPI-scale Dear ImGui [UI] Replace the remaining non-detachable window delegates with unified window event and input listeners [UI] Allow listeners to safely destroy or close the window, and to register/unregister listeners without use-after-free and the ABA problem [UI] Explicit Z ordering of input listeners and UI overlays, top-down for input, bottom-up for drawing [UI] Add explicit window lifecycle phases [UI] Replace Window virtual functions with explicit desired state, its application, actual state, its feedback [UI] GTK: Apply the initial size to the drawing area [UI] Limit internal UI frame rate to that of the monitor [UI] Hide the cursor using a timer instead of polling due to no repeated UI thread paints with GPU CP thread presentation, and only within the window
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2015 Ben Vanik. All rights reserved. *
|
||||
* Copyright 2022 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
@@ -10,9 +10,10 @@
|
||||
#include "xenia/ui/microprofile_drawer.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
|
||||
#include "xenia/base/math.h"
|
||||
#include "xenia/ui/window.h"
|
||||
#include "xenia/base/profiling.h"
|
||||
|
||||
namespace xe {
|
||||
namespace ui {
|
||||
@@ -124,10 +125,8 @@ const uint8_t kFontData[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||
};
|
||||
|
||||
MicroprofileDrawer::MicroprofileDrawer(xe::ui::Window* window)
|
||||
: window_(window),
|
||||
graphics_context_(window->context()),
|
||||
vertices_(kMaxVertices) {
|
||||
MicroprofileDrawer::MicroprofileDrawer(ImmediateDrawer* immediate_drawer)
|
||||
: immediate_drawer_(immediate_drawer), vertices_(kMaxVertices) {
|
||||
SetupFont();
|
||||
}
|
||||
|
||||
@@ -171,21 +170,21 @@ void MicroprofileDrawer::SetupFont() {
|
||||
}
|
||||
}
|
||||
|
||||
font_texture_ = graphics_context_->immediate_drawer()->CreateTexture(
|
||||
font_texture_ = immediate_drawer_->CreateTexture(
|
||||
kFontTextureWidth, kFontTextureHeight, ImmediateTextureFilter::kNearest,
|
||||
false, reinterpret_cast<uint8_t*>(unpacked));
|
||||
}
|
||||
|
||||
MicroprofileDrawer::~MicroprofileDrawer() = default;
|
||||
|
||||
void MicroprofileDrawer::Begin() {
|
||||
graphics_context_->immediate_drawer()->Begin(window_->scaled_width(),
|
||||
window_->scaled_height());
|
||||
void MicroprofileDrawer::Begin(UIDrawContext& ui_draw_context,
|
||||
uint32_t coordinate_space_width,
|
||||
uint32_t coordinate_space_height) {
|
||||
immediate_drawer_->Begin(ui_draw_context, float(coordinate_space_width),
|
||||
float(coordinate_space_height));
|
||||
}
|
||||
|
||||
void MicroprofileDrawer::End() {
|
||||
Flush();
|
||||
graphics_context_->immediate_drawer()->End();
|
||||
immediate_drawer_->End();
|
||||
}
|
||||
|
||||
ImmediateVertex* MicroprofileDrawer::BeginVertices(
|
||||
@@ -203,7 +202,6 @@ ImmediateVertex* MicroprofileDrawer::BeginVertices(
|
||||
void MicroprofileDrawer::EndVertices() {}
|
||||
|
||||
void MicroprofileDrawer::Flush() {
|
||||
auto drawer = graphics_context_->immediate_drawer();
|
||||
if (!vertex_count_) {
|
||||
return;
|
||||
}
|
||||
@@ -211,15 +209,15 @@ void MicroprofileDrawer::Flush() {
|
||||
ImmediateDrawBatch batch;
|
||||
batch.vertices = vertices_.data();
|
||||
batch.vertex_count = vertex_count_;
|
||||
drawer->BeginDrawBatch(batch);
|
||||
immediate_drawer_->BeginDrawBatch(batch);
|
||||
|
||||
ImmediateDraw draw;
|
||||
draw.primitive_type = current_primitive_type_;
|
||||
draw.count = vertex_count_;
|
||||
draw.texture = font_texture_.get();
|
||||
drawer->Draw(draw);
|
||||
immediate_drawer_->Draw(draw);
|
||||
|
||||
drawer->EndDrawBatch();
|
||||
immediate_drawer_->EndDrawBatch();
|
||||
|
||||
vertex_count_ = 0;
|
||||
}
|
||||
@@ -323,8 +321,8 @@ void MicroprofileDrawer::DrawLine2D(uint32_t count, float* vertices,
|
||||
EndVertices();
|
||||
}
|
||||
|
||||
void MicroprofileDrawer::DrawText(int x, int y, uint32_t color,
|
||||
const char* text, int text_length) {
|
||||
void MicroprofileDrawer::DrawTextString(int x, int y, uint32_t color,
|
||||
const char* text, int text_length) {
|
||||
if (!text_length) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user