commit 6518fe2466f816f9da9f72d7be6ed7962226bdf9
author Brandon Jones <bajones@chromium.org> Tue Jul 08 15:16:52 2014 -0700
committer Brandon Jones <bajones@chromium.org> Mon Jul 14 22:00:51 2014 +0000
tree 3539a2dc5dde976fa150699344a0ff188998b647
parent d4cfa57df4df85546a969f66ec50d364f6e6d4fe

Moved TextureStorage and Image into d3d

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

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 87327ea..9311ab9 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -18,7 +18,8 @@
 #include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/renderer/Image.h"
 #include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/renderer/TextureStorage.h"
+#include "libGLESv2/renderer/d3d/ImageD3D.h"
+#include "libGLESv2/renderer/d3d/TextureStorage.h"
 #include "libEGL/Surface.h"
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/renderer/BufferImpl.h"
@@ -446,7 +447,7 @@
 {
     if (isValidLevel(level))
     {
-        rx::Image *image = mImageArray[level];
+        rx::ImageD3D *image = rx::ImageD3D::makeImageD3D(mImageArray[level]);
         if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, width, height))
         {
             image->markClean();
@@ -575,7 +576,7 @@
     {
         for (int level = 0; level < mTexStorage->getLevelCount(); level++)
         {
-            mImageArray[level]->setManagedSurface(mTexStorage, level);
+            rx::ImageD3D::makeImageD3D(mImageArray[level])->setManagedSurface(mTexStorage, level);
         }
     }
 
@@ -994,7 +995,7 @@
 {
     if (isValidFaceLevel(faceIndex, level))
     {
-        rx::Image *image = mImageArray[faceIndex][level];
+        rx::ImageD3D *image = rx::ImageD3D::makeImageD3D(mImageArray[faceIndex][level]);
         if (image->copyToStorage(mTexStorage, faceIndex, level, xoffset, yoffset, width, height))
             image->markClean();
     }
@@ -1213,7 +1214,7 @@
         {
             for (int level = 0; level < mTexStorage->getLevelCount(); level++)
             {
-                mImageArray[faceIndex][level]->setManagedSurface(mTexStorage, faceIndex, level);
+                rx::ImageD3D::makeImageD3D(mImageArray[faceIndex][level])->setManagedSurface(mTexStorage, faceIndex, level);
             }
         }
     }
@@ -2027,7 +2028,7 @@
 {
     if (isValidLevel(level))
     {
-        rx::Image *image = mImageArray[level];
+        rx::ImageD3D *image = rx::ImageD3D::makeImageD3D(mImageArray[level]);
         if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, zoffset, width, height, depth))
         {
             image->markClean();
@@ -2566,7 +2567,7 @@
 {
     if (isValidLevel(level) && layerTarget < getLayers(level))
     {
-        rx::Image *image = mImageArray[level][layerTarget];
+        rx::ImageD3D *image = rx::ImageD3D::makeImageD3D(mImageArray[level][layerTarget]);
         if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, layerTarget, width, height))
         {
             image->markClean();