diff options
| author | Alexei Shlychkov <shlychkov@gmail.com> | 2011-11-25 18:16:03 -0800 |
|---|---|---|
| committer | David Sin <davidsin@ti.com> | 2011-11-29 09:31:13 -0600 |
| commit | 9105e8597ffc9d6f51f3fdda4b831ad9f15a4636 (patch) | |
| tree | 02115441f0644992499de21c1e60445248415c7e | |
| parent | e07e5733b2d5ad128d2f6331f2274c52add373d0 (diff) | |
| download | hardware_ti_omap4-9105e8597ffc9d6f51f3fdda4b831ad9f15a4636.zip hardware_ti_omap4-9105e8597ffc9d6f51f3fdda4b831ad9f15a4636.tar.gz hardware_ti_omap4-9105e8597ffc9d6f51f3fdda4b831ad9f15a4636.tar.bz2 | |
Simplified some regs defines.
Change-Id: I054f6b4b0686ec5d62306a08d294f32804c2ee38
Signed-off-by: Alexei Shlychkov <shlychkov@gmail.com>
| -rw-r--r-- | gc2d/bv.c | 4 | ||||
| -rw-r--r-- | gc2d/gcreg.h | 93 |
2 files changed, 51 insertions, 46 deletions
@@ -391,8 +391,8 @@ struct bvblendxlate { BVBLENDDEF_ ## Normal #define BVBLENDMODE(Mode, Inverse) \ - AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_ ## Mode, \ - AQ_DRAWING_ENGINE_FACTOR_INVERSE_ ## Inverse + GCDE_BLENDING_MODE_ ## Mode, \ + GCDE_FACTOR_INVERSE_ ## Inverse #define BVBLENDUNDEFINED() \ ~0, ~0 diff --git a/gc2d/gcreg.h b/gc2d/gcreg.h index 3ad1dc7..43f4892 100644 --- a/gc2d/gcreg.h +++ b/gc2d/gcreg.h @@ -6817,61 +6817,66 @@ ** Generic defines */ -#define AQ_DRAWING_ENGINE_FORMAT_SUB_SAMPLE_MODE_YUV_MODE422 0x0 -#define AQ_DRAWING_ENGINE_FORMAT_SUB_SAMPLE_MODE_YUV_MODE420 0x1 - -#define AQ_DRAWING_ENGINE_FORMAT_SWIZZLE_ARGB 0x0 -#define AQ_DRAWING_ENGINE_FORMAT_SWIZZLE_RGBA 0x1 -#define AQ_DRAWING_ENGINE_FORMAT_SWIZZLE_ABGR 0x2 -#define AQ_DRAWING_ENGINE_FORMAT_SWIZZLE_BGRA 0x3 - -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_X4R4G4B4 0x00 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_A4R4G4B4 0x01 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_X1R5G5B5 0x02 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_A1R5G5B5 0x03 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_R5G6B5 0x04 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_X8R8G8B8 0x05 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_A8R8G8B8 0x06 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_YUY2 0x07 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_UYVY 0x08 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_INDEX8 0x09 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_MONOCHROME 0x0A -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_YV12 0x0F -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_A8 0x10 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_NV12 0x11 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_NV16 0x12 -#define AQ_DRAWING_ENGINE_FORMAT_FORMAT_RG16 0x13 +#define GCDE_FORMAT_SUB_SAMPLE_MODE_YUV_MODE422 0x0 +#define GCDE_FORMAT_SUB_SAMPLE_MODE_YUV_MODE420 0x1 + +#define GCDE_FORMAT_SWIZZLE_ARGB 0x0 +#define GCDE_FORMAT_SWIZZLE_RGBA 0x1 +#define GCDE_FORMAT_SWIZZLE_ABGR 0x2 +#define GCDE_FORMAT_SWIZZLE_BGRA 0x3 + +#define GCDE_FORMAT_FORMAT_X4R4G4B4 0x00 +#define GCDE_FORMAT_FORMAT_A4R4G4B4 0x01 +#define GCDE_FORMAT_FORMAT_X1R5G5B5 0x02 +#define GCDE_FORMAT_FORMAT_A1R5G5B5 0x03 +#define GCDE_FORMAT_FORMAT_R5G6B5 0x04 +#define GCDE_FORMAT_FORMAT_X8R8G8B8 0x05 +#define GCDE_FORMAT_FORMAT_A8R8G8B8 0x06 +#define GCDE_FORMAT_FORMAT_YUY2 0x07 +#define GCDE_FORMAT_FORMAT_UYVY 0x08 +#define GCDE_FORMAT_FORMAT_INDEX8 0x09 +#define GCDE_FORMAT_FORMAT_MONOCHROME 0x0A +#define GCDE_FORMAT_FORMAT_YV12 0x0F +#define GCDE_FORMAT_FORMAT_A8 0x10 +#define GCDE_FORMAT_FORMAT_NV12 0x11 +#define GCDE_FORMAT_FORMAT_NV16 0x12 +#define GCDE_FORMAT_FORMAT_RG16 0x13 /* ~~~~~~~~~~~~~ */ -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_ALPHA_MODE_NORMAL 0x0 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_ALPHA_MODE_INVERSED 0x1 +#define GCDE_ALPHA_MODE_NORMAL 0x0 +#define GCDE_ALPHA_MODE_INVERSED 0x1 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_GLOBAL_ALPHA_MODE_NORMAL 0x0 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_GLOBAL_ALPHA_MODE_GLOBAL 0x1 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_GLOBAL_ALPHA_MODE_SCALED 0x2 +#define GCDE_GLOBAL_ALPHA_MODE_NORMAL 0x0 +#define GCDE_GLOBAL_ALPHA_MODE_GLOBAL 0x1 +#define GCDE_GLOBAL_ALPHA_MODE_SCALED 0x2 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_COLOR_MODE_NORMAL 0x0 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_COLOR_MODE_MULTIPLY 0x1 +#define GCDE_COLOR_MODE_NORMAL 0x0 +#define GCDE_COLOR_MODE_MULTIPLY 0x1 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_ZERO 0x0 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_ONE 0x1 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_NORMAL 0x2 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_INVERSED 0x3 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_COLOR 0x4 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_COLOR_INVERSED 0x5 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_SATURATED_ALPHA 0x6 -#define AQ_DRAWING_ENGINE_ALPHA_BLENDING_BLENDING_MODE_SATURATED_DEST_ALPHA 0x7 +#define GCDE_BLENDING_MODE_ZERO 0x0 +#define GCDE_BLENDING_MODE_ONE 0x1 +#define GCDE_BLENDING_MODE_NORMAL 0x2 +#define GCDE_BLENDING_MODE_INVERSED 0x3 +#define GCDE_BLENDING_MODE_COLOR 0x4 +#define GCDE_BLENDING_MODE_COLOR_INVERSED 0x5 +#define GCDE_BLENDING_MODE_SATURATED_ALPHA 0x6 +#define GCDE_BLENDING_MODE_SATURATED_DEST_ALPHA 0x7 /* ~~~~~~~~~~~~~ */ -#define AQ_DRAWING_ENGINE_RESOURCE_USAGE_OVERRIDE_DEFAULT 0x0 -#define AQ_DRAWING_ENGINE_RESOURCE_USAGE_OVERRIDE_USE_ENABLE 0x1 -#define AQ_DRAWING_ENGINE_RESOURCE_USAGE_OVERRIDE_USE_DISABLE 0x2 +#define GCDE_FACTOR_INVERSE_DISABLE 0x0 +#define GCDE_FACTOR_INVERSE_ENABLE 0x1 /* ~~~~~~~~~~~~~ */ -#define AQ_DRAWING_ENGINE_FACTOR_INVERSE_DISABLE 0x0 -#define AQ_DRAWING_ENGINE_FACTOR_INVERSE_ENABLE 0x1 +#define GCDE_PREMULTIPLY_DISABLE 0x0 +#define GCDE_PREMULTIPLY_ENABLE 0x1 + +/* ~~~~~~~~~~~~~ */ + +#define GCDE_RESOURCE_USAGE_OVERRIDE_DEFAULT 0x0 +#define GCDE_RESOURCE_USAGE_OVERRIDE_USE_ENABLE 0x1 +#define GCDE_RESOURCE_USAGE_OVERRIDE_USE_DISABLE 0x2 #endif |