This makes std430 (which we use everywhere already) fully match C layout. Extension was made mandatory in 1.2.
Unified · Split
| @@ -1501,6 +1501,7 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, · 1500 unmodified lines | |||
| 1501 | p->device_features_1_1.uniformAndStorageBuffer16BitAccess = dev_features_1_1.uniformAndStorageBuffer16BitAccess; | 1501 | p->device_features_1_1.uniformAndStorageBuffer16BitAccess = dev_features_1_1.uniformAndStorageBuffer16BitAccess; |
| 1502 | 1502 | ||
| 1503 | p->device_features_1_2.timelineSemaphore = 1; | 1503 | p->device_features_1_2.timelineSemaphore = 1; |
| 1504 | p->device_features_1_2.scalarBlockLayout = dev_features_1_2.scalarBlockLayout; | ||
| 1504 | p->device_features_1_2.bufferDeviceAddress = dev_features_1_2.bufferDeviceAddress; | 1505 | p->device_features_1_2.bufferDeviceAddress = dev_features_1_2.bufferDeviceAddress; |
| 1505 | p->device_features_1_2.hostQueryReset = dev_features_1_2.hostQueryReset; | 1506 | p->device_features_1_2.hostQueryReset = dev_features_1_2.hostQueryReset; |
| 1506 | p->device_features_1_2.storagePushConstant8 = dev_features_1_2.storagePushConstant8; | 1507 | p->device_features_1_2.storagePushConstant8 = dev_features_1_2.storagePushConstant8; |
| @@ -1478,6 +1478,7 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name, · 1477 unmodified lines | |||
| 1478 | /* Common utilities */ | 1478 | /* Common utilities */ |
| 1479 | GLSLC(0, #define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y)) ); | 1479 | GLSLC(0, #define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y)) ); |
| 1480 | GLSLC(0, ); | 1480 | GLSLC(0, ); |
| 1481 | GLSLC(0, #extension GL_EXT_scalar_block_layout : require ); | ||
| 1481 | GLSLC(0, #extension GL_EXT_buffer_reference : require ); | 1482 | GLSLC(0, #extension GL_EXT_buffer_reference : require ); |
| 1482 | GLSLC(0, #extension GL_EXT_buffer_reference2 : require ); | 1483 | GLSLC(0, #extension GL_EXT_buffer_reference2 : require ); |
| 1483 | 1484 | ||