commit 7ba3f425c45bab14c0fb2657355598215771b936
author Lingfeng Yang <lfy@google.com> Fri Jun 01 09:43:04 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Jun 05 01:07:09 2018 +0000
tree 436c7a4d178d7c68e60c592a30e035eb9193eb6b
parent 060088a5c03153138e3290d22814d2afc7227281

GLES1: Fog API and rendering

- Update test expectations

BUG=angleproject:2306

Change-Id: Ic5aa5f052bcbe9c5adaf0eb0c6c06df66fd1720c
Reviewed-on: https://chromium-review.googlesource.com/1082978
Commit-Queue: Lingfeng Yang <lfy@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/queryutils.cpp

diff --git a/src/libANGLE/queryutils.cpp b/src/libANGLE/queryutils.cpp
index 807bceb..f8c59fd 100644
--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -1978,7 +1978,6 @@
         case GL_LIGHT_MODEL_TWO_SIDE:
             return 1;
         default:
-            UNREACHABLE();
             return 0;
     }
 }
@@ -2001,7 +2000,6 @@
         case LightParameter::QuadraticAttenuation:
             return 1;
         default:
-            UNREACHABLE();
             return 0;
     }
 }
@@ -2018,11 +2016,81 @@
         case MaterialParameter::Shininess:
             return 1;
         default:
-            UNREACHABLE();
             return 0;
     }
 }
 
+void SetFogParameters(GLES1State *state, GLenum pname, const GLfloat *params)
+{
+    FogParameters &fog = state->fogParameters();
+    switch (pname)
+    {
+        case GL_FOG_MODE:
+            fog.mode = FromGLenum<FogMode>(static_cast<GLenum>(params[0]));
+            break;
+        case GL_FOG_DENSITY:
+            fog.density = params[0];
+            break;
+        case GL_FOG_START:
+            fog.start = params[0];
+            break;
+        case GL_FOG_END:
+            fog.end = params[0];
+            break;
+        case GL_FOG_COLOR:
+            fog.color = ColorF::fromData(params);
+            break;
+        default:
+            return;
+    }
+}
+
+void GetFogParameters(const GLES1State *state, GLenum pname, GLfloat *params)
+{
+    const FogParameters &fog = state->fogParameters();
+    switch (pname)
+    {
+        case GL_FOG_MODE:
+            params[0] = static_cast<GLfloat>(ToGLenum(fog.mode));
+            break;
+        case GL_FOG_DENSITY:
+            params[0] = fog.density;
+            break;
+        case GL_FOG_START:
+            params[0] = fog.start;
+            break;
+        case GL_FOG_END:
+            params[0] = fog.end;
+            break;
+        case GL_FOG_COLOR:
+            fog.color.writeData(params);
+            break;
+        default:
+            return;
+    }
+}
+
+unsigned int GetFogParameterCount(GLenum pname)
+{
+    switch (pname)
+    {
+        case GL_FOG_MODE:
+        case GL_FOG_DENSITY:
+        case GL_FOG_START:
+        case GL_FOG_END:
+            return 1;
+        case GL_FOG_COLOR:
+            return 4;
+        default:
+            return 0;
+    }
+}
+
+GLenum FixedToEnum(GLfixed val)
+{
+    return static_cast<GLenum>(val);
+}
+
 }  // namespace gl
 
 namespace egl