Skip to content

A
angle
Commit 0954b340 by Jamie Madill
Options

Revert "Do not check format caps for D3DFMT_NULL."

Seems to be causing problems on the AMD Release GPU FYI bot. http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28ATI%29/builds/6378 This reverts commit 533f0a1d. Change-Id: I94ae0f72303ad5bc6e84e56c35a683d01844309a Reviewed-on: https://chromium-review.googlesource.com/232192Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent fb0580a6
Showing with 0 additions and 6 deletions
src/libANGLE/renderer/d3d/d3d9/formatutils9.h
...@@ -67,8 +67,6 @@ struct TextureFormat ...@@ -67,8 +67,6 @@ struct TextureFormat
}; };
const TextureFormat &GetTextureFormatInfo(GLenum internalFormat); const TextureFormat &GetTextureFormatInfo(GLenum internalFormat);
extern const D3DFORMAT D3DFMT_NULL;
} }
} }
......
src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
...@@ -276,9 +276,6 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3 ...@@ -276,9 +276,6 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3
const d3d9::TextureFormat &d3dFormatInfo = d3d9::GetTextureFormatInfo(internalFormat); const d3d9::TextureFormat &d3dFormatInfo = d3d9::GetTextureFormatInfo(internalFormat);
const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat); const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat);
if (d3dFormatInfo.texFormat != d3d9::D3DFMT_NULL)
{
if (formatInfo.depthBits > 0 || formatInfo.stencilBits > 0) if (formatInfo.depthBits > 0 || formatInfo.stencilBits > 0)
{ {
textureCaps.texturable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat)); textureCaps.texturable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat));
...@@ -304,7 +301,6 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3 ...@@ -304,7 +301,6 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3
textureCaps.sampleCounts.insert(i); textureCaps.sampleCounts.insert(i);
} }
} }
}
return textureCaps; return textureCaps;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment