summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-02-02 18:48:15 -0800
committerMathias Agopian <mathias@google.com>2010-02-03 12:13:15 -0800
commit2eeabb1f98d162786b45a09659674025a0559251 (patch)
treecccab27336c33e63a659ad4eba45197ca2eb2989 /include/private
parentad6516d9247bd0a76a393810b041c3e4094f0e36 (diff)
downloadframeworks_av-2eeabb1f98d162786b45a09659674025a0559251.zip
frameworks_av-2eeabb1f98d162786b45a09659674025a0559251.tar.gz
frameworks_av-2eeabb1f98d162786b45a09659674025a0559251.tar.bz2
fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color. Fix another typo which caused the viewer position to be wrong for specular highlights. Switch back to eye-space lighting, since there are still some issues with some demos (San Angeles in particular).
Diffstat (limited to 'include/private')
-rw-r--r--include/private/opengles/gl_context.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h
index e0deba9..c7db9a6 100644
--- a/include/private/opengles/gl_context.h
+++ b/include/private/opengles/gl_context.h
@@ -294,7 +294,6 @@ struct light_t {
vec4_t normalizedObjPosition;
vec4_t spotDir;
vec4_t normalizedSpotDir;
- vec4_t objViewer;
GLfixed spotExp;
GLfixed spotCutoff;
GLfixed spotCutoffCosine;
@@ -327,9 +326,10 @@ struct lighting_t {
material_t front;
light_model_t lightModel;
color_material_t colorMaterial;
+ vec4_t implicitSceneEmissionAndAmbient;
+ vec4_t objViewer;
uint32_t enabledLights;
GLboolean enable;
- vec4_t implicitSceneEmissionAndAmbient;
GLenum shadeModel;
typedef void (*light_fct_t)(ogles_context_t*, vertex_t*);
void (*lightVertex)(ogles_context_t* c, vertex_t* v);