kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas rg_etc2: Use new ETC2 decoder for RGB8_ETC2 

Alpha support is still a TODO.
This commit is contained in:
Jean-Philippe Andre 2014-04-30 17:18:50 +09:00
parent 5582ee016e
commit 4e358a582e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/evas/loaders/tgv/evas_image_load_tgv.c
View File

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