summaryrefslogtreecommitdiff
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-02-26 17:16:12 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-02-26 17:16:12 +0000
commit67742383e87734130e35d08d7c63c75b9adcf655 (patch)
treeb912c651cd3ba5f8a59f047cc9ab01dd60c17b95 /src/mesa/main/state.c
parent4932ba28adc2694161ec3fa7964cd76e3742182a (diff)
Rename _mesa_update_buffers() to _mesa_update_draw_buffer_bounds() and do
additional checks. Replace _mesa_init_buffers() with _mesa_init_scissor() and _mesa_init_multisample().
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index c3193c8cda..55eba1e903 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -2,7 +2,7 @@
* Mesa 3-D graphics library
* Version: 6.3
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2005 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"),
@@ -935,20 +935,21 @@ update_program(GLcontext *ctx)
}
-/*
+/**
* If __GLcontextRec::NewState is non-zero then this function \b must be called
* before rendering any primitive. Basically, function pointers and
* miscellaneous flags are updated to reflect the current state of the state
* machine.
*
- * Calls dd_function_table::UpdateState to perform any internal state management
- * necessary.
+ * Calls dd_function_table::UpdateState to perform any internal state
+ * management necessary.
*
* \sa _mesa_update_modelview_project(), _mesa_update_texture(),
- * _mesa_update_buffers(), _mesa_update_polygon(), _mesa_update_lighting() and
- * _mesa_update_tnl_spaces().
+ * _mesa_update_buffer_bounds(), _mesa_update_polygon(),
+ * _mesa_update_lighting() and _mesa_update_tnl_spaces().
*/
-void _mesa_update_state( GLcontext *ctx )
+void
+_mesa_update_state( GLcontext *ctx )
{
GLuint new_state = ctx->NewState;
@@ -965,7 +966,7 @@ void _mesa_update_state( GLcontext *ctx )
_mesa_update_texture( ctx, new_state );
if (new_state & (_NEW_SCISSOR|_NEW_BUFFERS))
- _mesa_update_buffers( ctx );
+ _mesa_update_draw_buffer_bounds( ctx );
if (new_state & _NEW_POLYGON)
_mesa_update_polygon( ctx );