diff options
| author | Ferenc Arn <tagcup@yahoo.com> | 2017-04-26 10:49:08 -0500 |
|---|---|---|
| committer | Ferenc Arn <tagcup@yahoo.com> | 2017-05-31 18:59:00 -0500 |
| commit | 6a9c990da72a737fa95d9e97d53f835706aea7c3 (patch) | |
| tree | 0f5c1d36279bef5d0d5c84fc1d3fb24256b65ba8 /modules/etc1/image_etc.h | |
| parent | bd26fa7bf2bf02f9ef17ad4ef3a93ffed3ffcf56 (diff) | |
Add ETC1/ETC2 compression support though etc2comp.
Remove rg-etc1 code. Also updated travis to use ubuntu 14.04.
Fixes #8457.
Diffstat (limited to 'modules/etc1/image_etc.h')
| -rw-r--r-- | modules/etc1/image_etc.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/modules/etc1/image_etc.h b/modules/etc1/image_etc.h deleted file mode 100644 index 69e082bb87..0000000000 --- a/modules/etc1/image_etc.h +++ /dev/null @@ -1,35 +0,0 @@ -/*************************************************************************/ -/* image_etc.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#ifndef IMAGE_ETC1_H -#define IMAGE_ETC1_H - -void _register_etc1_compress_func(); - -#endif // IMAGE_ETC_H |