mesa/swrast: replace instances of _mesa_little_endian with preprocessor

[mesa.git] / src / mesa / swrast / s_context.h

diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 2525e8e2d38c7b072d17bad5b7810be573eba325..dd700183c88086a72c5602dd0d942ef0816c5d9c 100644 (file)
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -27,7 +26,7 @@
 /**
  * \file swrast/s_context.h
  * \brief Software rasterization context and private types.
- * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Keith Whitwell <keithw@vmware.com>
  */
 
 /**
@@ -44,7 +43,6 @@
 #ifndef S_CONTEXT_H
 #define S_CONTEXT_H
 
-#include "main/compiler.h"
 #include "main/mtypes.h"
 #include "main/texcompress.h"
 #include "program/prog_execute.h"
@@ -59,10 +57,10 @@ typedef void (*texture_sample_func)(struct gl_context *ctx,
                                     GLuint n, const GLfloat texcoords[][4],
                                     const GLfloat lambda[], GLfloat rgba[][4]);
 
-typedef void (_ASMAPIP blend_func)( struct gl_context *ctx, GLuint n,
-                                    const GLubyte mask[],
-                                    GLvoid *src, const GLvoid *dst,
-                                    GLenum chanType);
+typedef void (*swrast_blend_func)(struct gl_context *ctx, GLuint n,
+                                  const GLubyte mask[],
+                                  GLvoid *src, const GLvoid *dst,
+                                  GLenum chanType);
 
 typedef void (*swrast_point_func)( struct gl_context *ctx, const SWvertex *);
 
@@ -156,7 +154,6 @@ struct swrast_texture_image
     * initialized to point within Buffer.
     */
    void **ImageSlices;
-   GLubyte *Map;               /**< Pointer to mapped image memory */
 
    /** Malloc'd texture memory */
    GLubyte *Buffer;
@@ -313,8 +310,8 @@ typedef struct
 
    /** Internal hooks, kept up to date by the same mechanism as above.
     */
-   blend_func BlendFunc;
-   texture_sample_func TextureSample[MAX_TEXTURE_IMAGE_UNITS];
+   swrast_blend_func BlendFunc;
+   texture_sample_func TextureSample[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
 
    /** Buffer for saving the sampled texture colors.
     * Needed for GL_ARB_texture_env_crossbar implementation.