diff options
| author | 2008-12-19 08:31:54 -0800 | |
|---|---|---|
| committer | 2008-12-19 08:31:54 -0800 | |
| commit | 772a89695f179b51d16b26c1b0d946aa3e850e70 (patch) | |
| tree | 9a9fdadd1301625f875a3c126c986c79e3363ac4 /opengl/libagl/array.cpp | |
| parent | d34e59679f6a98e9e67ef4bd18da6e5a86d386bc (diff) | |
| parent | e09fd9e819c23dc90bca68375645e15544861330 (diff) | |
Merge commit 'remotes/korg/cupcake'
Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java
Diffstat (limited to 'opengl/libagl/array.cpp')
| -rw-r--r-- | opengl/libagl/array.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp index 1f6757dda5..8fa7566aac 100644 --- a/opengl/libagl/array.cpp +++ b/opengl/libagl/array.cpp @@ -1116,8 +1116,8 @@ void validate_arrays(ogles_context_t* c, GLenum mode) if (enables & GGL_ENABLE_TMUS) { // needs texture transforms want |= transform_state_t::TEXTURE; } - if (c->clipPlanes.enable) { // needs eye coords - want |= transform_state_t::MODELVIEW; + if (c->clipPlanes.enable || (enables & GGL_ENABLE_FOG)) { + want |= transform_state_t::MODELVIEW; // needs eye coords } ogles_validate_transform(c, want); |