Copies data from the staging texture to the default texture.

TRAC #22210 Author: Shannon Woods Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1652 736b8ea6-26fd-11df-bfd4-992fa37f6226

Copies data from the staging texture to the default texture.
46cf249e · daniel@transgaming.com · 9a2f54db · 46cf249e
Commit 46cf249e authored Jan 11, 2013 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

Image11.cpp src/libGLESv2/renderer/Image11.cpp +5 -6

No files found.
--- a/src/libGLESv2/renderer/Image11.cpp
+++ b/src/libGLESv2/renderer/Image11.cpp
@@ -9,6 +9,7 @@
 #include "libGLESv2/renderer/Renderer11.h"
 #include "libGLESv2/renderer/Image11.h"
+#include "libGLESv2/renderer/TextureStorage11.h"
 #include "libGLESv2/main.h"
 #include "libGLESv2/mathutil.h"
@@ -52,16 +53,14 @@ ID3D11Texture2D *Image11::getStagingTexture()
 bool Image11::updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
-    // TODO - relies on TextureStorage11 implementation
+    TextureStorage11_2D *storage11 = TextureStorage11_2D::makeTextureStorage11_2D(storage->getStorageInstance());
-    UNIMPLEMENTED();
+    return storage11->updateSubresourceLevel(getStagingTexture(), level, 0, xoffset, yoffset, width, height);
-    return false;
 }
 bool Image11::updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
-    // TODO - relies on TextureStorage11 implementation
+    TextureStorage11_Cube *storage11 = TextureStorage11_Cube::makeTextureStorage11_Cube(storage->getStorageInstance());
-    UNIMPLEMENTED();
+    return storage11->updateSubresourceLevel(getStagingTexture(), level, face, xoffset, yoffset, width, height);
-    return false;
 }
 bool Image11::redefine(Renderer *renderer, GLint internalformat, GLsizei width, GLsizei height, bool forceRelease)