rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-03 22:24:13 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Do not emit depth type for non-sampled resources

Browse Source 
Fixes a crash in the Nvidia driver. These type
declarations were never used in the first place.
This commit is contained in:
Philip Rebohle 2018-02-02 21:42:04 +01:00
parent 14d5054893
commit a567f6a5a5
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dxbc/dxbc_compiler.cpp
View File

@ -757,11 +757,18 @@ namespace dxvk {
res.sampledTypeId = sampledTypeId; res.sampledTypeId = sampledTypeId;
res.imageTypeId = imageTypeId; res.imageTypeId = imageTypeId;
res.colorTypeId = imageTypeId; res.colorTypeId = imageTypeId;
res.depthTypeId = 0;
res.structStride = 0;
if (resourceType != DxbcResourceDim::Buffer
&& resourceType != DxbcResourceDim::Texture2DMs
&& resourceType != DxbcResourceDim::Texture2DMsArr) {
res.depthTypeId = m_module.defImageType(sampledTypeId, res.depthTypeId = m_module.defImageType(sampledTypeId,
typeInfo.dim, 1, typeInfo.array, typeInfo.ms, typeInfo.sampled, typeInfo.dim, 1, typeInfo.array, typeInfo.ms, typeInfo.sampled,
spv::ImageFormatUnknown); spv::ImageFormatUnknown);
}
m_textures.at(registerId) = res; m_textures.at(registerId) = res;
res.structStride = 0;
} }
// Store descriptor info for the shader interface // Store descriptor info for the shader interface
@ -866,7 +873,7 @@ namespace dxvk {
res.sampledTypeId = sampledTypeId; res.sampledTypeId = sampledTypeId;
res.imageTypeId = resTypeId; res.imageTypeId = resTypeId;
res.colorTypeId = resTypeId; res.colorTypeId = resTypeId;
res.depthTypeId = resTypeId; res.depthTypeId = 0;
res.structStride = resStride; res.structStride = resStride;
m_textures.at(registerId) = res; m_textures.at(registerId) = res;
} }