diff options
| author | Ben Murdoch <benm@google.com> | 2014-10-22 18:25:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-10-22 18:25:45 +0100 |
| commit | 03ad9a112c6f69f368a54914cb8dd13181dfb408 (patch) | |
| tree | 9d370721069db60037cbeb1b306e9769a1615265 | |
| parent | 2f9e7f86fa311f343f730235f11fb32a78464b02 (diff) | |
| parent | 5af475edef3fd24b9bbbcb43380825b02436ab2f (diff) | |
| download | angle-03ad9a112c6f69f368a54914cb8dd13181dfb408.tar.gz | |
Merge third_party/angle from https://chromium.googlesource.com/angle/angle.git at 5af475edef3fd24b9bbbcb43380825b02436ab2f
This commit was generated by merge_from_chromium.py.
Change-Id: I0de9cecf726dc264c34af93ec22007cfe6607f8b
| -rw-r--r-- | src/libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp b/src/libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp index d6f950a5..7d7396ac 100644 --- a/src/libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp +++ b/src/libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp @@ -461,7 +461,7 @@ void GenerateCaps(IDirect3D9 *d3d9, IDirect3DDevice9 *device, D3DDEVTYPE deviceT extensions->textureNPOT = !(deviceCaps.TextureCaps & D3DPTEXTURECAPS_POW2) && !(deviceCaps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && !(deviceCaps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) && - !(isWindowsVistaOrGreater() && adapterId.VendorId == VENDOR_ID_AMD); + !(!isWindowsVistaOrGreater() && adapterId.VendorId == VENDOR_ID_AMD); } else { |