summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c11
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_screen.c2
3 files changed, 7 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 0d33ee2f0f..5433ae4842 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -175,6 +175,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
drmI830Sarea *saPriv = intelScreen->sarea;
int fthrottle_mode;
GLboolean havePools;
+ struct pipe_context *pipe;
#if 0
intelInitDriverFunctions(&functions);
@@ -245,7 +246,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
* Pipe-related setup
*/
if (!getenv("INTEL_HW")) {
- intel->pipe = intel_create_softpipe( intel );
+ pipe = intel_create_softpipe( intel );
}
else {
switch (intel->intelScreen->deviceID) {
@@ -257,21 +258,21 @@ intelCreateContext(const __GLcontextModes * mesaVis,
case PCI_CHIP_Q35_G:
case PCI_CHIP_I915_G:
case PCI_CHIP_I915_GM:
- intel->pipe = intel_create_i915simple( intel );
+ pipe = intel_create_i915simple( intel );
break;
default:
_mesa_printf("Unknown PCIID %x in %s, using software driver\n",
intel->intelScreen->deviceID, __FUNCTION__);
- intel->pipe = intel_create_softpipe( intel );
+ pipe = intel_create_softpipe( intel );
break;
}
}
#if 0
- st_create_context( &intel->ctx, intel->pipe );
+ st_create_context( &intel->ctx, pipe );
#else
- intel->st = st_create_context2(intel->pipe, mesaVis, NULL);
+ intel->st = st_create_context2(pipe, mesaVis, NULL);
intel->st->ctx->DriverCtx = intel;
#endif
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 788d444d00..78d549145b 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -50,8 +50,6 @@ struct intel_context
{
struct st_context *st;
- struct pipe_context *pipe; /**< a softpipe or i915simple context */
-
GLint refcount;
struct _DriFenceObject *last_swap_fence;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index 5dd4f94343..16e3a226e2 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -383,7 +383,7 @@ intelSetTexOffset(__DRIcontext *pDRICtx, GLint texname,
return;
if (stObj->mt)
- st_miptree_release(intel->pipe, &stObj->mt);
+ st_miptree_release(intel->st->pipe, &stObj->mt);
stObj->imageOverride = GL_TRUE;
stObj->depthOverride = depth;