Revert "Avoid a copy in TextureStorage11::setData"

src/libANGLE/renderer/d3d/d3d11/Image11.cpp

@@ -252,7 +252,7 @@ gl::Error Image11::loadData(const gl::Box &area, const gl::PixelUnpackState &unp
     GLuint outputPixelSize = dxgiFormatInfo.pixelBytes;
 
     const d3d11::TextureFormat &d3dFormatInfo = d3d11::GetTextureFormatInfo(mInternalFormat, mRenderer->getRenderer11DeviceCaps());
-    LoadImageFunction loadFunction            = d3dFormatInfo.loadFunctions.at(type).loadFunction;
+    LoadImageFunction loadFunction = d3dFormatInfo.loadFunctions.at(type);
 
     D3D11_MAPPED_SUBRESOURCE mappedImage;
     gl::Error error = map(D3D11_MAP_WRITE, &mappedImage);
@@ -286,7 +286,7 @@ gl::Error Image11::loadCompressedData(const gl::Box &area, const void *input)
     ASSERT(area.y % outputBlockHeight == 0);
 
     const d3d11::TextureFormat &d3dFormatInfo = d3d11::GetTextureFormatInfo(mInternalFormat, mRenderer->getRenderer11DeviceCaps());
-    LoadImageFunction loadFunction            = d3dFormatInfo.loadFunctions.at(GL_UNSIGNED_BYTE).loadFunction;
+    LoadImageFunction loadFunction = d3dFormatInfo.loadFunctions.at(GL_UNSIGNED_BYTE);
 
     D3D11_MAPPED_SUBRESOURCE mappedImage;
     gl::Error error = map(D3D11_MAP_WRITE, &mappedImage);

src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp

@@ -657,29 +657,19 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image
     UINT bufferDepthPitch = bufferRowPitch * height;
 
     size_t neededSize = bufferDepthPitch * depth;
-    MemoryBuffer *conversionBuffer = nullptr;
-    const uint8_t *data            = nullptr;
-
-    d3d11::LoadImageFunctionInfo loadFunctionInfo = d3d11Format.loadFunctions.at(type);
-    if (loadFunctionInfo.requiresConversion)
-    {
-        error = mRenderer->getScratchMemoryBuffer(neededSize, &conversionBuffer);
-        if (error.isError())
-        {
-            return error;
-        }
-
-        loadFunctionInfo.loadFunction(width, height, depth, pixelData, srcRowPitch, srcDepthPitch,
-                                      conversionBuffer->data(), bufferRowPitch, bufferDepthPitch);
-        data = conversionBuffer->data();
-    }
-    else
+    MemoryBuffer *conversionBuffer = NULL;
+    error = mRenderer->getScratchMemoryBuffer(neededSize, &conversionBuffer);
+    if (error.isError())
     {
-        data             = pixelData;
-        bufferRowPitch   = srcRowPitch;
-        bufferDepthPitch = srcDepthPitch;
+        return error;
     }
 
+    // TODO: fast path
+    LoadImageFunction loadFunction = d3d11Format.loadFunctions.at(type);
+    loadFunction(width, height, depth,
+                 pixelData, srcRowPitch, srcDepthPitch,
+                 conversionBuffer->data(), bufferRowPitch, bufferDepthPitch);
+
     ID3D11DeviceContext *immediateContext = mRenderer->getDeviceContext();
 
     if (!fullUpdate)
@@ -694,13 +684,15 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image
         destD3DBox.front = destBox->z;
         destD3DBox.back = destBox->z + destBox->depth;
 
-        immediateContext->UpdateSubresource(resource, destSubresource, &destD3DBox, data,
+        immediateContext->UpdateSubresource(resource, destSubresource,
+                                            &destD3DBox, conversionBuffer->data(),
                                             bufferRowPitch, bufferDepthPitch);
     }
     else
     {
-        immediateContext->UpdateSubresource(resource, destSubresource, NULL, data, bufferRowPitch,
-                                            bufferDepthPitch);
+        immediateContext->UpdateSubresource(resource, destSubresource,
+                                            NULL, conversionBuffer->data(),
+                                            bufferRowPitch, bufferDepthPitch);
     }
 
     return gl::Error(GL_NO_ERROR);

src/libANGLE/renderer/d3d/d3d11/formatutils11.h

@@ -60,17 +60,6 @@ struct DXGIFormat
 };
 const DXGIFormat &GetDXGIFormatInfo(DXGI_FORMAT format);
 
-struct LoadImageFunctionInfo
-{
-    LoadImageFunctionInfo(LoadImageFunction loadFunction, bool requiresConversion)
-        : loadFunction(loadFunction), requiresConversion(requiresConversion)
-    {
-    }
-
-    LoadImageFunction loadFunction;
-    bool requiresConversion;
-};
-
 struct TextureFormat
 {
     TextureFormat();
@@ -87,7 +76,7 @@ struct TextureFormat
 
     InitializeTextureDataFunction dataInitializerFunction;
 
-    typedef std::map<GLenum, LoadImageFunctionInfo> LoadFunctionMap;
+    typedef std::map<GLenum, LoadImageFunction> LoadFunctionMap;
     LoadFunctionMap loadFunctions;
 };
 const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, const Renderer11DeviceCaps &renderer11DeviceCaps);