commit cef06ff2352700d2842f961c22371064836ad689
author Brandon Jones <bajones@chromium.org> Tue Aug 05 13:27:48 2014 -0700
committer Brandon Jones <bajones@chromium.org> Thu Aug 07 20:18:34 2014 +0000
tree f68d806bea4685b9c6ea35c3608c77d1c1508f92
parent e5c97abd327c1f12ed93373a964c8d9a1c82731c

Unifying the various texture interfaces where possible

Also fixed diamond inheritance pattern that was causing trouble
on Windows 8

BUG=angle:688, angle:720
Change-Id: I678826bd4f3927c68ca1eb2e018dbb5aad33a8cc
Reviewed-on: https://chromium-review.googlesource.com/211037
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/FramebufferAttachment.cpp

diff --git a/src/libGLESv2/FramebufferAttachment.cpp b/src/libGLESv2/FramebufferAttachment.cpp
index e7855b1..6f40edf 100644
--- a/src/libGLESv2/FramebufferAttachment.cpp
+++ b/src/libGLESv2/FramebufferAttachment.cpp
@@ -95,7 +95,7 @@
 
 rx::RenderTarget *Texture2DAttachment::getDepthStencil()
 {
-    return mTexture2D->getDepthSencil(mLevel);
+    return mTexture2D->getDepthStencil(mLevel);
 }
 
 rx::TextureStorage *Texture2DAttachment::getTextureStorage()