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

gl: Make _cairo_gl_shader_(init|compile) static

Browse source 
Only used within _cairo_gl_shaders.c, so remove the private symbol.
This commit is contained in:
Chris Wilson 2010-05-27 18:27:53 +01:00
parent dd0866cdc8
commit 53f0861059
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cairo-gl-private.h
View file

@ -392,16 +392,6 @@ _cairo_gl_context_init_shaders (cairo_gl_context_t *ctx);
cairo_private void
_cairo_gl_context_fini_shaders (cairo_gl_context_t *ctx);
cairo_private void
_cairo_gl_shader_init (cairo_gl_shader_t *shader);
cairo_private cairo_status_t
_cairo_gl_shader_compile (cairo_gl_context_t *ctx,
cairo_gl_shader_t *program,
cairo_gl_var_type_t src,
cairo_gl_var_type_t mask,
const char *fragment_text);
cairo_private cairo_status_t
_cairo_gl_set_shader_by_type (cairo_gl_context_t *ctx,
cairo_gl_operand_type_t source,

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

@ -93,6 +93,13 @@ typedef struct cairo_gl_shader_impl {
(*use) (cairo_gl_shader_t *shader);
} shader_impl_t;
static cairo_status_t
_cairo_gl_shader_compile (cairo_gl_context_t *ctx,
cairo_gl_shader_t *shader,
cairo_gl_var_type_t src,
cairo_gl_var_type_t mask,
const char *fragment_text);
/* ARB_shader_objects / ARB_vertex_shader / ARB_fragment_shader extensions
API. */
static void
@ -475,6 +482,13 @@ _cairo_gl_shader_cache_destroy (void *data)
free (entry);
}
static void
_cairo_gl_shader_init (cairo_gl_shader_t *shader)
{
shader->fragment_shader = 0;
shader->program = 0;
}
cairo_status_t
_cairo_gl_context_init_shaders (cairo_gl_context_t *ctx)
{
@ -507,14 +521,16 @@ _cairo_gl_context_init_shaders (cairo_gl_context_t *ctx)
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;
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;
}
return CAIRO_STATUS_SUCCESS;
}
@ -532,13 +548,6 @@ _cairo_gl_context_fini_shaders (cairo_gl_context_t *ctx)
_cairo_cache_fini (&ctx->shaders);
}
void
_cairo_gl_shader_init (cairo_gl_shader_t *shader)
{
shader->fragment_shader = 0;
shader->program = 0;
}
void
_cairo_gl_shader_fini (cairo_gl_context_t *ctx,
cairo_gl_shader_t *shader)
@ -809,7 +818,7 @@ cairo_gl_shader_get_fragment_source (GLuint tex_target,
return CAIRO_STATUS_SUCCESS;
}
cairo_status_t
static cairo_status_t
_cairo_gl_shader_compile (cairo_gl_context_t *ctx,
cairo_gl_shader_t *shader,
cairo_gl_var_type_t src,