____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
/// This file contains all opencl kernels for node-operation implementations
|
|
|
|
|
2012-06-08 09:17:07 +00:00
|
|
|
// Global SAMPLERS
|
|
|
|
const sampler_t SAMPLER_NEAREST = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_NEAREST;
|
|
|
|
|
|
|
|
__constant const int2 zero = {0,0};
|
|
|
|
|
|
|
|
// KERNEL --- BOKEH BLUR ---
|
2012-06-13 12:34:56 +00:00
|
|
|
__kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only image2d_t inputImage,
|
|
|
|
__read_only image2d_t bokehImage, __write_only image2d_t output,
|
2012-06-08 09:17:07 +00:00
|
|
|
int2 offsetInput, int2 offsetOutput, int radius, int step, int2 dimension, int2 offset)
|
2012-05-19 13:55:54 +00:00
|
|
|
{
|
2012-06-08 09:17:07 +00:00
|
|
|
int2 coords = {get_global_id(0), get_global_id(1)};
|
|
|
|
coords += offset;
|
|
|
|
float tempBoundingBox;
|
|
|
|
float4 color = {0.0f,0.0f,0.0f,0.0f};
|
|
|
|
float4 multiplyer = {0.0f,0.0f,0.0f,0.0f};
|
|
|
|
float4 bokeh;
|
|
|
|
const float radius2 = radius*2.0f;
|
|
|
|
const int2 realCoordinate = coords + offsetOutput;
|
|
|
|
|
|
|
|
tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;
|
|
|
|
|
|
|
|
if (tempBoundingBox > 0.0f) {
|
|
|
|
const int2 bokehImageDim = get_image_dim(bokehImage);
|
|
|
|
const int2 bokehImageCenter = bokehImageDim/2;
|
|
|
|
const int2 minXY = max(realCoordinate - radius, zero);
|
|
|
|
const int2 maxXY = min(realCoordinate + radius, dimension);
|
|
|
|
int nx, ny;
|
|
|
|
|
|
|
|
float2 uv;
|
|
|
|
int2 inputXy;
|
|
|
|
|
|
|
|
for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny +=step, inputXy.y+=step) {
|
|
|
|
uv.y = ((realCoordinate.y-ny)/radius2)*bokehImageDim.y+bokehImageCenter.y;
|
|
|
|
|
|
|
|
for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx +=step, inputXy.x+=step) {
|
|
|
|
uv.x = ((realCoordinate.x-nx)/radius2)*bokehImageDim.x+bokehImageCenter.x;
|
|
|
|
bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);
|
|
|
|
color += bokeh * read_imagef(inputImage, SAMPLER_NEAREST, inputXy);
|
|
|
|
multiplyer += bokeh;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
color /= multiplyer;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
int2 imageCoordinates = realCoordinate - offsetInput;
|
|
|
|
color = read_imagef(inputImage, SAMPLER_NEAREST, imageCoordinates);
|
|
|
|
}
|
|
|
|
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
write_imagef(output, coords, color);
|
|
|
|
}
|
2012-06-13 12:34:56 +00:00
|
|
|
|
2012-07-06 11:31:40 +00:00
|
|
|
//KERNEL --- DEFOCUS /VARIABLESIZEBOKEHBLUR ---
|
|
|
|
__kernel void defocusKernel(__read_only image2d_t inputImage, __read_only image2d_t bokehImage,
|
2012-07-09 15:21:43 +00:00
|
|
|
__read_only image2d_t inputSize,
|
2012-07-06 11:31:40 +00:00
|
|
|
__write_only image2d_t output, int2 offsetInput, int2 offsetOutput,
|
|
|
|
int step, int maxBlur, float threshold, int2 dimension, int2 offset)
|
|
|
|
{
|
|
|
|
float4 color = {1.0f, 0.0f, 0.0f, 1.0f};
|
|
|
|
int2 coords = {get_global_id(0), get_global_id(1)};
|
|
|
|
coords += offset;
|
|
|
|
const int2 realCoordinate = coords + offsetOutput;
|
|
|
|
|
|
|
|
float4 readColor;
|
|
|
|
float4 bokeh;
|
|
|
|
float tempSize;
|
|
|
|
float4 multiplier_accum = {1.0f, 1.0f, 1.0f, 1.0f};
|
|
|
|
float4 color_accum;
|
|
|
|
|
|
|
|
int minx = max(realCoordinate.s0 - maxBlur, 0);
|
|
|
|
int miny = max(realCoordinate.s1 - maxBlur, 0);
|
|
|
|
int maxx = min(realCoordinate.s0 + maxBlur, dimension.s0);
|
|
|
|
int maxy = min(realCoordinate.s1 + maxBlur, dimension.s1);
|
|
|
|
|
|
|
|
{
|
|
|
|
int2 inputCoordinate = realCoordinate - offsetInput;
|
|
|
|
float size = read_imagef(inputSize, SAMPLER_NEAREST, inputCoordinate).s0;
|
|
|
|
color_accum = read_imagef(inputImage, SAMPLER_NEAREST, inputCoordinate);
|
|
|
|
|
|
|
|
for (int ny = miny; ny < maxy; ny += step) {
|
|
|
|
for (int nx = minx; nx < maxx; nx += step) {
|
|
|
|
if (nx >= 0 && nx < dimension.s0 && ny >= 0 && ny < dimension.s1) {
|
|
|
|
inputCoordinate.s0 = nx - offsetInput.s0;
|
|
|
|
inputCoordinate.s1 = ny - offsetInput.s1;
|
2012-07-09 15:21:43 +00:00
|
|
|
tempSize = read_imagef(inputSize, SAMPLER_NEAREST, inputCoordinate).s0;
|
|
|
|
if (size > threshold && tempSize > threshold) {
|
|
|
|
float dx = nx - realCoordinate.s0;
|
|
|
|
float dy = ny - realCoordinate.s1;
|
|
|
|
if (dx != 0 || dy != 0) {
|
|
|
|
if (tempSize >= fabs(dx) && tempSize >= fabs(dy)) {
|
|
|
|
float2 uv = { 256.0f + dx * 256.0f / tempSize, 256.0f + dy * 256.0f / tempSize};
|
|
|
|
bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);
|
|
|
|
readColor = read_imagef(inputImage, SAMPLER_NEAREST, inputCoordinate);
|
|
|
|
color_accum += bokeh*readColor;
|
|
|
|
multiplier_accum += bokeh;
|
2012-07-06 11:31:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
color = color_accum * (1.0f / multiplier_accum);
|
|
|
|
write_imagef(output, coords, color);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-13 12:34:56 +00:00
|
|
|
// KERNEL --- DILATE ---
|
|
|
|
__kernel void dilateKernel(__read_only image2d_t inputImage, __write_only image2d_t output,
|
|
|
|
int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension,
|
|
|
|
int2 offset)
|
|
|
|
{
|
|
|
|
int2 coords = {get_global_id(0), get_global_id(1)};
|
|
|
|
coords += offset;
|
|
|
|
const int2 realCoordinate = coords + offsetOutput;
|
|
|
|
|
|
|
|
const int2 minXY = max(realCoordinate - scope, zero);
|
|
|
|
const int2 maxXY = min(realCoordinate + scope, dimension);
|
|
|
|
|
|
|
|
float value = 0.0f;
|
|
|
|
int nx, ny;
|
|
|
|
int2 inputXy;
|
|
|
|
|
|
|
|
for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {
|
2012-06-15 15:55:37 +00:00
|
|
|
const float deltaY = (realCoordinate.y - ny);
|
2012-06-13 12:34:56 +00:00
|
|
|
for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {
|
|
|
|
const float deltaX = (realCoordinate.x - nx);
|
|
|
|
const float measuredDistance = deltaX*deltaX+deltaY*deltaY;
|
|
|
|
if (measuredDistance <= distanceSquared) {
|
|
|
|
value = max(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
float4 color = {value,0.0f,0.0f,0.0f};
|
|
|
|
write_imagef(output, coords, color);
|
|
|
|
}
|
|
|
|
|
|
|
|
// KERNEL --- DILATE ---
|
|
|
|
__kernel void erodeKernel(__read_only image2d_t inputImage, __write_only image2d_t output,
|
|
|
|
int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension,
|
|
|
|
int2 offset)
|
|
|
|
{
|
|
|
|
int2 coords = {get_global_id(0), get_global_id(1)};
|
|
|
|
coords += offset;
|
|
|
|
const int2 realCoordinate = coords + offsetOutput;
|
|
|
|
|
|
|
|
const int2 minXY = max(realCoordinate - scope, zero);
|
|
|
|
const int2 maxXY = min(realCoordinate + scope, dimension);
|
|
|
|
|
|
|
|
float value = 1.0f;
|
|
|
|
int nx, ny;
|
|
|
|
int2 inputXy;
|
|
|
|
|
|
|
|
for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {
|
|
|
|
for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {
|
|
|
|
const float deltaX = (realCoordinate.x - nx);
|
|
|
|
const float deltaY = (realCoordinate.y - ny);
|
|
|
|
const float measuredDistance = deltaX*deltaX+deltaY*deltaY;
|
|
|
|
if (measuredDistance <= distanceSquared) {
|
|
|
|
value = min(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
float4 color = {value,0.0f,0.0f,0.0f};
|
|
|
|
write_imagef(output, coords, color);
|
|
|
|
}
|