Commit ca96ee42 authored by Brian's avatar Brian

remove intel->pipe field

parent a50d2fea
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment