godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Removing etc1 from build for javascript platform."

Browse Source 
This reverts commit 41b729ccff.
This commit is contained in:
V.VamsiKrishna 2015-03-20 11:12:13 +05:30
parent d3280f91a1
commit 9965e93f7e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -111,7 +111,6 @@ opts.Add('jpg','JPG Image loader support (yes/no)','yes')
opts.Add('webp','WEBP Image loader support (yes/no)','yes') opts.Add('webp','WEBP Image loader support (yes/no)','yes')
opts.Add('dds','DDS Texture loader support (yes/no)','yes') opts.Add('dds','DDS Texture loader support (yes/no)','yes')
opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes') opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes')
opts.Add('etc1','etc1 Texture compression support (yes/no)','yes')
opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes') opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no') opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no')
opts.Add('musepack','Musepack Audio (yes/no)','yes') opts.Add('musepack','Musepack Audio (yes/no)','yes')

4
drivers/etc1/rg_etc1.cpp
View File

@ -1918,7 +1918,11 @@ done:
int v = etc1_decode_value(diff, inten, selector, packed_c); int v = etc1_decode_value(diff, inten, selector, packed_c);
uint err = labs(v - static_cast<int>(color)); uint err = labs(v - static_cast<int>(color));
//printf("err: %d - %u = %u\n",v,color,err); //printf("err: %d - %u = %u\n",v,color,err);
#ifdef JAVASCRIPT_ENABLED
if (err < best_error || best_error == cUINT32_MAX)
#else
if (err < best_error) if (err < best_error)
#endif
{ {
best_error = err; best_error = err;
best_packed_c = packed_c; best_packed_c = packed_c;

1
platform/javascript/detect.py
View File

@ -36,7 +36,6 @@ def get_flags():
('squish', 'no'), ('squish', 'no'),
('speex', 'no'), ('speex', 'no'),
('old_scenes', 'no'), ('old_scenes', 'no'),
('etc1', 'no'),
# ('default_gui_theme', 'no'), # ('default_gui_theme', 'no'),
#('builtin_zlib', 'no'), #('builtin_zlib', 'no'),