forked from enlightenment/efl
Ector renderer gl: Remove the no longer needed .Base hack.
This commit is contained in:
parent
718033886a
commit
9f15b9fbe7
|
@ -38,7 +38,7 @@ ector_eolian_files_gl = \
|
||||||
lib/ector/gl/ector_gl_surface.eo \
|
lib/ector/gl/ector_gl_surface.eo \
|
||||||
lib/ector/gl/ector_gl_buffer.eo \
|
lib/ector/gl/ector_gl_buffer.eo \
|
||||||
lib/ector/gl/ector_gl_buffer_base.eo \
|
lib/ector/gl/ector_gl_buffer_base.eo \
|
||||||
lib/ector/gl/ector_renderer_gl_base.eo \
|
lib/ector/gl/ector_renderer_gl.eo \
|
||||||
lib/ector/gl/ector_renderer_gl_shape.eo \
|
lib/ector/gl/ector_renderer_gl_shape.eo \
|
||||||
lib/ector/gl/ector_renderer_gl_gradient_radial.eo \
|
lib/ector/gl/ector_renderer_gl_gradient_radial.eo \
|
||||||
lib/ector/gl/ector_renderer_gl_gradient_linear.eo
|
lib/ector/gl/ector_renderer_gl_gradient_linear.eo
|
||||||
|
@ -135,7 +135,7 @@ lib_ector_libector_la_SOURCES += \
|
||||||
lib/ector/gl/ector_renderer_gl_gradient_linear.c \
|
lib/ector/gl/ector_renderer_gl_gradient_linear.c \
|
||||||
lib/ector/gl/ector_renderer_gl_gradient_radial.c \
|
lib/ector/gl/ector_renderer_gl_gradient_radial.c \
|
||||||
lib/ector/gl/ector_renderer_gl_shape.c \
|
lib/ector/gl/ector_renderer_gl_shape.c \
|
||||||
lib/ector/gl/ector_renderer_gl_base.c \
|
lib/ector/gl/ector_renderer_gl.c \
|
||||||
lib/ector/gl/ector_gl_buffer.c \
|
lib/ector/gl/ector_gl_buffer.c \
|
||||||
lib/ector/gl/ector_gl_buffer_base.c \
|
lib/ector/gl/ector_gl_buffer_base.c \
|
||||||
lib/ector/gl/ector_gl_surface.c \
|
lib/ector/gl/ector_gl_surface.c \
|
||||||
|
|
|
@ -41,7 +41,7 @@ ector_eolian_files_gl = \
|
||||||
gl/ector_gl_surface.eo \
|
gl/ector_gl_surface.eo \
|
||||||
gl/ector_gl_buffer.eo \
|
gl/ector_gl_buffer.eo \
|
||||||
gl/ector_gl_buffer_base.eo \
|
gl/ector_gl_buffer_base.eo \
|
||||||
gl/ector_renderer_gl_base.eo \
|
gl/ector_renderer_gl.eo \
|
||||||
gl/ector_renderer_gl_shape.eo \
|
gl/ector_renderer_gl_shape.eo \
|
||||||
gl/ector_renderer_gl_gradient_radial.eo \
|
gl/ector_renderer_gl_gradient_radial.eo \
|
||||||
gl/ector_renderer_gl_gradient_linear.eo
|
gl/ector_renderer_gl_gradient_linear.eo
|
||||||
|
@ -124,7 +124,7 @@ libector_la_SOURCES += \
|
||||||
gl/ector_renderer_gl_gradient_linear.c \
|
gl/ector_renderer_gl_gradient_linear.c \
|
||||||
gl/ector_renderer_gl_gradient_radial.c \
|
gl/ector_renderer_gl_gradient_radial.c \
|
||||||
gl/ector_renderer_gl_shape.c \
|
gl/ector_renderer_gl_shape.c \
|
||||||
gl/ector_renderer_gl_base.c \
|
gl/ector_renderer_gl.c \
|
||||||
gl/ector_gl_buffer.c \
|
gl/ector_gl_buffer.c \
|
||||||
gl/ector_gl_buffer_base.c \
|
gl/ector_gl_buffer_base.c \
|
||||||
gl/ector_gl_surface.c \
|
gl/ector_gl_surface.c \
|
||||||
|
|
|
@ -18,7 +18,7 @@ typedef short GLshort;
|
||||||
#include "gl/ector_gl_buffer_base.eo.h"
|
#include "gl/ector_gl_buffer_base.eo.h"
|
||||||
#include "gl/ector_gl_buffer.eo.h"
|
#include "gl/ector_gl_buffer.eo.h"
|
||||||
#include "gl/ector_gl_surface.eo.h"
|
#include "gl/ector_gl_surface.eo.h"
|
||||||
#include "gl/ector_renderer_gl_base.eo.h"
|
#include "gl/ector_renderer_gl.eo.h"
|
||||||
#include "gl/ector_renderer_gl_shape.eo.h"
|
#include "gl/ector_renderer_gl_shape.eo.h"
|
||||||
#include "gl/ector_renderer_gl_gradient_linear.eo.h"
|
#include "gl/ector_renderer_gl_gradient_linear.eo.h"
|
||||||
#include "gl/ector_renderer_gl_gradient_radial.eo.h"
|
#include "gl/ector_renderer_gl_gradient_radial.eo.h"
|
||||||
|
|
|
@ -9,22 +9,22 @@
|
||||||
#include "ector_private.h"
|
#include "ector_private.h"
|
||||||
#include "ector_gl_private.h"
|
#include "ector_gl_private.h"
|
||||||
|
|
||||||
typedef struct _Ector_Renderer_GL_Base_Data Ector_Renderer_GL_Base_Data;
|
typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data;
|
||||||
struct _Ector_Renderer_GL_Base_Data
|
struct _Ector_Renderer_GL_Data
|
||||||
{
|
{
|
||||||
Ector_Renderer_Generic_Base_Data *base;
|
Ector_Renderer_Generic_Base_Data *base;
|
||||||
};
|
};
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_base_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED,
|
_ector_renderer_gl_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_GL_Base_Data *pd EINA_UNUSED)
|
Ector_Renderer_GL_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
|
_ector_renderer_gl_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_GL_Base_Data *pd,
|
Ector_Renderer_GL_Data *pd,
|
||||||
Efl_Gfx_Render_Op op,
|
Efl_Gfx_Render_Op op,
|
||||||
Eina_Array *clips,
|
Eina_Array *clips,
|
||||||
unsigned int mul_col EINA_UNUSED)
|
unsigned int mul_col EINA_UNUSED)
|
||||||
|
@ -37,9 +37,9 @@ _ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eo_Base *
|
static Eo_Base *
|
||||||
_ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd)
|
_ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
|
||||||
{
|
{
|
||||||
obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_BASE_CLASS));
|
obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS));
|
||||||
if (!obj) return NULL;
|
if (!obj) return NULL;
|
||||||
|
|
||||||
pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
|
pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
|
||||||
|
@ -47,9 +47,9 @@ _ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ector_renderer_gl_base_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd)
|
_ector_renderer_gl_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
|
||||||
{
|
{
|
||||||
eo_data_xunref(obj, pd->base, obj);
|
eo_data_xunref(obj, pd->base, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "ector_renderer_gl_base.eo.c"
|
#include "ector_renderer_gl.eo.c"
|
|
@ -1,6 +1,6 @@
|
||||||
import ector_types;
|
import ector_types;
|
||||||
|
|
||||||
abstract Ector.Renderer.GL.Base (Ector.Renderer.Generic.Base)
|
abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base)
|
||||||
{
|
{
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
methods {
|
methods {
|
|
@ -52,7 +52,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_bounds_get(Eo *ob
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_gradient_linear_ector_renderer_gl_base_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
_ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
||||||
{
|
{
|
||||||
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
||||||
// along with the other value
|
// along with the other value
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear)
|
class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear)
|
||||||
{
|
{
|
||||||
eo_prefix: ector_renderer_gl_gradient_linear;
|
eo_prefix: ector_renderer_gl_gradient_linear;
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.
|
||||||
Ector.Renderer.Generic.Base.draw;
|
Ector.Renderer.Generic.Base.draw;
|
||||||
Ector.Renderer.Generic.Base.bounds_get;
|
Ector.Renderer.Generic.Base.bounds_get;
|
||||||
Ector.Renderer.Generic.Base.crc.get;
|
Ector.Renderer.Generic.Base.crc.get;
|
||||||
Ector.Renderer.GL.Base.fill;
|
Ector.Renderer.GL.fill;
|
||||||
Eo.Base.constructor;
|
Eo.Base.constructor;
|
||||||
Eo.Base.destructor;
|
Eo.Base.destructor;
|
||||||
Efl.Gfx.Gradient.stop.set;
|
Efl.Gfx.Gradient.stop.set;
|
||||||
|
|
|
@ -39,7 +39,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, Ect
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_gradient_radial_ector_renderer_gl_base_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
_ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
||||||
{
|
{
|
||||||
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
||||||
// along with the other value
|
// along with the other value
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial)
|
class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial)
|
||||||
{
|
{
|
||||||
eo_prefix: ector_renderer_gl_gradient_radial;
|
eo_prefix: ector_renderer_gl_gradient_radial;
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.
|
||||||
Ector.Renderer.Generic.Base.draw;
|
Ector.Renderer.Generic.Base.draw;
|
||||||
Ector.Renderer.Generic.Base.bounds_get;
|
Ector.Renderer.Generic.Base.bounds_get;
|
||||||
Ector.Renderer.Generic.Base.crc.get;
|
Ector.Renderer.Generic.Base.crc.get;
|
||||||
Ector.Renderer.GL.Base.fill;
|
Ector.Renderer.GL.fill;
|
||||||
Eo.Base.constructor;
|
Eo.Base.constructor;
|
||||||
Eo.Base.destructor;
|
Eo.Base.destructor;
|
||||||
Efl.Gfx.Gradient.stop.set;
|
Efl.Gfx.Gradient.stop.set;
|
||||||
|
|
|
@ -82,7 +82,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere
|
||||||
|
|
||||||
if (pd->shape->fill)
|
if (pd->shape->fill)
|
||||||
{
|
{
|
||||||
ector_renderer_gl_base_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
|
ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -93,7 +93,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_shape_ector_renderer_gl_base_fill(Eo *obj EINA_UNUSED,
|
_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
|
Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
|
||||||
uint64_t flags EINA_UNUSED,
|
uint64_t flags EINA_UNUSED,
|
||||||
GLshort *vertex EINA_UNUSED,
|
GLshort *vertex EINA_UNUSED,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Shape)
|
class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Generic.Shape)
|
||||||
{
|
{
|
||||||
eo_prefix: ector_renderer_gl_shape;
|
eo_prefix: ector_renderer_gl_shape;
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Sh
|
||||||
Ector.Renderer.Generic.Base.draw;
|
Ector.Renderer.Generic.Base.draw;
|
||||||
Ector.Renderer.Generic.Base.bounds_get;
|
Ector.Renderer.Generic.Base.bounds_get;
|
||||||
Ector.Renderer.Generic.Base.crc.get;
|
Ector.Renderer.Generic.Base.crc.get;
|
||||||
Ector.Renderer.GL.Base.fill;
|
Ector.Renderer.GL.fill;
|
||||||
Eo.Base.constructor;
|
Eo.Base.constructor;
|
||||||
Eo.Base.destructor;
|
Eo.Base.destructor;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue