Просмотр исходного кода

Revert "Removing etc1 from build for javascript platform."

This reverts commit 41b729ccff74e5a9154bee7db0d36ffd74641eae.
V.VamsiKrishna 10 лет назад
Родитель
Сommit
9965e93f7e
3 измененных файлов с 4 добавлено и 2 удалено
  1. 0 1
      SConstruct
  2. 4 0
      drivers/etc1/rg_etc1.cpp
  3. 0 1
      platform/javascript/detect.py

+ 0 - 1
SConstruct

@@ -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 - 0
drivers/etc1/rg_etc1.cpp

@@ -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;

+ 0 - 1
platform/javascript/detect.py

@@ -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'),