Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make texture compression work in release builds when no Direct3d hardware device is found. #11

Merged
merged 3 commits into from
Feb 20, 2018
Merged

Make texture compression work in release builds when no Direct3d hardware device is found. #11

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cc40ab
Use the WARP software fallback in release builds too. Fixes issue #10.
Jan 23, 2018
71e64fc
Revert "Use the WARP software fallback in release builds too. Fixes i…
Feb 12, 2018
aa30e2d
Handle lack of GPU device in GLTFTextureCompressionUtils.
Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use the WARP software fallback in release builds too. Fixes issue #10.
  • Loading branch information
Erik Dahlström committed Feb 12, 2018
commit 5cc40ab31ad5eb716a3c208ede92c8a4f4dccac1
7 changes: 0 additions & 7 deletions glTF-Toolkit/src/DeviceResources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@ void DeviceResources::CreateDeviceResources()
context.GetAddressOf() // Returns the device immediate context.
);
}
#if defined(NDEBUG)
else
{
throw std::exception("No Direct3D hardware device found");
}
#else
if (FAILED(hr))
{
// If the initialization fails, fall back to the WARP device.
Expand All @@ -134,7 +128,6 @@ void DeviceResources::CreateDeviceResources()
OutputDebugStringA("Direct3D Adapter - WARP\n");
}
}
#endif

ThrowIfFailed(hr);

Expand Down