Restore using the depth-stencil typed DXGI format for checking for maximum supported samples.

This regression was breaking the es3proto D3D11 testing in Canary. TRAC #23410 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Authored-by: Jamie Madill

Restore using the depth-stencil typed DXGI format for checking for maximum supported samples.
fcb8a601 · Jamie Madill · Shannon Woods · a081df82 · fcb8a601
Commit fcb8a601 authored Jun 24, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

RenderTarget11.cpp src/libGLESv2/renderer/RenderTarget11.cpp +2 -1

No files found.
--- a/src/libGLESv2/renderer/RenderTarget11.cpp
+++ b/src/libGLESv2/renderer/RenderTarget11.cpp
@@ -251,7 +251,8 @@ RenderTarget11::RenderTarget11(Renderer *renderer, GLsizei width, GLsizei height
    DXGI_FORMAT rtvFormat = gl_d3d11::GetRTVFormat(internalFormat, clientVersion);
    DXGI_FORMAT dsvFormat = gl_d3d11::GetDSVFormat(internalFormat, clientVersion);

-    int supportedSamples = mRenderer->getNearestSupportedSamples(texFormat, samples);
+    DXGI_FORMAT multisampleFormat = (dsvFormat != DXGI_FORMAT_UNKNOWN ? dsvFormat : rtvFormat);
+    int supportedSamples = mRenderer->getNearestSupportedSamples(multisampleFormat, samples);
    if (supportedSamples < 0)
    {
        gl::error(GL_OUT_OF_MEMORY);