fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 18:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nouveau: Remove ALLOW_MULTI_SUBCHANNEL hack

Browse source 
Irrelevant, since we depend on working context switching now.
This commit is contained in:
Ben Skeggs 2007-08-13 22:05:15 +10:00
parent fef3dcbee6
commit fcbd06d201
4 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/nouveau/nouveau_context.c
View file

@ -333,7 +333,6 @@ nouveauDoSwapBuffers(nouveauContextPtr nmesa, __DRIdrawablePrivate *dPriv)
fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
}
#ifdef ALLOW_MULTI_SUBCHANNEL
LOCK_HARDWARE(nmesa);
nbox = dPriv->numClipRects;
box = dPriv->pClipRects;
@ -362,7 +361,6 @@ nouveauDoSwapBuffers(nouveauContextPtr nmesa, __DRIdrawablePrivate *dPriv)
FIRE_RING();
UNLOCK_HARDWARE(nmesa);
#endif
}
void nouveauSwapBuffers(__DRIdrawablePrivate *dPriv)

2
src/mesa/drivers/dri/nouveau/nouveau_object.c
View file

@ -45,7 +45,6 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
}
nouveauCreateContextObject(nmesa, NvMemFormat, NV_MEMORY_TO_MEMORY_FORMAT);
#ifdef ALLOW_MULTI_SUBCHANNEL
nouveauObjectOnSubchannel(nmesa, NvSubCtxSurf2D, NvCtxSurf2D);
BEGIN_RING_SIZE(NvSubCtxSurf2D, NV10_CONTEXT_SURFACES_2D_SET_DMA_IN_MEMORY0, 2);
OUT_RING(NvDmaFB);
@ -58,7 +57,6 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
OUT_RING(3); /* SRCCOPY */
nouveauObjectOnSubchannel(nmesa, NvSubMemFormat, NvMemFormat);
#endif
nouveauObjectOnSubchannel(nmesa, NvSub3D, Nv3D);
}

2
src/mesa/drivers/dri/nouveau/nouveau_object.h
View file

@ -3,8 +3,6 @@
#include "nouveau_context.h"
#define ALLOW_MULTI_SUBCHANNEL
void nouveauObjectInit(nouveauContextPtr nmesa);
enum DMAObjects {

2
src/mesa/drivers/dri/nouveau/nouveau_sync.c
View file

@ -188,11 +188,9 @@ GLboolean nouveauSyncInitFuncs(GLcontext *ctx)
*/
BEGIN_RING_CACHE(NvSub3D, 0x180, 1);
OUT_RING_CACHE (NvSyncNotify);
#ifdef ALLOW_MULTI_SUBCHANNEL
BEGIN_RING_SIZE(NvSubMemFormat,
NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
OUT_RING (NvSyncNotify);
#endif
return GL_TRUE;
}