fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-06-08 04:38:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Remove unnecessary checks for NULL shader implementation

Browse source 
Due to the fact that we fail if the system doesn't support shaders, we
now always have a valid shader implementation.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Alexandros Frantzis 2011-01-28 15:02:53 +02:00 • committed by Eric Anholt
parent 037c9ba7e2
commit f6ca11694b
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/cairo-gl-shaders.c
View file

@ -379,16 +379,14 @@ _cairo_gl_context_init_shaders (cairo_gl_context_t *ctx)
if (unlikely (status))
return status;
if (ctx->shader_impl != NULL) {
_cairo_gl_shader_init (&ctx->fill_rectangles_shader);
status = _cairo_gl_shader_compile (ctx,
&ctx->fill_rectangles_shader,
CAIRO_GL_VAR_NONE,
CAIRO_GL_VAR_NONE,
fill_fs_source);
if (unlikely (status))
return status;
}
_cairo_gl_shader_init (&ctx->fill_rectangles_shader);
status = _cairo_gl_shader_compile (ctx,
&ctx->fill_rectangles_shader,
CAIRO_GL_VAR_NONE,
CAIRO_GL_VAR_NONE,
fill_fs_source);
if (unlikely (status))
return status;
return CAIRO_STATUS_SUCCESS;
}
@ -719,9 +717,6 @@ _cairo_gl_shader_compile (cairo_gl_context_t *ctx,
unsigned int vertex_shader;
cairo_status_t status;
if (ctx->shader_impl == NULL)
return CAIRO_STATUS_SUCCESS;
assert (shader->program == 0);
vertex_shader = cairo_gl_var_type_hash (src, mask, CAIRO_GL_VAR_NONE);
@ -813,9 +808,6 @@ void
_cairo_gl_set_shader (cairo_gl_context_t *ctx,
cairo_gl_shader_t *shader)
{
if (ctx->shader_impl == NULL)
return;
if (ctx->current_shader == shader)
return;
@ -835,11 +827,6 @@ _cairo_gl_get_shader_by_type (cairo_gl_context_t *ctx,
char *fs_source;
cairo_status_t status;
if (ctx->shader_impl == NULL) {
*shader = NULL;
return CAIRO_STATUS_SUCCESS;
}
lookup.src = source;
lookup.mask = mask;
lookup.dest = CAIRO_GL_OPERAND_NONE;