bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix: Filtering does not work in GPU compositor

Browse Source 
Texture filtering does not work in the GPU compositor. That's because
filtering is set after textures are bound. It works in the viewport
compositor because the textures come pre filtered from the DRW texture
pool.
This commit is contained in:
Omar Emara 2024-01-05 17:38:10 +02:00
parent 517feec7ea
commit 9f076edf5d
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/nodes/composite/nodes/node_composite_defocus.cc
View File

@ -137,8 +137,8 @@ class DefocusOperation : public NodeOperation {
radius.bind_as_texture(shader, "radius_tx");
bokeh_kernel.bind_as_texture(shader, "weights_tx");
GPU_texture_filter_mode(bokeh_kernel.texture(), true);
bokeh_kernel.bind_as_texture(shader, "weights_tx");
const Domain domain = compute_domain();
output.allocate_texture(domain);

3
source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
View File

@ -86,10 +86,9 @@ class DirectionalBlurOperation : public NodeOperation {
GPU_shader_uniform_mat3_as_mat4(shader, "inverse_transformation", get_transformation().ptr());
const Result &input_image = get_input("Image");
input_image.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input_image.texture(), true);
GPU_texture_extend_mode(input_image.texture(), GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
input_image.bind_as_texture(shader, "input_tx");
const Domain domain = compute_domain();
Result &output_image = get_result("Image");

14
source/blender/nodes/composite/nodes/node_composite_glare.cc
View File

@ -169,8 +169,8 @@ class GlareOperation : public NodeOperation {
GPU_shader_uniform_1f(shader, "threshold", node_storage(bnode()).threshold);
const Result &input_image = get_input("Image");
input_image.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input_image.texture(), true);
input_image.bind_as_texture(shader, "input_tx");
const int2 glare_size = get_glare_size();
Result highlights_result = context().create_temporary_result(ResultType::Color);
@ -394,10 +394,10 @@ class GlareOperation : public NodeOperation {
GPU_shader_uniform_3fv(shader, "fade_factors", fade_factors);
GPU_shader_uniform_2fv(shader, "streak_vector", streak_vector);
input_streak_result.bind_as_texture(shader, "input_streak_tx");
GPU_texture_filter_mode(input_streak_result.texture(), true);
GPU_texture_extend_mode(input_streak_result.texture(),
GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
input_streak_result.bind_as_texture(shader, "input_streak_tx");
output_streak_result.bind_as_image(shader, "output_streak_img");
@ -582,13 +582,13 @@ class GlareOperation : public NodeOperation {
GPUShader *shader = context().get_shader("compositor_glare_ghost_base");
GPU_shader_bind(shader);
small_ghost_result.bind_as_texture(shader, "small_ghost_tx");
GPU_texture_filter_mode(small_ghost_result.texture(), true);
GPU_texture_extend_mode(small_ghost_result.texture(), GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
small_ghost_result.bind_as_texture(shader, "small_ghost_tx");
big_ghost_result.bind_as_texture(shader, "big_ghost_tx");
GPU_texture_filter_mode(big_ghost_result.texture(), true);
GPU_texture_extend_mode(big_ghost_result.texture(), GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
big_ghost_result.bind_as_texture(shader, "big_ghost_tx");
const int2 glare_size = get_glare_size();
Result base_ghost_result = context().create_temporary_result(ResultType::Color);
@ -737,8 +737,8 @@ class GlareOperation : public NodeOperation {
for (const int i : upsample_passes_range) {
Result &input = downsample_chain[upsample_passes_range.last() - i + 1];
input.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input.texture(), true);
input.bind_as_texture(shader, "input_tx");
const Result &output = downsample_chain[upsample_passes_range.last() - i];
output.bind_as_image(shader, "output_img", true);
@ -788,8 +788,8 @@ class GlareOperation : public NodeOperation {
}
const Result &input = downsample_chain[i];
input.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input.texture(), true);
input.bind_as_texture(shader, "input_tx");
Result &output = downsample_chain[i + 1];
output.allocate_texture(input.domain().size / 2);
@ -834,8 +834,8 @@ class GlareOperation : public NodeOperation {
const Result &input_image = get_input("Image");
input_image.bind_as_texture(shader, "input_tx");
glare_result.bind_as_texture(shader, "glare_tx");
GPU_texture_filter_mode(glare_result.texture(), true);
glare_result.bind_as_texture(shader, "glare_tx");
const Domain domain = compute_domain();
Result &output_image = get_result("Image");

6
source/blender/nodes/composite/nodes/node_composite_lensdist.cc
View File

@ -100,10 +100,9 @@ class LensDistortionOperation : public NodeOperation {
GPU_shader_bind(shader);
const Result &input_image = get_input("Image");
input_image.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input_image.texture(), true);
GPU_texture_extend_mode(input_image.texture(), GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
input_image.bind_as_texture(shader, "input_tx");
const Domain domain = compute_domain();
@ -127,10 +126,9 @@ class LensDistortionOperation : public NodeOperation {
GPU_shader_bind(shader);
const Result &input_image = get_input("Image");
input_image.bind_as_texture(shader, "input_tx");
GPU_texture_filter_mode(input_image.texture(), true);
GPU_texture_extend_mode(input_image.texture(), GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER);
input_image.bind_as_texture(shader, "input_tx");
const Domain domain = compute_domain();