asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35083 from akien-mga/squish-s3tc-compress-in-template

Browse source 
Image: Include S3TC compression via Squish in non-tools build
This commit is contained in:
Rémi Verschelde 2020-01-13 16:21:30 +01:00 committed by GitHub
commit 031b5455ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/squish/image_compress_squish.cpp
View file

@ -73,7 +73,6 @@ void image_decompress_squish(Image *p_image) {
p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data); p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
} }
#ifdef TOOLS_ENABLED
void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source) { void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source) {
if (p_image->get_format() >= Image::FORMAT_DXT1) if (p_image->get_format() >= Image::FORMAT_DXT1)
@ -203,4 +202,3 @@ void image_compress_squish(Image *p_image, float p_lossy_quality, Image::Compres
p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data); p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
} }
} }
#endif

2
modules/squish/image_compress_squish.h
View file

@ -33,9 +33,7 @@
#include "core/image.h" #include "core/image.h"
#ifdef TOOLS_ENABLED
void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source); void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
#endif
void image_decompress_squish(Image *p_image); void image_decompress_squish(Image *p_image);
#endif // IMAGE_COMPRESS_SQUISH_H #endif // IMAGE_COMPRESS_SQUISH_H

2
modules/squish/register_types.cpp
View file

@ -33,9 +33,7 @@
void register_squish_types() { void register_squish_types() {
#ifdef TOOLS_ENABLED
Image::set_compress_bc_func(image_compress_squish); Image::set_compress_bc_func(image_compress_squish);
#endif
Image::_image_decompress_bc = image_decompress_squish; Image::_image_decompress_bc = image_decompress_squish;
} }

2
platform/haiku/detect.py
View file

@ -95,7 +95,7 @@ def configure(env):
if not env['builtin_enet']: if not env['builtin_enet']:
env.ParseConfig('pkg-config libenet --cflags --libs') env.ParseConfig('pkg-config libenet --cflags --libs')
if not env['builtin_squish'] and env['tools']: if not env['builtin_squish']:
env.ParseConfig('pkg-config libsquish --cflags --libs') env.ParseConfig('pkg-config libsquish --cflags --libs')
if not env['builtin_zstd']: if not env['builtin_zstd']:

2
platform/server/detect.py
View file

@ -162,7 +162,7 @@ def configure(env):
if not env['builtin_enet']: if not env['builtin_enet']:
env.ParseConfig('pkg-config libenet --cflags --libs') env.ParseConfig('pkg-config libenet --cflags --libs')
if not env['builtin_squish'] and env['tools']: if not env['builtin_squish']:
env.ParseConfig('pkg-config libsquish --cflags --libs') env.ParseConfig('pkg-config libsquish --cflags --libs')
if not env['builtin_zstd']: if not env['builtin_zstd']:

2
platform/x11/detect.py
View file

@ -232,7 +232,7 @@ def configure(env):
if not env['builtin_enet']: if not env['builtin_enet']:
env.ParseConfig('pkg-config libenet --cflags --libs') env.ParseConfig('pkg-config libenet --cflags --libs')
if not env['builtin_squish'] and env['tools']: if not env['builtin_squish']:
env.ParseConfig('pkg-config libsquish --cflags --libs') env.ParseConfig('pkg-config libsquish --cflags --libs')
if not env['builtin_zstd']: if not env['builtin_zstd']: