[EGIT] [core/efl] master 03/07: Evas rg_etc2: Use new ETC2 decoder for RGB8_ETC2

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4e358a582e17114d3bd047af759d261edfee0219

commit 4e358a582e17114d3bd047af759d261edfee0219
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed Apr 30 17:18:50 2014 +0900

    Evas rg_etc2: Use new ETC2 decoder for RGB8_ETC2
    
    Alpha support is still a TODO.
---
 src/modules/evas/loaders/tgv/evas_image_load_tgv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 5d26fa0..30d6cea 100644
--- a/src/modules/evas/loaders/tgv/evas_image_load_tgv.c
+++ b/src/modules/evas/loaders/tgv/evas_image_load_tgv.c
@@ -72,9 +72,7 @@ static const Evas_Colorspace cspaces_etc1[2] = {
 
 static const Evas_Colorspace cspaces_rgb8_etc2[2] = {
   EVAS_COLORSPACE_RGB8_ETC2,
-#ifdef HAVE_ETC2_DECODER
   EVAS_COLORSPACE_ARGB8888
-#endif
 };
 
 static const Evas_Colorspace cspaces_rgba8_etc2_eac[2] = {
@@ -327,8 +325,7 @@ evas_image_load_file_data_tgv(void *loader_data,
         master.x += 1;
         master.y += 1;
 #ifndef HAVE_ETC2_DECODER
-        if (loader->cspace == EVAS_COLORSPACE_RGB8_ETC2 ||
-            loader->cspace == EVAS_COLORSPACE_RGBA8_ETC2_EAC)
+        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;
@@ -410,6 +407,9 @@ evas_image_load_file_data_tgv(void *loader_data,
                                 continue;
                              }
                            break;
+                         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);

--