aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/light.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-29 00:17:36 +0100
committerMarc Haesen <marc@hc-consult.be>2011-12-29 00:17:36 +0100
commitd515b895dc5151d102f33b577cafbf63473bbafa (patch)
tree98986aec1f43152c3c5f4f8f8a19d29f88b42d83 /mesalib/src/mesa/main/light.c
parentecb8be4d2a289c5308f3f23929116d2fe6aafa4b (diff)
parent9715b7fab0757c86e1bb151f3dce0b324bcff692 (diff)
downloadvcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.gz
vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.bz2
vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/light.c')
-rw-r--r--mesalib/src/mesa/main/light.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c
index 60daa89a3..bf4bee3d6 100644
--- a/mesalib/src/mesa/main/light.c
+++ b/mesalib/src/mesa/main/light.c
@@ -624,22 +624,6 @@ _mesa_material_bitmask( struct gl_context *ctx, GLenum face, GLenum pname,
-/* Perform a straight copy between materials.
- */
-void
-_mesa_copy_materials( struct gl_material *dst,
- const struct gl_material *src,
- GLuint bitmask )
-{
- int i;
-
- for (i = 0 ; i < MAT_ATTRIB_MAX ; i++)
- if (bitmask & (1<<i))
- COPY_4FV( dst->Attrib[i], src->Attrib[i] );
-}
-
-
-
/* Update derived values following a change in ctx->Light.Material
*/
void