[EGIT] [core/efl] master 05/07: Evas rg_etc1: Also decode RGBA8 from the TGV loader

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=525bc4117ac8521eacc8bbcf646dec6a6537da3d

commit 525bc4117ac8521eacc8bbcf646dec6a6537da3d
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed May 7 14:50:29 2014 +0900

    Evas rg_etc1: Also decode RGBA8 from the TGV loader
---
 src/modules/evas/loaders/tgv/evas_image_load_tgv.c | 17 +----------------
 src/static_libs/rg_etc/rg_etc1.h                   |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/modules/evas/loaders/tgv/evas_image_load_tgv.c 
b/src/modules/evas/loaders/tgv/evas_image_load_tgv.c
index 30d6cea..7216049 100644
--- a/src/modules/evas/loaders/tgv/evas_image_load_tgv.c
+++ b/src/modules/evas/loaders/tgv/evas_image_load_tgv.c
@@ -77,9 +77,7 @@ static const Evas_Colorspace cspaces_rgb8_etc2[2] = {
 
 static const Evas_Colorspace cspaces_rgba8_etc2_eac[2] = {
   EVAS_COLORSPACE_RGBA8_ETC2_EAC,
-#ifdef HAVE_ETC2_DECODER
   EVAS_COLORSPACE_ARGB8888
-#endif
 };
 
 static void *
@@ -324,14 +322,6 @@ evas_image_load_file_data_tgv(void *loader_data,
         // Offset to take duplicated pixels into account
         master.x += 1;
         master.y += 1;
-#ifndef HAVE_ETC2_DECODER
-        if (loader->cspace == EVAS_COLORSPACE_RGBA8_ETC2_EAC)
-          {
-             fprintf(stderr, "Requested ETC2 to RGBA conversion but there is 
no decoder\n");
-             *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
-             goto on_error;
-          }
-#endif
         break;
       default: abort();
      }
@@ -410,14 +400,9 @@ evas_image_load_file_data_tgv(void *loader_data,
                          case EVAS_COLORSPACE_RGB8_ETC2:
                            rg_etc2_rgb8_decode_block((uint8_t *) it, 
temporary);
                            break;
-#ifdef HAVE_ETC2_DECODER
-                         case EVAS_COLORSPACE_RGB8_ETC2:
-                           etc2_rgb8_decode_block((uint8_t *) it, (uint8_t *) 
temporary, 16, 4, 4);
-                           break;
                          case EVAS_COLORSPACE_RGBA8_ETC2_EAC:
-                           etc2_rgba8_decode_block((uint8_t *) it, (uint8_t *) 
temporary, 16, 4, 4);
+                           rg_etc2_rgba8_decode_block((uint8_t *) it, 
temporary);
                            break;
-#endif
                          default: abort();
                         }
 
diff --git a/src/static_libs/rg_etc/rg_etc1.h b/src/static_libs/rg_etc/rg_etc1.h
index 43a86aa..8de77ad 100644
--- a/src/static_libs/rg_etc/rg_etc1.h
+++ b/src/static_libs/rg_etc/rg_etc1.h
@@ -40,7 +40,7 @@ unsigned int rg_etc1_pack_block(void* pETC1_block, const 
unsigned int* pSrc_pixe
 void rg_etc2_rgb8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
 
 // ETC2 support: RGBA8_ETC2_EAC
-//void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
+void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
 
 
//------------------------------------------------------------------------------
 //

--