forked from enlightenment/efl
Fixed a few minor bugs and cleaned up unnecessary code for evas_gl.
Mainly, glDeleteBuffers was being called instead of glDeleteRenderbuffers. Also, there was an error when checking if surface is valid. SVN revision: 70870
This commit is contained in:
parent
d8c978f7d4
commit
2687e46077
|
@ -106,7 +106,6 @@ struct _Render_Engine_GL_Context
|
||||||
|
|
||||||
int scissor_enabled;
|
int scissor_enabled;
|
||||||
int scissor_upated;
|
int scissor_upated;
|
||||||
GLfloat df_clear_color[4];
|
|
||||||
|
|
||||||
Render_Engine_GL_Surface *current_sfc;
|
Render_Engine_GL_Surface *current_sfc;
|
||||||
};
|
};
|
||||||
|
@ -2894,7 +2893,7 @@ _check_gl_surface_format(GLint int_fmt, GLenum fmt, GLenum attachment, GLenum at
|
||||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||||
glDeleteFramebuffers(1, &fbo);
|
glDeleteFramebuffers(1, &fbo);
|
||||||
if (tex) glDeleteTextures(1, &tex);
|
if (tex) glDeleteTextures(1, &tex);
|
||||||
if (rb) glDeleteBuffers(1, &rb);
|
if (rb) glDeleteRenderbuffers(1, &rb);
|
||||||
|
|
||||||
if (fb_status != GL_FRAMEBUFFER_COMPLETE)
|
if (fb_status != GL_FRAMEBUFFER_COMPLETE)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3303,7 +3302,7 @@ finish:
|
||||||
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
{
|
{
|
||||||
if (!sfc) free(sfc);
|
if (sfc) free(sfc);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -3932,15 +3931,7 @@ evgl_glClear(GLbitfield mask)
|
||||||
static void
|
static void
|
||||||
evgl_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
|
evgl_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
|
||||||
{
|
{
|
||||||
Render_Engine_GL_Context *ctx = current_evgl_ctx;
|
|
||||||
|
|
||||||
current_evgl_ctx->df_clear_color[0] = red;
|
|
||||||
current_evgl_ctx->df_clear_color[1] = green;
|
|
||||||
current_evgl_ctx->df_clear_color[2] = blue;
|
|
||||||
current_evgl_ctx->df_clear_color[3] = alpha;
|
|
||||||
|
|
||||||
glClearColor(red, green, blue, alpha);
|
glClearColor(red, green, blue, alpha);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue