Re: [PATCH 1/1] video-degradation: Don't crash when CL build fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, 2016-05-15 at 14:12 +0200, Øyvind Kolås wrote:
> Please use bugzilla which is GEGLs normal patch/bug handling system.
> I've pushed these changes to git master - albeit with slightly
> deteriorated meta data since the diffs were manually incorporated.

thank you, I'll use bugzilla next time. I assumed everybody just uses
git am.

The unexpected part is that the test now passes, despite not doing any
processing. I have attached diff between reference and OpenCL result.
note that CPU version of the algorithm produces the exact same picture
as OpenCL (which did no processing)


Jan

> 
> /pippin
> 
> On Sun, May 15, 2016 at 1:04 AM, Jan Vesely <jan.vesely@xxxxxxxxxxx>
> wrote:
> > 
> > Signed-off-by: Jan Vesely <jan.vesely@xxxxxxxxxxx>
> > ---
> >  operations/common/video-degradation.c | 16 ++++++++++------
> >  1 file changed, 10 insertions(+), 6 deletions(-)
> > 
> > diff --git a/operations/common/video-degradation.c
> > b/operations/common/video-degradation.c
> > index 29197ff..5b84e2a 100644
> > --- a/operations/common/video-degradation.c
> > +++ b/operations/common/video-degradation.c
> > @@ -201,13 +201,17 @@ cl_process (GeglOperation       *operation,
> >    const size_t gbl_size[2] = {roi->width, roi->height};
> >    const size_t gbl_off[2]  = {roi->x, roi->y};
> >    cl_int cl_err = 0;
> > +  cl_mem filter_pat = NULL;
> > 
> > -  cl_mem filter_pat = gegl_clCreateBuffer (gegl_cl_get_context (),
> > -                                           CL_MEM_READ_ONLY |
> > CL_MEM_COPY_HOST_PTR,
> > -                                           pattern_width[o-
> > >pattern] *
> > -                                           pattern_height[o-
> > >pattern] * sizeof(cl_int),
> > -                                           (void*)pattern[o-
> > >pattern],
> > -                                           &cl_err);
> > +  if (!cl_data)
> > +    goto error;
> > +
> > +  filter_pat = gegl_clCreateBuffer (gegl_cl_get_context (),
> > +                                    CL_MEM_READ_ONLY |
> > CL_MEM_COPY_HOST_PTR,
> > +                                    pattern_width[o->pattern] *
> > +                                    pattern_height[o->pattern] *
> > sizeof(cl_int),
> > +                                    (void*)pattern[o->pattern],
> > +                                    &cl_err);
> >    CL_CHECK;
> >    cl_err = gegl_cl_set_kernel_args (cl_data->kernel[0],
> >                                      sizeof(cl_mem), &in_buf,
> > --
> > 2.5.5
> > 
> > _______________________________________________
> > gegl-developer-list mailing list
> > List address:    gegl-developer-list@xxxxxxxxx
> > List membership: https://mail.gnome.org/mailman/listinfo/gegl-devel
> > oper-list
> > 
-- 
Jan Vesely <jan.vesely@xxxxxxxxxxx>

Attachment: diff.png
Description: PNG image

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
gegl-developer-list mailing list
List address:    gegl-developer-list@xxxxxxxxx
List membership: https://mail.gnome.org/mailman/listinfo/gegl-developer-list


[Index of Archives]     [Yosemite News]     [Yosemite Photos]     [gtk]     [GIMP Users]     [KDE]     [Gimp's Home]     [Gimp on Windows]     [Steve's Art]

  Powered by Linux