forked from enlightenment/efl
evas/gl_x11 - trivial changes
fix indent, remove white spaces SVN revision: 75501
This commit is contained in:
parent
24f5651f79
commit
38fa83ebf4
|
@ -25,13 +25,13 @@ static int win_count = 0;
|
||||||
|
|
||||||
Evas_GL_X11_Window *
|
Evas_GL_X11_Window *
|
||||||
eng_window_new(Display *disp,
|
eng_window_new(Display *disp,
|
||||||
Window win,
|
Window win,
|
||||||
int screen,
|
int screen,
|
||||||
Visual *vis,
|
Visual *vis,
|
||||||
Colormap cmap,
|
Colormap cmap,
|
||||||
int depth,
|
int depth,
|
||||||
int w,
|
int w,
|
||||||
int h,
|
int h,
|
||||||
int indirect,
|
int indirect,
|
||||||
int alpha,
|
int alpha,
|
||||||
int rot)
|
int rot)
|
||||||
|
@ -162,20 +162,20 @@ eng_window_new(Display *disp,
|
||||||
if (!gw->egl_disp)
|
if (!gw->egl_disp)
|
||||||
{
|
{
|
||||||
ERR("eglGetDisplay() fail. code=%#x", eglGetError());
|
ERR("eglGetDisplay() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!eglInitialize(gw->egl_disp, &major_version, &minor_version))
|
if (!eglInitialize(gw->egl_disp, &major_version, &minor_version))
|
||||||
{
|
{
|
||||||
ERR("eglInitialize() fail. code=%#x", eglGetError());
|
ERR("eglInitialize() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
eglBindAPI(EGL_OPENGL_ES_API);
|
eglBindAPI(EGL_OPENGL_ES_API);
|
||||||
if (eglGetError() != EGL_SUCCESS)
|
if (eglGetError() != EGL_SUCCESS)
|
||||||
{
|
{
|
||||||
ERR("eglBindAPI() fail. code=%#x", eglGetError());
|
ERR("eglBindAPI() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ eng_window_new(Display *disp,
|
||||||
1, &num_config) || (num_config != 1))
|
1, &num_config) || (num_config != 1))
|
||||||
{
|
{
|
||||||
ERR("eglChooseConfig() fail. code=%#x", eglGetError());
|
ERR("eglChooseConfig() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
gw->egl_surface[0] = eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
|
gw->egl_surface[0] = eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
|
||||||
|
@ -194,7 +194,7 @@ eng_window_new(Display *disp,
|
||||||
{
|
{
|
||||||
ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
|
ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
|
||||||
(unsigned int)gw->win, eglGetError());
|
(unsigned int)gw->win, eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (gw->alpha)
|
if (gw->alpha)
|
||||||
|
@ -214,7 +214,7 @@ eng_window_new(Display *disp,
|
||||||
if (gw->egl_context[0] == EGL_NO_CONTEXT)
|
if (gw->egl_context[0] == EGL_NO_CONTEXT)
|
||||||
{
|
{
|
||||||
ERR("eglCreateContext() fail. code=%#x", eglGetError());
|
ERR("eglCreateContext() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (eglMakeCurrent(gw->egl_disp,
|
if (eglMakeCurrent(gw->egl_disp,
|
||||||
|
@ -223,7 +223,7 @@ eng_window_new(Display *disp,
|
||||||
gw->egl_context[0]) == EGL_FALSE)
|
gw->egl_context[0]) == EGL_FALSE)
|
||||||
{
|
{
|
||||||
ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
|
ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ eng_window_new(Display *disp,
|
||||||
gw->glxwin = glXCreateWindow(gw->disp, fbconf, gw->win, NULL);
|
gw->glxwin = glXCreateWindow(gw->disp, fbconf, gw->win, NULL);
|
||||||
if (!gw->glxwin)
|
if (!gw->glxwin)
|
||||||
{
|
{
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -306,7 +306,7 @@ eng_window_new(Display *disp,
|
||||||
|
|
||||||
if (!gw->context)
|
if (!gw->context)
|
||||||
{
|
{
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (gw->context)
|
if (gw->context)
|
||||||
|
@ -531,8 +531,8 @@ eng_window_new(Display *disp,
|
||||||
gw->gl_context = evas_gl_common_context_new();
|
gw->gl_context = evas_gl_common_context_new();
|
||||||
if (!gw->gl_context)
|
if (!gw->gl_context)
|
||||||
{
|
{
|
||||||
eng_window_free(gw);
|
eng_window_free(gw);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
|
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
|
||||||
gw->gl_context->egldisp = gw->egl_disp;
|
gw->gl_context->egldisp = gw->egl_disp;
|
||||||
|
@ -824,7 +824,7 @@ eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo)
|
||||||
config_attrs[i++] = GLX_TRANSPARENT_TYPE;
|
config_attrs[i++] = GLX_TRANSPARENT_TYPE;
|
||||||
config_attrs[i++] = GLX_NONE;//GLX_NONE;//GLX_TRANSPARENT_INDEX//GLX_TRANSPARENT_RGB;
|
config_attrs[i++] = GLX_NONE;//GLX_NONE;//GLX_TRANSPARENT_INDEX//GLX_TRANSPARENT_RGB;
|
||||||
config_attrs[i++] = 0;
|
config_attrs[i++] = 0;
|
||||||
|
|
||||||
configs = glXChooseFBConfig(einfo->info.display,
|
configs = glXChooseFBConfig(einfo->info.display,
|
||||||
einfo->info.screen,
|
einfo->info.screen,
|
||||||
config_attrs, &num);
|
config_attrs, &num);
|
||||||
|
|
Loading…
Reference in New Issue