DRI SDK header files from mesa 7.0.4 (debian's 7.0.3-7).

5 files changed, 14 insertions, 2 deletions

diff --git a/mesa/main/dd.h b/mesa/main/dd.h
index bb47cd4..d609db1 100644
--- a/mesa/main/dd.h
+++ b/mesa/main/dd.h
@@ -862,6 +862,8 @@ struct dd_function_table {
                            GLsizei *length, GLcharARB *sourceOut);
    void (*GetUniformfv)(GLcontext *ctx, GLuint program, GLint location,
                         GLfloat *params);
+   void (*GetUniformiv)(GLcontext *ctx, GLuint program, GLint location,
+                        GLint *params);
    GLint (*GetUniformLocation)(GLcontext *ctx, GLuint program,
                                const GLcharARB *name);
    GLboolean (*IsProgram)(GLcontext *ctx, GLuint name);
diff --git a/mesa/main/mm.h b/mesa/main/mm.h
index 26d59ff..5ad3ffd 100644
--- a/mesa/main/mm.h
+++ b/mesa/main/mm.h
@@ -39,7 +39,8 @@ struct mem_block {
    struct mem_block *next, *prev;
    struct mem_block *next_free, *prev_free;
    struct mem_block *heap;
-   int ofs,size;
+   unsigned int ofs;
+   int size;
    unsigned int free:1;
    unsigned int reserved:1;
 };
@@ -50,7 +51,7 @@ struct mem_block {
  * input: total size in bytes
  * return: a heap pointer if OK, NULL if error
  */
-extern struct mem_block *mmInit(int ofs, int size);
+extern struct mem_block *mmInit(unsigned int ofs, int size);
 
 /**
  * Allocate 'size' bytes with 2^align2 bytes alignment,
diff --git a/mesa/main/texformat.h b/mesa/main/texformat.h
index 55851db..82023b9 100644
--- a/mesa/main/texformat.h
+++ b/mesa/main/texformat.h
@@ -97,6 +97,7 @@ enum _format {
    MESA_FORMAT_SRGBA8,
    MESA_FORMAT_SL8,
    MESA_FORMAT_SLA8,
+   MESA_FORMAT_SRGB_DXT1,
    /*@}*/
 #endif
 
@@ -168,6 +169,7 @@ extern const struct gl_texture_format _mesa_texformat_srgb8;
 extern const struct gl_texture_format _mesa_texformat_srgba8;
 extern const struct gl_texture_format _mesa_texformat_sl8;
 extern const struct gl_texture_format _mesa_texformat_sla8;
+extern const struct gl_texture_format _mesa_texformat_srgb_dxt1;
 /*@}*/
 #endif
 
diff --git a/mesa/swrast/s_context.h b/mesa/swrast/s_context.h
index 58841ad..5de0800 100644
--- a/mesa/swrast/s_context.h
+++ b/mesa/swrast/s_context.h
@@ -205,6 +205,7 @@ typedef struct
     * on some systems.
     */
    SWspanarrays *SpanArrays;
+   SWspanarrays *ZoomedArrays;  /**< For pixel zooming */
 
    /**
     * Used to buffer N GL_POINTS, instead of rendering one by one.
diff --git a/mesa/swrast/s_span.h b/mesa/swrast/s_span.h
index f650a27..14d9743 100644
--- a/mesa/swrast/s_span.h
+++ b/mesa/swrast/s_span.h
@@ -210,6 +210,12 @@ do {								\
 
 
 
+#define SPAN_NEEDS_FOG(ctx)                                             \
+   (SWRAST_CONTEXT(ctx)->_FogEnabled ||                                 \
+    (ctx->FragmentProgram._Current &&                                   \
+     ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_FOGC))
+
+
 extern void
 _swrast_span_default_z( GLcontext *ctx, SWspan *span );