Rename getBaseTexture to getResource, and refactor swizzleRequired.
BUG=angle:596
Change-Id: I72d8796172c5db57ddeb86bbc6c08cbb2ec125f1
Reviewed-on: https://chromium-review.googlesource.com/193230
Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libGLESv2/angletypes.cpp b/src/libGLESv2/angletypes.cpp
index a4de664..acb3da8 100644
--- a/src/libGLESv2/angletypes.cpp
+++ b/src/libGLESv2/angletypes.cpp
@@ -14,6 +14,12 @@
namespace gl
{
+bool SamplerState::swizzleRequired() const
+{
+ return swizzleRed != GL_RED || swizzleGreen != GL_GREEN ||
+ swizzleBlue != GL_BLUE || swizzleAlpha != GL_ALPHA;
+}
+
static void MinMax(int a, int b, int *minimum, int *maximum)
{
if (a < b)
diff --git a/src/libGLESv2/angletypes.h b/src/libGLESv2/angletypes.h
index 47b9adf..a67b3f6 100644
--- a/src/libGLESv2/angletypes.h
+++ b/src/libGLESv2/angletypes.h
@@ -162,6 +162,8 @@
GLenum swizzleGreen;
GLenum swizzleBlue;
GLenum swizzleAlpha;
+
+ bool swizzleRequired() const;
};
struct ClearParameters
diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index a57956d..3c75c2a 100644
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -2576,7 +2576,7 @@
TextureStorage11_2D *source11 = TextureStorage11_2D::makeTextureStorage11_2D(source->getStorageInstance());
TextureStorage11_2D *dest11 = TextureStorage11_2D::makeTextureStorage11_2D(dest->getStorageInstance());
- mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+ mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
dest11->invalidateSwizzleCache();
@@ -2593,7 +2593,7 @@
TextureStorage11_Cube *source11 = TextureStorage11_Cube::makeTextureStorage11_Cube(source->getStorageInstance());
TextureStorage11_Cube *dest11 = TextureStorage11_Cube::makeTextureStorage11_Cube(dest->getStorageInstance());
- mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+ mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
dest11->invalidateSwizzleCache();
@@ -2610,7 +2610,7 @@
TextureStorage11_3D *source11 = TextureStorage11_3D::makeTextureStorage11_3D(source->getStorageInstance());
TextureStorage11_3D *dest11 = TextureStorage11_3D::makeTextureStorage11_3D(dest->getStorageInstance());
- mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+ mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
dest11->invalidateSwizzleCache();
@@ -2627,7 +2627,7 @@
TextureStorage11_2DArray *source11 = TextureStorage11_2DArray::makeTextureStorage11_2DArray(source->getStorageInstance());
TextureStorage11_2DArray *dest11 = TextureStorage11_2DArray::makeTextureStorage11_2DArray(dest->getStorageInstance());
- mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+ mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
dest11->invalidateSwizzleCache();
diff --git a/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp b/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp
index a476ccd..80e6c58 100644
--- a/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp
@@ -134,7 +134,7 @@
UINT TextureStorage11::getSubresourceIndex(int mipLevel, int layerTarget) const
{
UINT index = 0;
- if (getBaseTexture())
+ if (getResource())
{
index = D3D11CalcSubresource(mipLevel, layerTarget, mMipLevels);
}
@@ -205,7 +205,7 @@
copyArea.height == texSize.height &&
copyArea.depth == texSize.depth;
- ID3D11Resource *dstTexture = getBaseTexture();
+ ID3D11Resource *dstTexture = getResource();
unsigned int dstSubresource = getSubresourceIndex(level + mTopLevel, layerTarget);
ASSERT(dstTexture);
@@ -410,7 +410,7 @@
return static_cast<TextureStorage11_2D*>(storage);
}
-ID3D11Resource *TextureStorage11_2D::getBaseTexture() const
+ID3D11Resource *TextureStorage11_2D::getResource() const
{
return mTexture;
}
@@ -491,8 +491,7 @@
ID3D11ShaderResourceView *TextureStorage11_2D::getSRV(const gl::SamplerState &samplerState)
{
- bool swizzleRequired = samplerState.swizzleRed != GL_RED || samplerState.swizzleGreen != GL_GREEN ||
- samplerState.swizzleBlue != GL_BLUE || samplerState.swizzleAlpha != GL_ALPHA;
+ bool swizzleRequired = samplerState.swizzleRequired();
bool mipmapping = gl::IsMipmapFiltered(samplerState);
ID3D11ShaderResourceView **resultSRV = &mSRV[swizzleRequired][mipmapping];
@@ -733,7 +732,7 @@
return static_cast<TextureStorage11_Cube*>(storage);
}
-ID3D11Resource *TextureStorage11_Cube::getBaseTexture() const
+ID3D11Resource *TextureStorage11_Cube::getResource() const
{
return mTexture;
}
@@ -832,8 +831,7 @@
ID3D11ShaderResourceView *TextureStorage11_Cube::getSRV(const gl::SamplerState &samplerState)
{
- bool swizzleRequired = samplerState.swizzleRed != GL_RED || samplerState.swizzleGreen != GL_GREEN ||
- samplerState.swizzleBlue != GL_BLUE || samplerState.swizzleAlpha != GL_ALPHA;
+ bool swizzleRequired = samplerState.swizzleRequired();
bool mipmapping = gl::IsMipmapFiltered(samplerState);
ID3D11ShaderResourceView **resultSRV = &mSRV[swizzleRequired][mipmapping];
@@ -1097,15 +1095,14 @@
return static_cast<TextureStorage11_3D*>(storage);
}
-ID3D11Resource *TextureStorage11_3D::getBaseTexture() const
+ID3D11Resource *TextureStorage11_3D::getResource() const
{
return mTexture;
}
ID3D11ShaderResourceView *TextureStorage11_3D::getSRV(const gl::SamplerState &samplerState)
{
- bool swizzleRequired = samplerState.swizzleRed != GL_RED || samplerState.swizzleGreen != GL_GREEN ||
- samplerState.swizzleBlue != GL_BLUE || samplerState.swizzleAlpha != GL_ALPHA;
+ bool swizzleRequired = samplerState.swizzleRequired();
bool mipmapping = gl::IsMipmapFiltered(samplerState);
ID3D11ShaderResourceView **resultSRV = &mSRV[swizzleRequired][mipmapping];
@@ -1456,15 +1453,14 @@
return static_cast<TextureStorage11_2DArray*>(storage);
}
-ID3D11Resource *TextureStorage11_2DArray::getBaseTexture() const
+ID3D11Resource *TextureStorage11_2DArray::getResource() const
{
return mTexture;
}
ID3D11ShaderResourceView *TextureStorage11_2DArray::getSRV(const gl::SamplerState &samplerState)
{
- bool swizzleRequired = samplerState.swizzleRed != GL_RED || samplerState.swizzleGreen != GL_GREEN ||
- samplerState.swizzleBlue != GL_BLUE || samplerState.swizzleAlpha != GL_ALPHA;
+ bool swizzleRequired = samplerState.swizzleRequired();
bool mipmapping = gl::IsMipmapFiltered(samplerState);
ID3D11ShaderResourceView **resultSRV = &mSRV[swizzleRequired][mipmapping];
diff --git a/src/libGLESv2/renderer/d3d11/TextureStorage11.h b/src/libGLESv2/renderer/d3d11/TextureStorage11.h
index 7d2c503..36469c2 100644
--- a/src/libGLESv2/renderer/d3d11/TextureStorage11.h
+++ b/src/libGLESv2/renderer/d3d11/TextureStorage11.h
@@ -32,7 +32,7 @@
UINT getBindFlags() const;
- virtual ID3D11Resource *getBaseTexture() const = 0;
+ virtual ID3D11Resource *getResource() const = 0;
virtual ID3D11ShaderResourceView *getSRV(const gl::SamplerState &samplerState) = 0;
virtual RenderTarget *getRenderTarget(int level) { return NULL; }
virtual RenderTarget *getRenderTargetFace(GLenum faceTarget, int level) { return NULL; }
@@ -114,7 +114,7 @@
static TextureStorage11_2D *makeTextureStorage11_2D(TextureStorage *storage);
- virtual ID3D11Resource *getBaseTexture() const;
+ virtual ID3D11Resource *getResource() const;
virtual ID3D11ShaderResourceView *getSRV(const gl::SamplerState &samplerState);
virtual RenderTarget *getRenderTarget(int level);
@@ -149,7 +149,7 @@
static TextureStorage11_Cube *makeTextureStorage11_Cube(TextureStorage *storage);
- virtual ID3D11Resource *getBaseTexture() const;
+ virtual ID3D11Resource *getResource() const;
virtual ID3D11ShaderResourceView *getSRV(const gl::SamplerState &samplerState);
virtual RenderTarget *getRenderTargetFace(GLenum faceTarget, int level);
@@ -185,7 +185,7 @@
static TextureStorage11_3D *makeTextureStorage11_3D(TextureStorage *storage);
- virtual ID3D11Resource *getBaseTexture() const;
+ virtual ID3D11Resource *getResource() const;
virtual ID3D11ShaderResourceView *getSRV(const gl::SamplerState &samplerState);
virtual RenderTarget *getRenderTarget(int mipLevel);
virtual RenderTarget *getRenderTargetLayer(int mipLevel, int layer);
@@ -226,7 +226,7 @@
static TextureStorage11_2DArray *makeTextureStorage11_2DArray(TextureStorage *storage);
- virtual ID3D11Resource *getBaseTexture() const;
+ virtual ID3D11Resource *getResource() const;
virtual ID3D11ShaderResourceView *getSRV(const gl::SamplerState &samplerState);
virtual RenderTarget *getRenderTargetLayer(int mipLevel, int layer);