brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence some compiler warnings

Browse Source
This commit is contained in:
Emmanuele Bassi 2010-06-22 13:48:53 +01:00
parent 8458fb7e20
commit 0244eccfe3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cogl/cogl-material.c
View File

@ -6624,7 +6624,7 @@ flush_layers_common_gl_state_cb (CoglMaterialLayer *layer, void *user_data)
CoglMaterialLayer *authority = CoglMaterialLayer *authority =
_cogl_material_layer_get_authority (layer, _cogl_material_layer_get_authority (layer,
COGL_MATERIAL_LAYER_STATE_TEXTURE); COGL_MATERIAL_LAYER_STATE_TEXTURE);
CoglHandle texture; CoglHandle texture = NULL;
GLuint gl_texture; GLuint gl_texture;
GLenum gl_target; GLenum gl_target;
@ -6666,6 +6666,7 @@ flush_layers_common_gl_state_cb (CoglMaterialLayer *layer, void *user_data)
GE (glBindTexture (gl_target, gl_texture)); GE (glBindTexture (gl_target, gl_texture));
unit->gl_texture = gl_texture; unit->gl_texture = gl_texture;
} }
unit->is_foreign = _cogl_texture_is_foreign (texture); unit->is_foreign = _cogl_texture_is_foreign (texture);
/* Disable the previous target if it was different and it's /* Disable the previous target if it was different and it's
@ -6989,7 +6990,7 @@ _cogl_material_flush_gl_state (CoglHandle handle,
CoglMaterial *material = COGL_MATERIAL (handle); CoglMaterial *material = COGL_MATERIAL (handle);
unsigned long materials_difference; unsigned long materials_difference;
int n_layers; int n_layers;
unsigned long *layer_differences; unsigned long *layer_differences = NULL;
int i; int i;
CoglTextureUnit *unit1; CoglTextureUnit *unit1;