Fixes query for active texture

TRAC #12374 Original-Author: Jim Hauxwell <james@dattrax.co.uk> Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/trunk@312 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixes query for active texture
b28a23bd · daniel@transgaming.com · c6c6f027 · b28a23bd
Commit b28a23bd authored May 20, 2010 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Context.cpp src/libGLESv2/Context.cpp +1 -1

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1334,7 +1334,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
      case GL_PACK_ALIGNMENT:                   *params = mState.packAlignment;                 break;
      case GL_UNPACK_ALIGNMENT:                 *params = mState.unpackAlignment;               break;
      case GL_GENERATE_MIPMAP_HINT:             *params = mState.generateMipmapHint;            break;
-      case GL_ACTIVE_TEXTURE:                   *params = mState.activeSampler;            break;
+      case GL_ACTIVE_TEXTURE:                   *params = (mState.activeSampler + GL_TEXTURE0); break;
      case GL_STENCIL_FUNC:                     *params = mState.stencilFunc;                   break;
      case GL_STENCIL_REF:                      *params = mState.stencilRef;                    break;
      case GL_STENCIL_VALUE_MASK:               *params = mState.stencilMask;                   break;