diff options
| author | dawes <dawes> | 2001-03-19 21:34:45 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-03-19 21:34:45 +0000 |
| commit | 326ae10581288b55caed7c82f687000ae3693eec (patch) | |
| tree | eb9db0b1c463c890a0cc7f81980bab18614686b6 /xc/extras/Mesa | |
| parent | 890495cc49500cc7edb0323b37710d55e1fc20e5 (diff) | |
Initial merge of XFree86 4.0.99.1.
Diffstat (limited to 'xc/extras/Mesa')
| -rw-r--r-- | xc/extras/Mesa/include/GL/gl.h | 2 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/texstate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h index 029874b3d..2267e5526 100644 --- a/xc/extras/Mesa/include/GL/gl.h +++ b/xc/extras/Mesa/include/GL/gl.h @@ -22,7 +22,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/Mesa/include/GL/gl.h,v 1.7 2000/09/24 13:50:05 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/include/GL/gl.h,v 1.8 2001/01/08 01:07:12 martin Exp $ */ #ifndef __gl_h_ diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c index d74feb578..bb82b1861 100644 --- a/xc/extras/Mesa/src/texstate.c +++ b/xc/extras/Mesa/src/texstate.c @@ -129,7 +129,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) return; /* no change */ texUnit->CombineModeRGB = mode; ctx->NewState |= NEW_TEXTURE_ENV; - break; + break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(param)" ); return; |