commit 1a4e09a616e473758db5e5dcb3147b47774aa81c
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:33:30 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:33:30 2013 +0000
tree d070220c6b174c2646b491c8c82f58af23f92897
parent ee2a86ad794a9091edb22318d8cacc445de8ab78

Added support for HALF_FLOAT vertex attributes.

TRAC #22703

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2091 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index d0ff00d..451d72c 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -6768,6 +6768,8 @@
             return gl::error(GL_INVALID_VALUE);
         }
 
+        gl::Context *context = gl::getNonLostContext();
+
         switch (type)
         {
           case GL_BYTE:
@@ -6777,6 +6779,17 @@
           case GL_FIXED:
           case GL_FLOAT:
             break;
+
+          case GL_HALF_FLOAT:
+            if (context && context->getClientVersion() < 3)
+            {
+                return gl::error(GL_INVALID_ENUM);
+            }
+            else
+            {
+                break;
+            }
+
           default:
             return gl::error(GL_INVALID_ENUM);
         }
@@ -6786,8 +6799,6 @@
             return gl::error(GL_INVALID_VALUE);
         }
 
-        gl::Context *context = gl::getNonLostContext();
-
         if (context)
         {
             context->setVertexAttribState(index, context->getArrayBuffer(), size, type, (normalized == GL_TRUE), stride, ptr);