diff options
| author | Brandon Jones <bajones@chromium.org> | 2014-08-05 13:27:48 -0700 |
|---|---|---|
| committer | Brandon Jones <bajones@chromium.org> | 2014-08-07 20:18:34 +0000 |
| commit | cef06ff2352700d2842f961c22371064836ad689 (patch) | |
| tree | f68d806bea4685b9c6ea35c3608c77d1c1508f92 /src/libGLESv2/renderer/d3d/TextureStorage.cpp | |
| parent | e5c97abd327c1f12ed93373a964c8d9a1c82731c (diff) | |
| download | angle-cef06ff2352700d2842f961c22371064836ad689.tar.gz | |
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>
Diffstat (limited to 'src/libGLESv2/renderer/d3d/TextureStorage.cpp')
| -rw-r--r-- | src/libGLESv2/renderer/d3d/TextureStorage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libGLESv2/renderer/d3d/TextureStorage.cpp b/src/libGLESv2/renderer/d3d/TextureStorage.cpp index 84658698..be82d33e 100644 --- a/src/libGLESv2/renderer/d3d/TextureStorage.cpp +++ b/src/libGLESv2/renderer/d3d/TextureStorage.cpp @@ -117,7 +117,7 @@ void TextureStorageInterfaceCube::generateMipmap(int faceIndex, int level) unsigned int TextureStorageInterfaceCube::getRenderTargetSerial(GLenum target, GLint level) const { - return mFirstRenderTargetSerial + (level * 6) + TextureD3D_Cube::targetToIndex(target); + return mFirstRenderTargetSerial + (level * 6) + gl::TextureCubeMap::targetToLayerIndex(target); } TextureStorageInterface3D::TextureStorageInterface3D(Renderer *renderer, GLenum internalformat, bool renderTarget, |