isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

arbfp: rename get_arbfp_authority clarifying semantics

Browse Source 
This renames the get_arbfp_authority function to
get_arbfp_authority_no_check to clarify that the function doesn't
validate that the authority cache is still valid by looking at the age
of the referenced material. The function should only be used when we
*know* the cache has already been checked.
This commit is contained in:
Robert Bragg 2010-09-13 22:56:44 +01:00
parent 3a2a10d2e8
commit 8f63ca6ffc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cogl/cogl-material-arbfp.c
View File

@ -371,8 +371,12 @@ _cogl_material_backend_arbfp_start (CoglMaterial *material,
return TRUE; return TRUE;
} }
/* The "no_check" refers to the fact that this doesn't check that the
* cache is still valid by looking at the age of the referenced
* material. This should only be used where we *know* the cache has
* already been checked. */
static CoglMaterial * static CoglMaterial *
get_arbfp_authority (CoglMaterial *material) get_arbfp_authority_no_check (CoglMaterial *material)
{ {
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
material->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; material->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
@ -551,7 +555,7 @@ setup_arg (CoglMaterial *material,
GLint op, GLint op,
CoglMaterialBackendARBfpArg *arg) CoglMaterialBackendARBfpArg *arg)
{ {
CoglMaterial *arbfp_authority = get_arbfp_authority (material); CoglMaterial *arbfp_authority = get_arbfp_authority_no_check (material);
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
static const char *tmp_name[3] = { "tmp0", "tmp1", "tmp2" }; static const char *tmp_name[3] = { "tmp0", "tmp1", "tmp2" };
@ -692,7 +696,7 @@ append_function (CoglMaterial *material,
CoglMaterialBackendARBfpArg *args, CoglMaterialBackendARBfpArg *args,
int n_args) int n_args)
{ {
CoglMaterial *arbfp_authority = get_arbfp_authority (material); CoglMaterial *arbfp_authority = get_arbfp_authority_no_check (material);
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
const char *mask_name; const char *mask_name;
@ -859,7 +863,7 @@ _cogl_material_backend_arbfp_add_layer (CoglMaterial *material,
CoglMaterialLayer *layer, CoglMaterialLayer *layer,
unsigned long layers_difference) unsigned long layers_difference)
{ {
CoglMaterial *arbfp_authority = get_arbfp_authority (material); CoglMaterial *arbfp_authority = get_arbfp_authority_no_check (material);
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
CoglMaterialLayer *combine_authority = CoglMaterialLayer *combine_authority =
@ -942,7 +946,7 @@ _cogl_material_backend_arbfp_add_layer (CoglMaterial *material,
gboolean gboolean
_cogl_material_backend_arbfp_passthrough (CoglMaterial *material) _cogl_material_backend_arbfp_passthrough (CoglMaterial *material)
{ {
CoglMaterial *arbfp_authority = get_arbfp_authority (material); CoglMaterial *arbfp_authority = get_arbfp_authority_no_check (material);
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
@ -957,7 +961,7 @@ static gboolean
_cogl_material_backend_arbfp_end (CoglMaterial *material, _cogl_material_backend_arbfp_end (CoglMaterial *material,
unsigned long materials_difference) unsigned long materials_difference)
{ {
CoglMaterial *arbfp_authority = get_arbfp_authority (material); CoglMaterial *arbfp_authority = get_arbfp_authority_no_check (material);
CoglMaterialBackendARBfpPrivate *priv = CoglMaterialBackendARBfpPrivate *priv =
arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP]; arbfp_authority->backend_privs[COGL_MATERIAL_BACKEND_ARBFP];
GLuint gl_program; GLuint gl_program;