From cef06ff2352700d2842f961c22371064836ad689 Mon Sep 17 00:00:00 2001 From: Brandon Jones Date: Tue, 5 Aug 2014 13:27:48 -0700 Subject: 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 Tested-by: Brandon Jones Reviewed-by: Geoff Lang --- src/libGLESv2/renderer/d3d/TextureStorage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libGLESv2/renderer/d3d/TextureStorage.cpp') 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, -- cgit v1.2.3