commit 0b3a8dfb1e698f7ba69708f9f1bbe73179dcd07e
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:44:51 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:51 2013 +0000
tree ab9a0a29155dec5d09d33381e5b111ffe8f6140c
parent c1fdf6baa488d6bf4a16d68c5d83caf2c95563dc

Added the GL_TEXTURE_WRAP_R parameter.

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index e512b83..3979dcb 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4029,6 +4029,13 @@
               case GL_TEXTURE_WRAP_T:
                 *params = (GLfloat)texture->getWrapT();
                 break;
+              case GL_TEXTURE_WRAP_R:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                *params = (GLfloat)texture->getWrapR();
+                break;
               case GL_TEXTURE_IMMUTABLE_FORMAT_EXT:
                 *params = (GLfloat)(texture->isImmutable() ? GL_TRUE : GL_FALSE);
                 break;
@@ -4091,6 +4098,13 @@
               case GL_TEXTURE_WRAP_T:
                 *params = texture->getWrapT();
                 break;
+              case GL_TEXTURE_WRAP_R:
+                if (context->getClientVersion() < 3)
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                *params = texture->getWrapR();
+                break;
               case GL_TEXTURE_IMMUTABLE_FORMAT_EXT:
                 *params = texture->isImmutable() ? GL_TRUE : GL_FALSE;
                 break;
@@ -5732,6 +5746,12 @@
                     return gl::error(GL_INVALID_ENUM);
                 }
                 break;
+              case GL_TEXTURE_WRAP_R:
+                if (context->getClientVersion() < 3 || !texture->setWrapR((GLenum)param))
+                {
+                    return gl::error(GL_INVALID_ENUM);
+                }
+                break;
               case GL_TEXTURE_MIN_FILTER:
                 if (!texture->setMinFilter((GLenum)param))
                 {
@@ -5814,6 +5834,12 @@
                     return gl::error(GL_INVALID_ENUM);
                 }
                 break;
+              case GL_TEXTURE_WRAP_R:
+                  if (context->getClientVersion() < 3 || !texture->setWrapR((GLenum)param))
+                  {
+                      return gl::error(GL_INVALID_ENUM);
+                  }
+                  break;
               case GL_TEXTURE_MIN_FILTER:
                 if (!texture->setMinFilter((GLenum)param))
                 {