History

vulkan: don't enable GL_EXT_buffer_reference by default

Only nlmeans_vulkan uses it.

Lynne committed 2 years ago

Commit 832947b1 parent 2bb0b6d2 files · +4 −4Browse files

Unified · Split

2 files
  1. libavfilter/vf_nlmeans_vulkan.c +4 −2
  2. libavutil/vulkan.c +0 −2
libavfilter/vf_nlmeans_vulkan.c+4−2
@@ -240,7 +240,8 @@ static av_cold int init_weights_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e · 239 unmodified lines
240 240
241 RET(ff_vk_shader_init(vkctx, shd, "nlmeans_weights",241 RET(ff_vk_shader_init(vkctx, shd, "nlmeans_weights",
242 VK_SHADER_STAGE_COMPUTE_BIT,242 VK_SHADER_STAGE_COMPUTE_BIT,
243 NULL, 0,243 (const char *[]) { "GL_EXT_buffer_reference",
244 "GL_EXT_buffer_reference2" }, 2,
244 wg_size, 1, 1,245 wg_size, 1, 1,
245 0));246 0));
246 247
@@ -431,7 +432,8 @@ static av_cold int init_denoise_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e · 184 unmodified lines
431 432
432 RET(ff_vk_shader_init(vkctx, shd, "nlmeans_denoise",433 RET(ff_vk_shader_init(vkctx, shd, "nlmeans_denoise",
433 VK_SHADER_STAGE_COMPUTE_BIT,434 VK_SHADER_STAGE_COMPUTE_BIT,
434 NULL, 0,435 (const char *[]) { "GL_EXT_buffer_reference",
436 "GL_EXT_buffer_reference2" }, 2,
435 32, 32, 1,437 32, 32, 1,
436 0));438 0));
437 439
libavutil/vulkan.c+0−2
@@ -1479,8 +1479,6 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name, · 1478 unmodified lines
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_scalar_block_layout : require );
1482 GLSLC(0, #extension GL_EXT_buffer_reference : require );
1483 GLSLC(0, #extension GL_EXT_buffer_reference2 : require );
1484 if (s->extensions & FF_VK_EXT_RELAXED_EXTENDED_INSTR)1482 if (s->extensions & FF_VK_EXT_RELAXED_EXTENDED_INSTR)
1485 GLSLC(0, #extension GL_EXT_debug_printf : require );1483 GLSLC(0, #extension GL_EXT_debug_printf : require );
1486 1484

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t