commit c1fdf6baa488d6bf4a16d68c5d83caf2c95563dc
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:44:41 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:44:41 2013 +0000
tree c4102db9930b6228af02705a6f92e9d16de42122
parent e5dcce75bb08208387723a4e0494ca19073e05a7

Added parameters for maximum 3D texture size. Renamed maximum 2D texture size methods and variables.

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@2167 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 8f62330..e512b83 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1171,8 +1171,8 @@
             switch (target)
             {
               case GL_TEXTURE_2D:
-                if (width > (context->getMaximumTextureDimension() >> level) ||
-                    height > (context->getMaximumTextureDimension() >> level))
+                if (width > (context->getMaximum2DTextureDimension() >> level) ||
+                    height > (context->getMaximum2DTextureDimension() >> level))
                 {
                     return gl::error(GL_INVALID_VALUE);
                 }
@@ -1415,8 +1415,8 @@
             switch (target)
             {
               case GL_TEXTURE_2D:
-                if (width > (context->getMaximumTextureDimension() >> level) ||
-                    height > (context->getMaximumTextureDimension() >> level))
+                if (width > (context->getMaximum2DTextureDimension() >> level) ||
+                    height > (context->getMaximum2DTextureDimension() >> level))
                 {
                     return gl::error(GL_INVALID_VALUE);
                 }
@@ -5538,8 +5538,8 @@
             switch (target)
             {
               case GL_TEXTURE_2D:
-                if (width > (context->getMaximumTextureDimension() >> level) ||
-                    height > (context->getMaximumTextureDimension() >> level))
+                if (width > (context->getMaximum2DTextureDimension() >> level) ||
+                    height > (context->getMaximum2DTextureDimension() >> level))
                 {
                     return gl::error(GL_INVALID_VALUE);
                 }
@@ -5900,8 +5900,8 @@
             switch (target)
             {
               case GL_TEXTURE_2D:
-                if (width > context->getMaximumTextureDimension() ||
-                    height > context->getMaximumTextureDimension())
+                if (width > context->getMaximum2DTextureDimension() ||
+                    height > context->getMaximum2DTextureDimension())
                 {
                     return gl::error(GL_INVALID_VALUE);
                 }