Back out breaking glslang change on nvidia, remove texel fetch hack

* No fixed nvidia driver has been released, and since there is an easy
  workaround that doesn't break any other IHV's drivers, temporarily do
  that until nvidia's driver is working again.
This commit is contained in:
baldurk committed 2016-07-29 21:48:27 +02:00
1 parent e6d07b41f3
commit 081bdc3fd8
2 files changed
+7 -2

No files matched your search

+3
View File
@@ -2590,12 +2590,15 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
bias = true;
}
// Temporarily hacked out as it breaks on nvidia's driver
/*
// See if the sampler param should really be just the SPV image part
if (cracked.fetch) {
// a fetch needs to have the image extracted first
if (builder.isSampledImage(params.sampler))
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
}
*/
// set the rest of the arguments
+4 -2
View File
@@ -1417,8 +1417,10 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
if(m_pDriver->IsNV())
{
// at time of writing, this isn't fixed on nv
texelFetchBrokenDriver = true;
// at time of writing, this isn't fixed on nv, but since we have a workaround
// that is harmless on other IHVs - keep it supported. Once a fixed version is
// out we will use this + a version check to stay working on older drivers.
// texelFetchBrokenDriver = true;
}
if(m_pDriver->IsAMD())