commit 19ffc24b0e886710aa6052c01ea93fc923f059c4
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue May 04 03:35:21 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue May 04 03:35:21 2010 +0000
tree 4b05bf56f151732283a4b4b9252600db9bcf2ad8
parent 713914b5ae7f541b8f78358915347e8c479c1c19

Moves non-D3D-specific utility functions to the gl namespace.
TRAC #12043
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Shannon Woods

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

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 1d6662d..86a89dc 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1371,7 +1371,7 @@
 
 Colorbuffer *TextureCubeMap::getColorbuffer(GLenum target)
 {
-    if (!es2dx::IsCubemapTextureTarget(target))
+    if (!IsCubemapTextureTarget(target))
     {
         return error(GL_INVALID_OPERATION, (Colorbuffer *)NULL);
     }
@@ -1388,7 +1388,7 @@
 
 IDirect3DSurface9 *TextureCubeMap::getRenderTarget(GLenum target)
 {
-    ASSERT(es2dx::IsCubemapTextureTarget(target));
+    ASSERT(IsCubemapTextureTarget(target));
 
     needRenderTarget();
 
@@ -1401,7 +1401,7 @@
 Texture::TextureColorbufferProxy::TextureColorbufferProxy(Texture *texture, GLenum target)
   : Colorbuffer(NULL), mTexture(texture), mTarget(target)
 {
-    ASSERT(target == GL_TEXTURE_2D || es2dx::IsCubemapTextureTarget(target));
+    ASSERT(target == GL_TEXTURE_2D || IsCubemapTextureTarget(target));
     latchTextureInfo();
 }