Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

PVRTC: Move compress func to modules/pvr, drop obsolete PVRTexTool code

Browse source 
The code we had for PVRTexTool doesn't work as it's not compatible with current
PVRTexTool CLI options, and likely hasn't been for years.

Instead, we have our own vendored pvrtccompressor thirdparty library which all
users have thus de-facto been using. This commit moves the compress code to
`modules/pvr` where it belongs.

There's no proper compress function for PVRTC 2-bit format, that's a bug that
will need to be fixed (currently it's compressed as 4-bit format even if you
use Image::FORMAT_PVRTC2).

Fixes #28669.
This commit is contained in:
Rémi Verschelde 2020-12-10 15:44:05 +01:00
parent d26cbc41a6
commit 1a31274855
No known key found for this signature in database
GPG key ID: C3336907360768E1
10 changed files with 109 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_node.cpp
View file

@ -58,7 +58,9 @@
#include "scene/gui/tab_container.h"
#include "scene/gui/tabs.h"
#include "scene/gui/texture_progress.h"
#include "scene/main/window.h"
#include "scene/resources/packed_scene.h"
#include "servers/display_server.h"
#include "servers/navigation_server_2d.h"
#include "servers/navigation_server_3d.h"
#include "servers/physics_server_2d.h"
@ -172,12 +174,10 @@
#include "editor/progress_dialog.h"
#include "editor/project_export.h"
#include "editor/project_settings_editor.h"
#include "editor/pvrtc_compress.h"
#include "editor/quick_open.h"
#include "editor/register_exporters.h"
#include "editor/settings_config_dialog.h"
#include "scene/main/window.h"
#include "servers/display_server.h"
#include <stdio.h>
#include <stdlib.h>
@ -5726,8 +5726,6 @@ EditorNode::EditorNode() {
EditorInspector::add_inspector_plugin(smp);
}
_pvrtc_register_compressors();
editor_selection = memnew(EditorSelection);
EditorFileSystem *efs = memnew(EditorFileSystem);