i965: Rename do_<stage>_prog to brw_compile_<stage>_prog (and export)

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_context.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index cb036cd6570052868650bbd92bbec63c8f57058a..403253278133b5b0bbcbcc5cb2cb69655855c9b0 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /*
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
- *   Keith Whitwell <keith@tungstengraphics.com>
+ *   Keith Whitwell <keithw@vmware.com>
  *   Kevin E. Martin <martin@valinux.com>
  *   Nicolai Haehnle <prefect_@gmx.net>
  */
@@ -416,7 +416,6 @@ struct r100_context {
        GLuint NeedTexMatrix;
        GLuint TexMatColSwap;
        GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
-       GLuint last_ReallyEnabled;
 
        /* radeon_tcl.c
         */
@@ -442,7 +441,12 @@ struct r100_context {
 };
 
 
-#define R100_CONTEXT(ctx)              ((r100ContextPtr)(ctx->DriverCtx))
+static inline r100ContextPtr
+R100_CONTEXT(struct gl_context *ctx)
+{
+   return (r100ContextPtr) ctx;
+}
+
 
 
 #define RADEON_OLD_PACKETS 1
@@ -453,6 +457,7 @@ extern GLboolean r100CreateContext( gl_api api,
                                    unsigned major_version,
                                    unsigned minor_version,
                                    uint32_t flags,
+                                    bool notify_reset,
                                    unsigned *error,
                                    void *sharedContextPrivate);