Updated Image11 to use gl::Errors for staging texture manipulation.

BUG=angle:520 Change-Id: I5792b139ddd69c2cabc3b901a7067438c1ee363b Reviewed-on: https://chromium-review.googlesource.com/221395Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Updated Image11 to use gl::Errors for staging texture manipulation.
8becd0cb · Geoff Lang · 06ecf3dd · 8becd0cb · 8becd0cb
Commit 8becd0cb authored Sep 26, 2014 by Geoff Lang
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Image11.cpp src/libGLESv2/renderer/d3d/d3d11/Image11.cpp +0 -0

Image11.h src/libGLESv2/renderer/d3d/d3d11/Image11.h +3 -4

No files found.
--- a/src/libGLESv2/renderer/d3d/d3d11/Image11.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d11/Image11.cpp
--- a/src/libGLESv2/renderer/d3d/d3d11/Image11.h
+++ b/src/libGLESv2/renderer/d3d/d3d11/Image11.h
@@ -58,7 +58,7 @@ class Image11 : public ImageD3D
    void disassociateStorage();

  protected:
-    HRESULT map(D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map);
+    gl::Error map(D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map);
    void unmap();

  private:
@@ -67,9 +67,8 @@ class Image11 : public ImageD3D
    gl::Error copyToStorageImpl(TextureStorage11 *storage11, const gl::ImageIndex &index, const gl::Box &region);
    gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, ID3D11Texture2D *source, UINT sourceSubResource);

-    ID3D11Resource *getStagingTexture();
-    unsigned int getStagingSubresource();
-    void createStagingTexture();
+    gl::Error getStagingTexture(ID3D11Resource **outStagingTexture, unsigned int *outSubresourceIndex);
+    gl::Error createStagingTexture();
    void releaseStagingTexture();

    Renderer11 *mRenderer;