gl engine fixes patch from jose, and fix non mmx/sse system build

SVN revision: 22456

diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c b/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c
index a122795..ad5ada1 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c
+++ b/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c
@@ -219,7 +219,7 @@ init_blend_pixel_pt_funcs_mmx(void)
 
 /* blend_rel pixel -> dst */
 
-#ifdef BUILD_C
+#ifdef BUILD_MMX
 #define _op_blend_rel_p_dp_mmx _op_blend_p_dpan_mmx 
 #define _op_blend_rel_pas_dp_mmx _op_blend_pas_dpan_mmx 
 #define _op_blend_rel_pan_dp_mmx _op_blend_pan_dpan_mmx 
@@ -249,7 +249,7 @@ init_blend_rel_pixel_span_funcs_mmx(void)
 }
 #endif
 
-#ifdef BUILD_C
+#ifdef BUILD_MMX
 #define _op_blend_rel_pt_p_dp_mmx _op_blend_pt_p_dpan_mmx 
 #define _op_blend_rel_pt_pas_dp_mmx _op_blend_pt_pas_dpan_mmx 
 #define _op_blend_rel_pt_pan_dp_mmx _op_blend_pt_pan_dpan_mmx 

diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_gradient.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_gradient.c
index cdcdc36..ed97f28 100644 (file)
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_gradient.c
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_gradient.c
@@ -33,7 +33,7 @@ evas_gl_common_gradient_data_set(Evas_GL_Gradient *gr, void * map, int len, int
 }
 
 Evas_GL_Gradient *
-evas_gl_common_gradient_data_unset(Evas_GL_Gradient *gr, void * data, int len, int has_alpha)
+evas_gl_common_gradient_data_unset(Evas_GL_Gradient *gr)
 {
    if (!gr) return NULL;
    evas_common_gradient_data_unset(gr->grad);
@@ -197,7 +197,7 @@ FIXME: this has been broken by the new gradient code!!
 */
    dc = evas_common_draw_context_new();
    if (!dc) return;
-   evas_common_gradient_map(dc, gr->grad, 0);
+   evas_common_gradient_map(dc, gr->grad, _EVAS_TEXTURE_REFLECT);
    if (map = gr->grad->map.data)
      {
        im = evas_common_image_create(256, 4);
@@ -206,7 +206,7 @@ FIXME: this has been broken by the new gradient code!!
             int i;
 
             for (i = 0; i < 4; i++)
-                evas_common_scale_rgba_span(map, gr->grad.map.len, 0xffffffff,
+                evas_common_scale_rgba_span(map, gr->grad->map.len, 0xffffffff,
                                             im->image->data + (i * 256), 256);
             im->flags |= RGBA_IMAGE_HAS_ALPHA;
             gr->tex = evas_gl_common_texture_new(gc, im, 0);

diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index a1f1bf1..991b8b7 100644 (file)
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -144,7 +144,7 @@ static Evas_Func eng_func =
      eng_context_color_interpolation_set,
      eng_context_color_interpolation_get,
      eng_context_render_op_set,
-     engine_context_render_op_get,
+     eng_context_render_op_get,
      /* rectangle draw funcs */
      eng_rectangle_draw,
      /* line draw funcs */
@@ -750,6 +750,16 @@ eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h)
 }
 
 static void
+eng_gradient_range_offset_set(void *data, void *gradient, float offset)
+{
+   Render_Engine *re;
+
+   re = (Render_Engine *)data;
+   evas_gl_common_gradient_range_offset_set(gradient, offset);
+
+}
+
+static void
 eng_gradient_type_set(void *data, void *gradient, char *name)
 {
    Render_Engine *re;