diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:08:08 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:08:08 -0800 |
| commit | 35237d135807af84bf9b0e5b8d7f8633e58db6f5 (patch) | |
| tree | d8bcf3ada2182d248604728285dd80abb466f22a /include/private/pixelflinger/ggl_context.h | |
| parent | 4f6e8d7a00cbeda1e70cc15be9c4af1018bdad53 (diff) | |
| download | system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.tar.gz system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.tar.bz2 system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.zip | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'include/private/pixelflinger/ggl_context.h')
| -rw-r--r-- | include/private/pixelflinger/ggl_context.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/private/pixelflinger/ggl_context.h b/include/private/pixelflinger/ggl_context.h index 241a0abdb..3a030c526 100644 --- a/include/private/pixelflinger/ggl_context.h +++ b/include/private/pixelflinger/ggl_context.h @@ -147,11 +147,11 @@ GGL_RESERVE_NEEDS( P_FOG, 9, 1 ) GGL_RESERVE_NEEDS( P_RESERVED1, 10,22 ) GGL_RESERVE_NEEDS( T_FORMAT, 0, 6 ) -GGL_RESERVE_NEEDS( T_RESERVED0, 6, 2 ) +GGL_RESERVE_NEEDS( T_RESERVED0, 6, 1 ) +GGL_RESERVE_NEEDS( T_POT, 7, 1 ) GGL_RESERVE_NEEDS( T_S_WRAP, 8, 2 ) GGL_RESERVE_NEEDS( T_T_WRAP, 10, 2 ) -GGL_RESERVE_NEEDS( T_ENV, 12, 2 ) -GGL_RESERVE_NEEDS( T_POT, 14, 1 ) +GGL_RESERVE_NEEDS( T_ENV, 12, 3 ) GGL_RESERVE_NEEDS( T_LINEAR, 15, 1 ) const int GGL_NEEDS_WRAP_CLAMP_TO_EDGE = 0; @@ -182,12 +182,14 @@ inline uint32_t ggl_env_to_needs(uint32_t e) { case GGL_MODULATE: return 1; case GGL_DECAL: return 2; case GGL_BLEND: return 3; + case GGL_ADD: return 4; } return 0; } inline uint32_t ggl_needs_to_env(uint32_t n) { - const uint32_t envs[] = { GGL_REPLACE, GGL_MODULATE, GGL_DECAL, GGL_BLEND }; + const uint32_t envs[] = { GGL_REPLACE, GGL_MODULATE, + GGL_DECAL, GGL_BLEND, GGL_ADD }; return envs[n]; } |