[gegl] removing gegl-cl-texture and gegl-cl-texture manager
- From: Ãyvind KolÃs <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] removing gegl-cl-texture and gegl-cl-texture manager
- Date: Tue, 20 Mar 2012 13:51:54 +0000 (UTC)
commit 932c4f224d30cd1f925920bfedad719e16e3cc3d
Author: Victor Oliveira <victormatheus gmail com>
Date: Mon Jan 23 13:00:47 2012 -0200
removing gegl-cl-texture and gegl-cl-texture manager
they weren't needed after all, just used cl_mem directly.
gegl/opencl/Makefile.am | 8 +--
gegl/opencl/gegl-cl-color.c | 6 --
gegl/opencl/gegl-cl-texture-manager.c | 112 ---------------------------
gegl/opencl/gegl-cl-texture-manager.h | 12 ---
gegl/opencl/gegl-cl-texture.c | 113 ----------------------------
gegl/opencl/gegl-cl-texture.h | 45 -----------
gegl/opencl/gegl-cl.h | 1 -
tests/opencl/test-cl-brightness-contrast.c | 3 +-
8 files changed, 2 insertions(+), 298 deletions(-)
---
diff --git a/gegl/opencl/Makefile.am b/gegl/opencl/Makefile.am
index 7880ec0..87a896a 100644
--- a/gegl/opencl/Makefile.am
+++ b/gegl/opencl/Makefile.am
@@ -18,10 +18,8 @@ libcl_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/opencl
libcl_public_HEADERS = \
gegl-cl.h \
gegl-cl-init.h \
- gegl-cl-texture.h \
gegl-cl-types.h \
gegl-cl-color.h \
- gegl-cl-texture-manager.h \
cl_d3d10.h \
cl_ext.h \
cl_gl_ext.h \
@@ -34,12 +32,8 @@ libcl_sources = \
gegl-cl-types.h \
gegl-cl-init.c \
gegl-cl-init.h \
- gegl-cl-texture.c \
- gegl-cl-texture.h \
gegl-cl-color.c \
- gegl-cl-color.h \
- gegl-cl-texture-manager.c \
- gegl-cl-texture-manager.h
+ gegl-cl-color.h
noinst_LTLIBRARIES = libcl.la
diff --git a/gegl/opencl/gegl-cl-color.c b/gegl/opencl/gegl-cl-color.c
index 08f660d..4dd281f 100644
--- a/gegl/opencl/gegl-cl-color.c
+++ b/gegl/opencl/gegl-cl-color.c
@@ -70,10 +70,6 @@ gegl_cl_color_babl (const Babl *buffer_format, cl_image_format *cl_format, size_
gegl_cl_color_op
gegl_cl_color_supported (const Babl *in_format, const Babl *out_format)
{
- int i;
- gboolean supported_format_in = FALSE;
- gboolean supported_format_out = FALSE;
-
if (in_format == out_format)
return CL_COLOR_EQUAL;
@@ -101,9 +97,7 @@ gboolean
gegl_cl_color_conv (cl_mem *in_tex, cl_mem *aux_tex, const size_t size[2],
const Babl *in_format, const Babl *out_format)
{
- int i;
int errcode;
- int conv[2] = {-1, -1};
cl_mem ping_tex = *in_tex, pong_tex = *aux_tex;
diff --git a/gegl/opencl/gegl-cl.h b/gegl/opencl/gegl-cl.h
index b1c4105..009be8a 100644
--- a/gegl/opencl/gegl-cl.h
+++ b/gegl/opencl/gegl-cl.h
@@ -3,7 +3,6 @@
#include "gegl-cl-types.h"
#include "gegl-cl-init.h"
-#include "gegl-cl-texture.h"
#include "gegl-cl-color.h"
#endif
diff --git a/tests/opencl/test-cl-brightness-contrast.c b/tests/opencl/test-cl-brightness-contrast.c
index 9e6aa3f..a5cf18a 100644
--- a/tests/opencl/test-cl-brightness-contrast.c
+++ b/tests/opencl/test-cl-brightness-contrast.c
@@ -24,8 +24,7 @@
#include "gegl.h"
#include "gegl-types.h"
#include "gegl-utils.h"
-#include "gegl-cl-init.h"
-#include "gegl-cl-texture.h"
+#include "gegl-cl.h"
#define SUCCESS 0
#define FAILURE (-1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]