dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas GL: Add support for OpenGL-ES 1.1 (part 1) 

This commit adds lots of required definitions (GL_ stuff),
new API entries in the Evas_GL_API struct, and basic new APIs
to create OpenGL-ES 1.1 contexts.

@feature
This commit is contained in:
Jean-Philippe Andre 2014-09-22 17:53:06 +09:00
parent 38aa72d139
commit 3f9caaf16d
2 changed files with 2474 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2498
src/lib/evas/Evas_GL.h
View File

File diff suppressed because it is too large Load Diff

45
src/lib/evas/canvas/evas_gl.c
View File

@ -20,6 +20,7 @@ struct _Evas_GL
struct _Evas_GL_Context struct _Evas_GL_Context
{ {
void *data; void *data;
Evas_GL_Context_Version version;
}; };
struct _Evas_GL_Surface struct _Evas_GL_Surface
@ -326,7 +327,8 @@ evas_gl_surface_destroy(Evas_GL *evas_gl, Evas_GL_Surface *surf)
} }
EAPI Evas_GL_Context * EAPI Evas_GL_Context *
evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx) evas_gl_context_version_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx,
Evas_GL_Context_Version version)
{ {
Evas_GL_Context *ctx; Evas_GL_Context *ctx;
@ -335,6 +337,14 @@ evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx)
return NULL; return NULL;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if ((version != EVAS_GL_GLES_1_X) && (version != EVAS_GL_GLES_2_X))
{
ERR("Can not create an OpenGL-ES %d.x context (not supported).",
(int) version);
_evas_gl_internal_error_set(evas_gl, EVAS_GL_BAD_PARAMETER);
return NULL;
}
// Allocate a context object // Allocate a context object
ctx = calloc(1, sizeof(Evas_GL_Context)); ctx = calloc(1, sizeof(Evas_GL_Context));
if (!ctx) if (!ctx)
@ -345,14 +355,11 @@ evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx)
} }
// Call engine->gl_create_context // Call engine->gl_create_context
ctx->version = version;
if (share_ctx) if (share_ctx)
{ ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, share_ctx->data, version);
ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, share_ctx->data);
}
else else
{ ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, NULL, version);
ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, NULL);
}
// Set a few variables // Set a few variables
if (!ctx->data) if (!ctx->data)
@ -370,6 +377,12 @@ evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx)
return ctx; return ctx;
} }
EAPI Evas_GL_Context *
evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx)
{
return evas_gl_context_version_create(evas_gl, share_ctx, EVAS_GL_GLES_2_X);
}
EAPI void EAPI void
evas_gl_context_destroy(Evas_GL *evas_gl, Evas_GL_Context *ctx) evas_gl_context_destroy(Evas_GL *evas_gl, Evas_GL_Context *ctx)
{ {
@ -549,7 +562,23 @@ evas_gl_api_get(Evas_GL *evas_gl)
return NULL; return NULL;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output); return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output, EVAS_GL_GLES_2_X);
}
EAPI Evas_GL_API *
evas_gl_context_api_get(Evas_GL *evas_gl, Evas_GL_Context *ctx)
{
MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
return NULL;
MAGIC_CHECK_END();
if (!ctx)
{
_evas_gl_internal_error_set(evas_gl, EVAS_GL_BAD_CONTEXT);
return NULL;
}
return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output, ctx->version);
} }
EAPI int EAPI int