D3D11: Consolidate Viewport state application.

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

@@ -1105,14 +1105,7 @@ gl::Error Blit11::swizzleTexture(const gl::Context *context,
     stateManager->setRenderTarget(dest.get(), nullptr);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(size.width);
-    viewport.Height   = static_cast<FLOAT>(size.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(size);
 
     // Apply textures
     stateManager->setShaderResource(gl::SAMPLER_PIXEL, 0, source.get());
@@ -1238,14 +1231,7 @@ gl::Error Blit11::copyTexture(const gl::Context *context,
     stateManager->setRenderTarget(dest.get(), nullptr);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(destSize.width);
-    viewport.Height   = static_cast<FLOAT>(destSize.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(destSize);
 
     // Apply textures
     stateManager->setShaderResource(gl::SAMPLER_PIXEL, 0, source.get());
@@ -1368,14 +1354,7 @@ gl::Error Blit11::copyDepth(const gl::Context *context,
     stateManager->setRenderTarget(nullptr, dest.get());
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(destSize.width);
-    viewport.Height   = static_cast<FLOAT>(destSize.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(destSize);
 
     // Apply textures
     stateManager->setShaderResource(gl::SAMPLER_PIXEL, 0, source.get());
@@ -2023,14 +2002,7 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveDepth(const gl::Context *conte
     stateManager->setSimpleBlendState(nullptr);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(extents.width);
-    viewport.Height   = static_cast<FLOAT>(extents.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(extents);
 
     ID3D11ShaderResourceView *pixelViews[] = {depth->getShaderResourceView().get()};
 
@@ -2193,14 +2165,7 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con
     stateManager->setSimpleBlendState(nullptr);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(extents.width);
-    viewport.Height   = static_cast<FLOAT>(extents.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(extents);
 
     ID3D11ShaderResourceView *pixelViews[] = {
         depthStencil->getShaderResourceView().get(), mStencilSRV.get(),

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

@@ -764,14 +764,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
     auto *stateManager = mRenderer->getStateManager();
 
     // Set the viewport to be the same size as the framebuffer.
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width    = static_cast<FLOAT>(framebufferSize.width);
-    viewport.Height   = static_cast<FLOAT>(framebufferSize.height);
-    viewport.MinDepth = 0;
-    viewport.MaxDepth = 1;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(framebufferSize);
 
     // Apply state
     stateManager->setSimpleBlendState(blendState);

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

@@ -210,14 +210,7 @@ gl::Error PixelTransfer11::copyBufferToTexture(const gl::Context *context,
     stateManager->setVertexConstantBuffer(0, &mParamsConstantBuffer);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width = static_cast<FLOAT>(destSize.width);
-    viewport.Height = static_cast<FLOAT>(destSize.height);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(destSize);
 
     UINT numPixels = (destArea.width * destArea.height * destArea.depth);
     deviceContext->Draw(numPixels, 0);

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

@@ -2081,6 +2081,25 @@ void StateManager11::setRasterizerState(const d3d11::RasterizerState *rasterizer
     mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
 }
 
+void StateManager11::setSimpleViewport(const gl::Extents &extents)
+{
+    setSimpleViewport(extents.width, extents.height);
+}
+
+void StateManager11::setSimpleViewport(int width, int height)
+{
+    D3D11_VIEWPORT viewport;
+    viewport.TopLeftX = 0;
+    viewport.TopLeftY = 0;
+    viewport.Width = static_cast<FLOAT>(width);
+    viewport.Height = static_cast<FLOAT>(height);
+    viewport.MinDepth = 0.0f;
+    viewport.MaxDepth = 1.0f;
+
+    mRenderer->getDeviceContext()->RSSetViewports(1, &viewport);
+    mInternalDirtyBits.set(DIRTY_BIT_VIEWPORT_STATE);
+}
+
 // For each Direct3D sampler of either the pixel or vertex stage,
 // looks up the corresponding OpenGL texture image unit and texture type,
 // and sets the texture and its addressing/filtering state (or NULL when inactive).

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

@@ -214,6 +214,8 @@ class StateManager11 final : angle::NonCopyable
     void setDepthStencilState(const d3d11::DepthStencilState *depthStencilState, UINT stencilRef);
     void setSimpleBlendState(const d3d11::BlendState *blendState);
     void setRasterizerState(const d3d11::RasterizerState *rasterizerState);
+    void setSimpleViewport(const gl::Extents &viewportExtents);
+    void setSimpleViewport(int width, int height);
 
     // Not handled by an internal dirty bit because of the extra draw parameters.
     gl::Error applyVertexBuffer(const gl::Context *context,

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

@@ -840,14 +840,7 @@ EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
     stateManager->setRenderTarget(mBackBufferRTView.get(), nullptr);
 
     // Set the viewport
-    D3D11_VIEWPORT viewport;
-    viewport.TopLeftX = 0;
-    viewport.TopLeftY = 0;
-    viewport.Width = static_cast<FLOAT>(mWidth);
-    viewport.Height = static_cast<FLOAT>(mHeight);
-    viewport.MinDepth = 0.0f;
-    viewport.MaxDepth = 1.0f;
-    deviceContext->RSSetViewports(1, &viewport);
+    stateManager->setSimpleViewport(mWidth, mHeight);
 
     // Apply textures
     stateManager->setShaderResource(gl::SAMPLER_PIXEL, 0, mOffscreenSRView.get());