fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove intel->pipe field

Browse source
This commit is contained in:
Brian 2007-11-02 12:44:42 -06:00
parent a50d2feadd
commit ca96ee421a
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/drivers/dri/intel_winsys/intel_context.c
View file

@ -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

2
src/mesa/drivers/dri/intel_winsys/intel_context.h
View file

@ -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;

2
src/mesa/drivers/dri/intel_winsys/intel_screen.c
View file

@ -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;