intel: fix the gen 11 compute shader scratch IDs

[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 6ad1d4d48ad631a6d08d7b49011626212a6732c3..21f6034db6cf52fe55c7de2a1731daa1387a5050 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>
  */
@@ -45,11 +45,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "tnl/t_vertex.h"
 #include "dri_util.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
 #include "radeon_drm.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "main/colormac.h"
 #include "radeon_screen.h"
 
 #include "radeon_common.h"
@@ -416,7 +415,6 @@ struct r100_context {
        GLuint NeedTexMatrix;
        GLuint TexMatColSwap;
        GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
-       GLuint last_ReallyEnabled;
 
        /* radeon_tcl.c
         */
@@ -427,7 +425,6 @@ struct r100_context {
        struct r100_swtcl_info swtcl;
 
        GLboolean using_hyperz;
-       GLboolean texmicrotile;
 
        /* Performance counters
         */
@@ -455,9 +452,8 @@ R100_CONTEXT(struct gl_context *ctx)
 extern GLboolean r100CreateContext( gl_api api,
                                    const struct gl_config *glVisual,
                                    __DRIcontext *driContextPriv,
-                                   unsigned major_version,
-                                   unsigned minor_version,
-                                   uint32_t flags,
+                                   const struct __DriverContextConfig *
+                                      ctx_config,
                                    unsigned *error,
                                    void *sharedContextPrivate);