Accept GL_HALF_FLOAT and GL_HALF_FLOAT_OES interchangeably.
These enums don't have the same value, but this is only because of
desktop OpenGL and OpenGL ES having evolved separately. OpenGL ES 3.0
reconverged to use the enum name and value of desktop OpenGL.
Apps choosing between OpenGL ES 2.0 and 3.0 strictly speaking have to
use different enums, but many drivers already accept either enum so the
apps don't bother to differentiate them. Running them on a driver which
adheres more strictly to the (extension) specs would cause parameter
validation errors.
Additionally, native platform pixel formats such as
HAL_PIXEL_FORMAT_RGBA_FP16 on Android couldn't be mapped to GL_RGBA16F
with GL_HALF_FLOAT component types on an OpenGL ES 2.0 context if the
latter are considered OpenGL ES 3.0 only.
Change-Id: Ib66cba7444fe438c0e4a8a6454460773cf02236d
Reviewed-on: https://swiftshader-review.googlesource.com/18728
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 34b3db0..3ba2a3a 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -6111,6 +6111,7 @@
case GL_FIXED:
case GL_FLOAT:
case GL_HALF_FLOAT_OES: // GL_OES_vertex_half_float
+ case GL_HALF_FLOAT:
break;
case GL_INT_2_10_10_10_REV:
case GL_UNSIGNED_INT_2_10_10_10_REV:
@@ -6125,7 +6126,6 @@
else return error(GL_INVALID_ENUM);
case GL_INT:
case GL_UNSIGNED_INT:
- case GL_HALF_FLOAT:
if(clientVersion >= 3)
{
break;