Skip to content

Commit 47791fa

Browse files
committed
shaderFloat64 feature rename
1 parent 9bef955 commit 47791fa

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

include/nbl/video/SPhysicalDeviceFeatures.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct SPhysicalDeviceFeatures
7575
bool shaderStorageImageArrayDynamicIndexing = false;
7676
bool shaderClipDistance = false;
7777
bool shaderCullDistance = false;
78-
bool vertexAttributeDouble = false; // shaderFloat64
78+
bool shaderFloat64 = false; // shaderFloat64
7979

8080
// Enabled by Default, Moved to Limits
8181
//bool shaderInt64 = false;
@@ -1045,7 +1045,7 @@ struct SPhysicalDeviceFeatures
10451045
if (shaderStorageImageArrayDynamicIndexing && !_rhs.shaderStorageImageArrayDynamicIndexing) return false;
10461046
if (shaderClipDistance && !_rhs.shaderClipDistance) return false;
10471047
if (shaderCullDistance && !_rhs.shaderCullDistance) return false;
1048-
if (vertexAttributeDouble && !_rhs.vertexAttributeDouble) return false;
1048+
if (shaderFloat64 && !_rhs.shaderFloat64) return false;
10491049
if (shaderResourceResidency && !_rhs.shaderResourceResidency) return false;
10501050
if (shaderResourceMinLod && !_rhs.shaderResourceMinLod) return false;
10511051
if (variableMultisampleRate && !_rhs.variableMultisampleRate) return false;

src/nbl/video/CVulkanPhysicalDevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
662662
m_features.shaderStorageImageArrayDynamicIndexing = features.shaderStorageImageArrayDynamicIndexing;
663663
m_features.shaderClipDistance = features.shaderClipDistance;
664664
m_features.shaderCullDistance = features.shaderCullDistance;
665-
m_features.vertexAttributeDouble = features.shaderFloat64;
665+
m_features.shaderFloat64 = features.shaderFloat64;
666666
m_features.shaderResourceResidency = features.shaderResourceResidency;
667667
m_features.shaderResourceMinLod = features.shaderResourceMinLod;
668668
m_features.variableMultisampleRate = features.variableMultisampleRate;
@@ -1705,7 +1705,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
17051705
vk_deviceFeatures2.features.shaderStorageImageArrayDynamicIndexing = enabledFeatures.shaderStorageImageArrayDynamicIndexing;
17061706
vk_deviceFeatures2.features.shaderClipDistance = enabledFeatures.shaderClipDistance;
17071707
vk_deviceFeatures2.features.shaderCullDistance = enabledFeatures.shaderCullDistance;
1708-
vk_deviceFeatures2.features.shaderFloat64 = enabledFeatures.vertexAttributeDouble;
1708+
vk_deviceFeatures2.features.shaderFloat64 = enabledFeatures.shaderFloat64;
17091709
vk_deviceFeatures2.features.shaderResourceResidency = enabledFeatures.shaderResourceResidency;
17101710
vk_deviceFeatures2.features.shaderResourceMinLod = enabledFeatures.shaderResourceMinLod;
17111711
vk_deviceFeatures2.features.variableMultisampleRate = enabledFeatures.variableMultisampleRate;

src/nbl/video/ILogicalDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void ILogicalDevice::addCommonShaderDefines(std::ostringstream& pool, const bool
393393
if (features.shaderStorageImageArrayDynamicIndexing) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_STORAGE_IMAGE_ARRAY_DYNAMIC_INDEXING");
394394
if (features.shaderClipDistance) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_CLIP_DISTANCE");
395395
if (features.shaderCullDistance) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_CULL_DISTANCE");
396-
if (features.vertexAttributeDouble) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_VERTEX_ATTRIBUTE_DOUBLE");
396+
if (features.shaderFloat64) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_FLOAT64");
397397
if (features.shaderResourceResidency) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_RESOURCE_RESIDENCY");
398398
if (features.shaderResourceMinLod) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_SHADER_RESOURCE_MIN_LOD");
399399
if (features.variableMultisampleRate) addShaderDefineToPool(pool, "NBL_GLSL_FEATURE_VARIABLE_MULTISAMPLE_RATE");

src/nbl/video/IOpenGL_PhysicalDeviceBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ class IOpenGL_PhysicalDeviceBase : public IOpenGLPhysicalDeviceBase
729729
}
730730
}
731731

732-
m_features.vertexAttributeDouble = !IsGLES;
732+
m_features.shaderFloat64 = !IsGLES;
733733

734734
m_properties.limits.shaderInt64 = m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_NV_gpu_shader5) || m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_ARB_gpu_shader_int64) || m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_AMD_gpu_shader_int64); // keep in sync with `GL_EXT_shader_explicit_arithmetic_types_int16` SPIRV-Cross Handling https://github.com/KhronosGroup/SPIRV-Cross/blob/master/spirv_glsl.cpp#L411
735735
m_properties.limits.shaderInt16 = m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_NV_gpu_shader5) || m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_AMD_gpu_shader_int16); // keep in sync with `GL_EXT_shader_explicit_arithmetic_types_int16` SPIRV-Cross Handling https://github.com/KhronosGroup/SPIRV-Cross/blob/master/spirv_glsl.cpp#L849

0 commit comments

Comments
 (0)