i965: Implement "Static Vertex Count" geometry shader optimization.

[mesa.git] / src / mesa / drivers / dri / r200 / r200_ioctl.h

diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index f9b07a4b5a3f0a1d130187176bca2b6f3132acab..25a9dd376829ecdc8f620fd108776d167a2c4a10 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -29,14 +29,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /*
  * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
+ *   Keith Whitwell <keithw@vmware.com>
  */
 
 #ifndef __R200_IOCTL_H__
 #define __R200_IOCTL_H__
 
-#include "main/simple_list.h"
-#include "radeon_dri.h"
+#include "util/simple_list.h"
 
 #include "radeon_bo_gem.h"
 #include "radeon_cs_gem.h"
@@ -79,7 +78,7 @@ do {                                          \
       rmesa->radeon.dma.flush( &rmesa->radeon.glCtx ); \
 } while (0)
 
-/* Can accomodate several state changes and primitive changes without
+/* Can accommodate several state changes and primitive changes without
  * actually firing the buffer.
  */
 #define R200_STATECHANGE( rmesa, ATOM )                        \
@@ -103,7 +102,7 @@ do {                                                                \
    memcpy( rmesa->hw.ATOM.lastcmd, rmesa->hw.ATOM.cmd, \
           rmesa->hw.ATOM.cmd_size * 4)
 
-static INLINE int R200_DB_STATECHANGE( 
+static inline int R200_DB_STATECHANGE( 
    r200ContextPtr rmesa,
    struct radeon_state_atom *atom )
 {