Merge pull request #67244 from RandomShaper/split_render_further_2
Polish rendering driver refactor further (take 2)
This commit is contained in:
commit
736a2df437
|
@ -605,8 +605,8 @@ void OS::_bind_methods() {
|
|||
ADD_PROPERTY_DEFAULT("low_processor_usage_mode", false);
|
||||
ADD_PROPERTY_DEFAULT("low_processor_usage_mode_sleep_usec", 6900);
|
||||
|
||||
BIND_ENUM_CONSTANT(VIDEO_DRIVER_VULKAN);
|
||||
BIND_ENUM_CONSTANT(VIDEO_DRIVER_OPENGL_3);
|
||||
BIND_ENUM_CONSTANT(RENDERING_DRIVER_VULKAN);
|
||||
BIND_ENUM_CONSTANT(RENDERING_DRIVER_OPENGL3);
|
||||
|
||||
BIND_ENUM_CONSTANT(DAY_SUNDAY);
|
||||
BIND_ENUM_CONSTANT(DAY_MONDAY);
|
||||
|
|
|
@ -124,9 +124,9 @@ protected:
|
|||
static OS *singleton;
|
||||
|
||||
public:
|
||||
enum VideoDriver {
|
||||
VIDEO_DRIVER_VULKAN,
|
||||
VIDEO_DRIVER_OPENGL_3,
|
||||
enum RenderingDriver {
|
||||
RENDERING_DRIVER_VULKAN,
|
||||
RENDERING_DRIVER_OPENGL3,
|
||||
};
|
||||
|
||||
enum Weekday {
|
||||
|
@ -578,7 +578,7 @@ VARIANT_ENUM_CAST(core_bind::ResourceLoader::CacheMode);
|
|||
|
||||
VARIANT_BITFIELD_CAST(core_bind::ResourceSaver::SaverFlags);
|
||||
|
||||
VARIANT_ENUM_CAST(core_bind::OS::VideoDriver);
|
||||
VARIANT_ENUM_CAST(core_bind::OS::RenderingDriver);
|
||||
VARIANT_ENUM_CAST(core_bind::OS::Weekday);
|
||||
VARIANT_ENUM_CAST(core_bind::OS::Month);
|
||||
VARIANT_ENUM_CAST(core_bind::OS::SystemDir);
|
||||
|
|
|
@ -625,11 +625,11 @@
|
|||
</member>
|
||||
</members>
|
||||
<constants>
|
||||
<constant name="VIDEO_DRIVER_VULKAN" value="0" enum="VideoDriver">
|
||||
The Vulkan rendering backend. It requires Vulkan 1.0 support and automatically uses features from Vulkan 1.1 and 1.2 if available.
|
||||
<constant name="RENDERING_DRIVER_VULKAN" value="0" enum="RenderingDriver">
|
||||
The Vulkan rendering driver. It requires Vulkan 1.0 support and automatically uses features from Vulkan 1.1 and 1.2 if available.
|
||||
</constant>
|
||||
<constant name="VIDEO_DRIVER_OPENGL_3" value="1" enum="VideoDriver">
|
||||
The OpenGL 3 rendering backend. It uses OpenGL 3.3 Core Profile on desktop platforms, OpenGL ES 3.0 on mobile devices, and WebGL 2.0 on Web.
|
||||
<constant name="RENDERING_DRIVER_OPENGL3" value="1" enum="RenderingDriver">
|
||||
The OpenGL 3 rendering driver. It uses OpenGL 3.3 Core Profile on desktop platforms, OpenGL ES 3.0 on mobile devices, and WebGL 2.0 on Web.
|
||||
</constant>
|
||||
<constant name="DAY_SUNDAY" value="0" enum="Weekday">
|
||||
Sunday.
|
||||
|
|
|
@ -5909,7 +5909,7 @@ void EditorNode::_update_renderer_color() {
|
|||
if (renderer->get_text() == "gl_compatibility") {
|
||||
renderer->add_theme_color_override("font_color", Color::hex(0x5586a4ff));
|
||||
} else if (renderer->get_text() == "forward_plus" || renderer->get_text() == "mobile") {
|
||||
renderer->add_theme_color_override("font_color", theme_base->get_theme_color(SNAME("vulkan_color"), SNAME("Editor")));
|
||||
renderer->add_theme_color_override("font_color", theme_base->get_theme_color(SNAME("highend_color"), SNAME("Editor")));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -564,9 +564,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
|
|||
theme->set_color("readonly_color", "Editor", readonly_color);
|
||||
|
||||
if (!dark_theme) {
|
||||
theme->set_color("vulkan_color", "Editor", Color::hex(0xad1128ff));
|
||||
theme->set_color("highend_color", "Editor", Color::hex(0xad1128ff));
|
||||
} else {
|
||||
theme->set_color("vulkan_color", "Editor", Color(1.0, 0.0, 0.0));
|
||||
theme->set_color("highend_color", "Editor", Color(1.0, 0.0, 0.0));
|
||||
}
|
||||
const int thumb_size = EDITOR_GET("filesystem/file_dialog/thumbnail_size");
|
||||
theme->set_constant("scale", "Editor", EDSCALE);
|
||||
|
|
|
@ -4778,7 +4778,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
|
|||
view_menu->set_disable_shortcuts(true);
|
||||
|
||||
// TODO: Re-evaluate with new OpenGL3 renderer, and implement.
|
||||
//if (OS::get_singleton()->get_current_video_driver() == OS::VIDEO_DRIVER_GLES2) {
|
||||
//if (OS::get_singleton()->get_current_video_driver() == OS::RENDERING_DRIVER_OPENGL3) {
|
||||
if (false) {
|
||||
// Alternate display modes only work when using the Vulkan renderer; make this explicit.
|
||||
const int normal_idx = view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL);
|
||||
|
|
|
@ -3707,7 +3707,7 @@ void VisualShaderEditor::_notification(int p_what) {
|
|||
[[fallthrough]];
|
||||
}
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
highend_label->set_modulate(get_theme_color(SNAME("vulkan_color"), SNAME("Editor")));
|
||||
highend_label->set_modulate(get_theme_color(SNAME("highend_color"), SNAME("Editor")));
|
||||
|
||||
node_filter->set_right_icon(Control::get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ Error OS_UWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
|
|||
outside = true;
|
||||
|
||||
// FIXME: Hardcoded for now, add Vulkan support.
|
||||
p_video_driver = VIDEO_DRIVER_OPENGL;
|
||||
p_video_driver = RENDERING_DRIVER_OPENGL3;
|
||||
ContextEGL_UWP::Driver opengl_api_type = ContextEGL_UWP::GLES_2_0;
|
||||
|
||||
bool gl_initialization_error = false;
|
||||
|
|
Loading…
Reference in New Issue