commit c416e1cc09f1404d3dbcf23cd55956d37ebe67d2
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:45:05 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:45:05 2013 +0000
tree 7953f6cb103daa352ad33a044835969e0406ed52
parent 9599656abe17aa402ac8d8f4f4f1e47dc0b7a696

Added a binding point for TEXTURE_3D.

TRAC #22705

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

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index e39aa2e..4e0d96d 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -550,6 +550,13 @@
               case GL_TEXTURE_CUBE_MAP:
                 context->bindTextureCubeMap(texture);
                 return;
+              case GL_TEXTURE_3D:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                context->bindTexture3D(texture);
+                return;
               default:
                 return gl::error(GL_INVALID_ENUM);
             }
@@ -4011,6 +4018,13 @@
               case GL_TEXTURE_CUBE_MAP:
                 texture = context->getTextureCubeMap();
                 break;
+              case GL_TEXTURE_3D:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                texture = context->getTexture3D();
+                break;
               default:
                 return gl::error(GL_INVALID_ENUM);
             }
@@ -4080,6 +4094,13 @@
               case GL_TEXTURE_CUBE_MAP:
                 texture = context->getTextureCubeMap();
                 break;
+              case GL_TEXTURE_3D:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                texture = context->getTexture3D();
+                break;
               default:
                 return gl::error(GL_INVALID_ENUM);
             }
@@ -5728,6 +5749,12 @@
               case GL_TEXTURE_CUBE_MAP:
                 texture = context->getTextureCubeMap();
                 break;
+              case GL_TEXTURE_3D:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                texture = context->getTexture3D();
               default:
                 return gl::error(GL_INVALID_ENUM);
             }
@@ -5816,6 +5843,13 @@
               case GL_TEXTURE_CUBE_MAP:
                 texture = context->getTextureCubeMap();
                 break;
+              case GL_TEXTURE_3D:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                texture = context->getTexture3D();
+                break;
               default:
                 return gl::error(GL_INVALID_ENUM);
             }