add ETC1 support to fb/mipcube demo, figure out supertiling

Also figure out some other resolve state.
Add a tool (genmipmaps_etc1.py) to generate a dds file with ETC1 texture
compression and auto-generate mipmaps (GIMP dds plugin cannot do ETC1).

3 files changed, 0 insertions, 496 deletions

diff --git a/kernel_drivers/gc600_driver_dove/galcore_ko_src/Android.mk.def b/kernel_drivers/gc600_driver_dove/galcore_ko_src/Android.mk.def
deleted file mode 100644
index 344905c..0000000
--- a/kernel_drivers/gc600_driver_dove/galcore_ko_src/Android.mk.def
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-#
-#    Copyright (c) 2005 - 2010 by Vivante Corp.  All rights reserved.
-#
-#    The material in this file is confidential and contains trade secrets
-#    of Vivante Corporation. This is proprietary information owned by
-#    Vivante Corporation. No part of this work may be disclosed,
-#    reproduced, copied, transmitted, or used in any way for any purpose,
-#    without the express written permission of Vivante Corporation.
-#
-##############################################################################
-#
-#
-##############################################################################
-
-
-#
-# Common include file for Android build
-#
-
-################################################################
-# Options.
-
-# CPU arch type. Could be 'arm' or 'mips'
-ARCH_TYPE 				    ?= arm
-FIXED_ARCH_TYPE				?=
-
-# CPU arch type.
-GPU_TYPE					?= XAQ2
-
-# Kernel directory
-export KERNEL_DIR			?= $(ANDROID_BUILD_TOP)/kernel/kernel
-
-# Cross compiler for building kernel module
-export CROSS_COMPILE		?= arm-eabi-
-
-# Driver build options.
-NO_DMA_COHERENT				?= 1
-ENABLE_GPU_CLOCK_BY_DRIVER	?= 1
-ENABLE_ARM_L2_CACHE			?= 1
-USE_PLATFORM_DRIVER			?= 1
-USE_NEW_LINUX_SIGNAL		?= 0
-USE_PROFILER				?= 0
-
-
-################################################################
-# Target INCLUDES.
-
-C_INCLUDES	:= $(TARGET_C_INCLUDES) $(filter-out %/opengl/include,$(TARGET_PROJECT_INCLUDES))
-
-
-################################################################
-# Target CFLAGS.
-
-CFLAGS		:= $(TARGET_GLOBAL_CFLAGS) $(TARGET_$(ARCH_TYPE)_CFLAGS)
-
-CFLAGS		+= -DANDROID=1 -DEGL_API_ANDROID=1 -DUSE_VDK=0 -DLINUX
-CFLAGS		+= -fno-strict-aliasing -fno-short-enums
-
-ifeq ($(PLATFORM_SDK_VERSION), 7)
-CFLAGS		+= -DANDROID_VERSION_ECLAIR
-else
-$(error This makefile is only for eclair)
-endif
-
-ifeq ($(USE_PROFILER), 1)
-CFLAGS		+= -DVIVANTE_PROFILER=1
-else
-CFLAGS		+= -DVIVANTE_PROFILER=0
-endif
-
-
-################################################################
-# Tag.
-
-TAG					:= VIVANTE
-
-################################################################
-# Variables.
-
-export AQROOT				:= $(abspath $(call my-dir))
-export AQARCH				:= $(AQROOT)/arch/$(GPU_TYPE)
-
-GC_HAL_USER_DIR				:= hal/user
-GC_HAL_ARCH_USER_DIR		:= arch/$(GPU_TYPE)/hal/user
-GC_HAL_OS_USER_DIR			:= hal/os/linux/user
-GC_HAL_OPTIMIZER_DIR		:= hal/optimizer
-GC_EGL_DIR					:= driver/openGL/egl
-GC_GLES11_DIR				:= driver/openGL/libGLESv11
-GC_GLESv2X_DIR				:= driver/openGL/libGLESv2x/driver
-GC_GLESv2SC_DIR				:= driver/openGL/libGLESv2x/compiler/libGLESv2SC
-
diff --git a/kernel_drivers/gc600_driver_dove/galcore_ko_src/hal/makefile.linux b/kernel_drivers/gc600_driver_dove/galcore_ko_src/hal/makefile.linux
deleted file mode 100644
index f957d92..0000000
--- a/kernel_drivers/gc600_driver_dove/galcore_ko_src/hal/makefile.linux
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################################################################
-#  
-#    Copyright (c) 2005 - 2010 by Vivante Corp.  All rights reserved.
-#  
-#    The material in this file is confidential and contains trade secrets
-#    of Vivante Corporation. This is proprietary information owned by
-#    Vivante Corporation. No part of this work may be disclosed, 
-#    reproduced, copied, transmitted, or used in any way for any purpose, 
-#    without the express written permission of Vivante Corporation.
-#  
-##############################################################################
-#  
-#  
-##############################################################################
-
-
-
-#
-# Linux build file for the user level HAL libraries.
-#
-
-
-
-################################################################################
-# Define make command.
-
-MAKE = make --makefile=makefile.linux
-
-
-################################################################################
-# Define build directories.
-
-HAL_USER_DRV_ARCH	:= $(AQARCH)/hal/user
-ifeq ($(QNX), 1)
-HAL_USER_DRV_OS 	:= $(AQROOT)/hal/os/qnx/user
-else
-HAL_USER_DRV_OS 	:= $(AQROOT)/hal/os/linux/user
-endif
-HAL_USER_DRV_MAIN	:= $(AQROOT)/hal/user
-
-$(HAL_USER_DRV_MAIN): $(HAL_USER_DRV_ARCH) $(HAL_USER_DRV_OS)
-
-MODULES 	:= $(HAL_USER_DRV_ARCH) $(HAL_USER_DRV_OS) $(HAL_USER_DRV_MAIN)
-MAIN_MODULE	= $(HAL_USER_DRV_MAIN)
-
-include $(AQROOT)/common.node
diff --git a/kernel_drivers/gc600_driver_dove/galcore_ko_src/makefile.linux.def b/kernel_drivers/gc600_driver_dove/galcore_ko_src/makefile.linux.def
deleted file mode 100644
index 2057760..0000000
--- a/kernel_drivers/gc600_driver_dove/galcore_ko_src/makefile.linux.def
+++ /dev/null
@@ -1,358 +0,0 @@
-##############################################################################
-#
-#    Copyright (c) 2005 - 2010 by Vivante Corp.  All rights reserved.
-#
-#    The material in this file is confidential and contains trade secrets
-#    of Vivante Corporation. This is proprietary information owned by
-#    Vivante Corporation. No part of this work may be disclosed,
-#    reproduced, copied, transmitted, or used in any way for any purpose,
-#    without the express written permission of Vivante Corporation.
-#
-##############################################################################
-#
-#
-##############################################################################
-
-
-#
-# Common inlude file for Linux build.
-#
-
-################################################################
-# Arch.
-
-ARCH_TYPE       ?= arm
-CPU_TYPE        ?= arm920
-CPU_ARCH        ?= 0
-STATIC_LINK     ?= 0
-EGL_API_FB      ?= 0
-USE_VDK         ?= 0
-USE_PROFILER    ?= 0
-USE_SW_FB       ?= 0
-USE_3D_VG		=1
-ABI             ?= 0
-ANDROID         ?= 0
-EGL_API_ANDROID ?= 0
-ANDROID_VERSION_ECLAIR  ?= 0
-ENUM_WORKAROUND ?= 0
-ENDIANNESS		?=
-QNX             ?= 0
-LINUX_OABI		?= 0
-USE_ARMCC		?= 0
-
-ifeq ($(LINUX_OABI), 1)
-ABI             ?= 0
-else
-ABI             ?= aapcs-linux
-endif
-
-################################################################
-# Toolchain.
-
-ifeq ($(USE_ARMCC),1)
-	ARM_BASE		?=	/home/software/ARM
-	ARM_VERSION		?=	4.0/650
-	CROSS_COMPILE	?=	$(ARM_BASE)/RVCT/Programs/$(ARM_VERSION)/linux-pentium/arm
-	CFLAGS			+=	-I$(ARM_BASE)/RVCT/Data/$(ARM_VERSION)/include/unix
-	CC     := $(CROSS_COMPILE)cc
-	CXX    := $(CROSS_COMPILE)cc
-	AR     := $(CROSS_COMPILE)ar
-	AS     := $(CROSS_COMPILE)as
-	LD     := $(CROSS_COMPILE)link
-else
-	CROSS_COMPILE ?= arm-none-linux-gnueabi-
-	CC     := $(CROSS_COMPILE)gcc
-	CXX    := $(CROSS_COMPILE)g++
-	AR     := $(CROSS_COMPILE)ar
-	AS     := $(CROSS_COMPILE)as
-	LD     := $(CROSS_COMPILE)ld
-	RANLIB := $(CROSS_COMPILE)ranlib
-	STRIP  := $(CROSS_COMPILE)strip
-endif
-
-################################################################
-# Make command.
-
-MAKE     = make --makefile=makefile.linux
-DRV_MAKE ?= make --makefile=Kbuild
-
-################################################################
-# Resource.
-
-TOOL_DIR     ?= /home/software/Linux
-ANDROID_HOME ?=
-KERNEL_DIR   ?= $(TOOL_DIR)/kernel
-X11_ARM_DIR  ?= $(TOOL_DIR)/X11_ARM
-
-################################################################
-# Target directory.
-
-ifeq ($(DEBUG), 1)
-OBJ_DIR	?= bin_d
-else
-OBJ_DIR	?= bin_r
-endif
-
-################################################################
-# Force to use the new compiler.
-
-SC2X_NEW ?= 1
-ES11_NEW ?= 1
-
-################################################################
-# Release directory.
-
-SDK_DIR ?= $(AQROOT)/build/sdk
-VIVANTE_SDK_DIR ?= $(SDK_DIR)
-VIVANTE_SDK_INC ?= $(VIVANTE_SDK_DIR)/include
-VIVANTE_SDK_LIB ?= $(VIVANTE_SDK_DIR)/drivers
-
-################################################################
-# Force to use dma_coherent_* stuff.
-
-NO_DMA_COHERENT ?= 0
-
-################################################################
-# Set this value to 1 if you are using ARM L2 cache.
-
-ENABLE_ARM_L2_CACHE	?= 0
-
-################################################################
-# Set this value to 1 if you are using DOVE board.
-CONFIG_DOVE_GPU		?= 0
-
-###############################################################
-# Common CFLAGS.
-
-ifeq ($(USE_ARMCC), 1)
-	CFLAGS += --c99 #--strict
-else
-ifeq ($(ABI), 0)
-else
-	CFLAGS += -mabi=$(ABI)
-endif
-
-ifneq ($(ENDIANNESS),)
-   	CFLAGS += $(ENDIANNESS)
-	LFLAGS += $(ENDIANNESS)
-	PFLAGS += $(ENDIANNESS)
-endif
-endif
-
-ifeq ($(ANDROID), 1)
-    USE_VDK = 0
-
-    ifeq ($(ARCH_TYPE), arm)
-	CFLAGS += -I$(ANDROID_HOME)/bionic/libstdc++/include -I$(ANDROID_HOME)/bionic/libc/arch-arm/include -I$(ANDROID_HOME)/bionic/libc/include -I$(ANDROID_HOME)/bionic/libc/kernel/common/ -I$(ANDROID_HOME)/bionic/libc/kernel/arch-arm -I$(ANDROID_HOME)/bionic/libm/include -I$(ANDROID_HOME)/bionic/libm/include/arch/arm -I$(ANDROID_HOME)/bionic/libthread_db/include -I$(ANDROID_HOME)/system/core/include -I$(ANDROID_HOME)/frameworks/base/include
-        CFLAGS += -DANDROID -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -fno-short-enums
-    endif
-
-    ifeq ($(ARCH_TYPE), xburst)
-        CFLAGS += -I$(ANDROID_HOME)/bionic/libstdc++/include -I$(ANDROID_HOME)/bionic/libc/arch-xburst/include -I$(ANDROID_HOME)/bionic/libc/include -I$(ANDROID_HOME)/bionic/libc/kernel/common/ -I$(ANDROID_HOME)/bionic/libc/kernel/arch-xburst -I$(ANDROID_HOME)/bionic/libm/include -I$(ANDROID_HOME)/bionic/libm/include/mips -I$(ANDROID_HOME)/bionic/libthread_db/include
-    endif
-
-    ifeq ($(EGL_API_ANDROID), 1)
-        CFLAGS += -DEGL_API_ANDROID
-    endif
-
-    ifeq ($(ANDROID_VERSION_ECLAIR), 1)
-        CFLAGS += -DANDROID_VERSION_ECLAIR
-    endif
-
-    ifeq ($(ANDROID_VERSION_GINGERBREAD), 1)
-        CFLAGS +=  -I$(ANDROID_HOME)/frameworks/base/native/include -DANDROID_VERSION_GINGERBREAD
-    endif
-endif
-
-ifeq ($(QNX), 1)
-	CFLAGS += -D__QNXNTO__
-else
-	ifneq ($(USE_ARMCC),1)
-		CFLAGS += -DLINUX
-	endif
-endif
-
-ifeq ($(LINUX_OABI), 1)
-	CFLAGS += -DLINUX_OABI
-endif
-
-ifneq ($(USE_ARMCC), 1)
-CFLAGS += -Wall -D_REENTRANT -fno-strict-aliasing
-
-ifeq ($(CPU_TYPE), 0)
-else
-	CFLAGS += -mcpu=$(CPU_TYPE)
-	AFLAGS += -mcpu=$(CPU_TYPE)
-endif
-
-ifeq ($(CPU_ARCH), 0)
-else
-	CFLAGS += -march=$(CPU_ARCH)
-	AFLAGS += -march=$(CPU_ARCH)
-endif
-endif
-
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fPIC -O0 -DDEBUG -D_DEBUG
-else
-	CFLAGS += -O2 -fPIC
-endif
-
-ifeq ($(EGL_API_FB), 1)
-	CFLAGS += -DEGL_API_FB
-endif
-
-ifeq ($(STATIC_LINK), 1)
-	CFLAGS += -DSTATIC_LINK
-endif
-
-ifeq ($(USE_VDK), 1)
-	CFLAGS += -DUSE_VDK=1 -DUSE_SW_FB=$(USE_SW_FB)
-else
-	CFLAGS += -DUSE_VDK=0 -DUSE_SW_FB=$(USE_SW_FB)
-endif
-ifeq ($(MRVL_NATIVE_IMAGE_KHR_FOR_CHROME),1)
-    CFLAGS += -DMRVL_NATIVE_IMAGE_KHR_FOR_CHROME=1
-else
-    CFLAGS += -DMRVL_NATIVE_IMAGE_KHR_FOR_CHROME=0
-endif
-
-ifeq ($(USE_NEW_LINUX_SIGNAL), 1)
-	CFLAGS += -DUSE_NEW_LINUX_SIGNAL=1
-endif
-
-ifneq ($(USE_ARMCC), 1)
-CXXFLAGS += -fno-short-enums
-endif
-
-ifneq (,$(EGL_APPENDIX))
-CFLAGS += -D_EGL_APPENDIX=$(EGL_APPENDIX)
-endif
-ifneq (,$(GL_11_APPENDIX))
-CFLAGS += -D_GL_11_APPENDIX=$(GL_11_APPENDIX)
-endif
-ifneq (,$(GL_2_APPENDIX))
-CFLAGS += -D_GL_2_APPENDIX=$(GL_2_APPENDIX)
-endif
-ifneq (,$(VG_APPENDIX))
-CFLAGS += -D_VG_APPENDIX=$(VG_APPENDIX)
-endif
-
-CFLAGS += -DgcdREGISTER_ACCESS_FROM_USER=1
-
-################################################################################
-# Build with profiler
-ifeq ($(USE_PROFILER),1)
-    CFLAGS += -DVIVANTE_PROFILER=1
-else
-    CFLAGS += -DVIVANTE_PROFILER=0
-endif
-
-ifeq ($(USE_MRVL_PROFILER),1)
-    CFLAGS += -DMRVL_BENCH=1
-else
-    CFLAGS += -DMRVL_BENCH=0
-endif
-
-
-################################################################
-# Module directories.
-
-# drivers
-GAL_DIR         := $(AQROOT)/hal
-ifeq ($(ES11_NEW), 1)
-GLES11_DIR      := $(AQROOT)/driver/openGL/libGLESv11
-else
-GLES11_DIR      := $(AQROOT)/driver/openGL/es11/driver
-endif
-EGL_DIR         := $(AQROOT)/driver/openGL/egl
-GLES2X_DIR      := $(AQROOT)/driver/openGL/libGLESv2x
-ifeq ($(USE_3D_VG), 1)
-VG11_DIR        := $(AQROOT)/driver/openVG/vg11
-OVG11_DIR       := $(AQROOT)/driver/openVG/vg11/driver
-else
-VG11_DIR        := $(AQROOT)/driver/openGL/libOpenVG
-OVG11_DIR       := $(AQROOT)/driver/openGL/libOpenVG
-endif
-GFX_DIR         := $(AQROOT)/driver/gfx
-
-ifeq ($(SC2X_NEW), 1)
-SC2X_LIB_DIR    := $(GLES2X_DIR)/compiler/libGLESv2SC/entry
-else
-SC2X_LIB_DIR    := $(GLES2X_DIR)/slc/glslang/MachineIndependent/compiler
-endif
-
-ifeq ($(ANDROID), 1)
-GCU_DIR		:= $(AQROOT)/gcu/proj/android
-else
-GCU_DIR		:= $(AQROOT)/gcu/proj/linux
-endif
-
-VIVANTE_LIB_DIR	:= $(AQROOT)/sdk/vivante
-
-# applications
-EGL_TEST_DIR	:= $(AQROOT)/test/egl
-ES11_TEST_DIR   := $(AQROOT)/test/es11/Linux
-ES2X_TEST_DIR   := $(AQROOT)/test/es20
-ES2X_EXTERN_DIR := $(AQROOT)/test/es20/extern
-ES20_TEST_DIR   := $(AQROOT)/sdk/samples/es20
-
-ifeq ($(USE_VDK), 0)
-TUTORIAL_DIR    := $(ES11_TEST_DIR)
-endif
-VDK_TEST_DIR    := $(AQROOT)/sdk/samples/vdk
-HAL_TEST_DIR    := $(AQROOT)/sdk
-HAL_CUSTOM_DIR	:= $(AQROOT)/test/hal/Linux/custom
-CHIPINFO_DIR    := $(AQROOT)/test/hal/common/chipinfo
-VDK_DIR         := $(AQROOT)/sdk/vdk
-
-ifeq ($(USE_VDK), 1)
-CONFORM_DIR     := $(AQROOT)/test/es11/conform
-else
-# old es11 conformce test was removed
-# $(AQROOT)/driver/openGL/es11/test/conform
-CONFORM_DIR	    :=
-endif
-
-GLBES11_DIR     := $(AQROOT)/test/es11/GLBenchmark_ES1.1v2
-GLBES20_DIR     := $(AQROOT)/test/es20/GLBenchmark2_RC2
-GLBESNAVI11_DIR := $(AQROOT)/test/es11/GLBenchmark_Navi_Beta2/es11
-GLBESNAVI20_DIR := $(AQROOT)/test/es11/GLBenchmark_Navi_Beta2/es20
-GTF_DIR         := $(AQROOT)/test/es20/conform/GTF_ES/glsl/GTF
-VGMARK_DIR      := $(AQROOT)/test/vg/common/VGMark_10_src
-VGMARK11_DIR    := $(AQROOT)/test/vg11/VGMark11/VGMark11_addendum
-VGCTS_DIR       := $(AQROOT)/test/vg/ovg_1.0.1_cts_rc10
-VGCTS11_DIR     := $(AQROOT)/test/vg/ovg_1.1_cts_rc10
-ifeq ($(USE_VDK), 1)
-MM06_DIR        := $(AQROOT)/test/es11/common/3DMarkMobile06/configuration/vdk
-else
-MM06_DIR        := $(ES11_TEST_DIR)/3DMarkMobile06
-endif
-MM07_DIR        := $(ES2X_TEST_DIR)/3DMarkMobileES2_RC_src
-MM07U_DIR       := $(ES2X_TEST_DIR)/3DMarkMobileES2_Update
-SM20_DIR        := $(AQROOT)/test/es20/SimulationMark_ES_2.0
-KANZI_DIR       := $(AQROOT)/test/es20/Kanzi_UI_demo/Kanzi_UI_src
-AB20_DIR        := $(ES2X_TEST_DIR)/Automotive
-JRC_DIR         := $(ES2X_TEST_DIR)/JRC
-GFX_TEST_DIR    := $(AQROOT)/test/gfx
-ES20_GEARS_DIR  := $(AQROOT)/test/es20/gles2-cm-gears
-ES11_UNIT_DIR   := $(AQROOT)/test/es11/common/UnitTest
-ES11_EXTERN_DIR := $(AQROOT)/test/es11/extern
-ES11_EXTENSION_DIR := $(AQROOT)/test/es11/Extension
-ES11_GEARS_DIR	:= $(AQROOT)/test/es11/gles1-cm-gears
-VG11_UNIT_DIR   := $(AQROOT)/test/vg11/UnitTest
-VG11_EXTERN_DIR := $(AQROOT)/test/vg11/extern
-
-# third party resources
-DFB_DIR ?= $(TOOL_DIR)/dfb
-
-TEXTURE5_DIR    := $(ES2X_TEST_DIR)/texture5
-TEXTURE7_DIR    := $(ES2X_TEST_DIR)/texture7
-
-ACTINIUM_DIR    := $(ES2X_TEST_DIR)/actinium
-VVLAUNCHER_DIR  := $(ES2X_TEST_DIR)/vv_launcher
-
-VIDEOCUBE_DIR	:= $(AQROOT)/test/es11/extern/VideoCube
-
-
-