Skip to content

Commit 99f2618

Browse files
committed
fixed render without filters
1 parent 2dbc17f commit 99f2618

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

src/platform/renderer.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -1121,11 +1121,15 @@ void platform_renderer_clear() {
11211121
void platform_render_apply_filter() {
11221122
auto &data = g_renderer_data;
11231123

1124-
OZZY_PROFILER_SECTION("Game/Run/Renderer/Render/Filter");
1124+
if (!platform_render_support_filters()) {
1125+
return;
1126+
}
1127+
11251128
if (!platform_render_any_filter_active()) {
11261129
return;
11271130
}
11281131

1132+
OZZY_PROFILER_SECTION("Game/Run/Renderer/Render/Filter");
11291133
float texw, texh;
11301134
int pitch, w, h;
11311135
uint32_t format;

src/platform/renderer_filters.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ANK_REGISTER_PROPS_ITERATOR(config_load_filter_properties);
1010

1111
struct renderer_filter_t {
1212
std::shared_ptr<gpupixel::Filter> bilaterial;
13-
bool bilaterial_active = true;
13+
bool bilaterial_active = false;
1414
std::shared_ptr<gpupixel::SourceImage> sourceImage;
1515
std::shared_ptr<gpupixel::TargetView> outputImage;
1616

@@ -44,6 +44,10 @@ void platform_render_init_filters() {
4444
void platform_render_init_filter_context() {
4545
auto &data = g_renderer_filter;
4646

47+
if (!platform_render_support_filters()) {
48+
return;
49+
}
50+
4751
gpupixel::GPUPixelContext::initOpengl();
4852

4953
data.sourceImage = gpupixel::SourceImage::create_from_memory(0, 0, 4, nullptr);
@@ -114,6 +118,10 @@ void platform_render_proceed_filter(int w, int h, int format, const std::vector<
114118
}
115119

116120
void config_load_filter_properties(bool header) {
121+
if (!platform_render_support_filters()) {
122+
return;
123+
}
124+
117125
auto &data = g_renderer_filter;
118126
static bool _debug_filter_open = false;
119127

src/window/advisors.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,6 @@ static void handle_hotkeys(const hotkeys* h) {
217217
void window_advisors_t::handle_input(const mouse* m, const hotkeys* h) {
218218
handle_hotkeys(h);
219219

220-
ui.begin_widget(pos);
221-
if (ui.handle_mouse(m)) {
222-
return;
223-
}
224-
ui.end_widget();
225-
226220
const mouse* m_dialog = mouse_in_dialog(m);
227221
if (current_advisor_window->handle_mouse(m_dialog)) {
228222
return;
@@ -232,6 +226,12 @@ void window_advisors_t::handle_input(const mouse* m, const hotkeys* h) {
232226
return;
233227
}
234228

229+
ui.begin_widget(pos);
230+
if (ui.handle_mouse(m)) {
231+
return;
232+
}
233+
ui.end_widget();
234+
235235
if (input_go_back_requested(m, h)) {
236236
window_city_show();
237237
return;

0 commit comments

Comments
 (0)