diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-02 17:01:01 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-02 17:01:01 +0000 |
| commit | 7feb5289056993f7e29a93296f06278cb162898b (patch) | |
| tree | 779e312b45ad0a71d83bcb8caf9e6d0a2eb15178 /src/mesa/main/light.c | |
| parent | f17980cdb7ff544a366a16775688e3bb237acc57 (diff) | |
added FLUSH_CURRENT() call in GetMaterial() calls
Diffstat (limited to 'src/mesa/main/light.c')
| -rw-r--r-- | src/mesa/main/light.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 94060592bb..d7a995917d 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -687,6 +687,8 @@ _mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params ) GLfloat (*mat)[4] = ctx->Light.Material.Attrib; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */ + FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */ + if (face==GL_FRONT) { f = 0; } @@ -733,6 +735,8 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params ) GLfloat (*mat)[4] = ctx->Light.Material.Attrib; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */ + FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */ + if (face==GL_FRONT) { f = 0; } |