i965: always call dri_emit_reloc when creating clip unit state

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_object.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.c b/src/mesa/drivers/dri/nouveau/nouveau_object.c
index aff6954f066a5a22bddb959e8a094127fd7119f6..8f33093f1a5d8bd0e6e95c3518869da7d28c3ef3 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_object.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_object.c
@@ -39,10 +39,15 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
                nouveauCreateContextObject(nmesa, NvCtxSurf3D, NV04_CONTEXT_SURFACES_3D);
        }
        if (nmesa->screen->card->type>=NV_11) {
-               nouveauCreateContextObject(nmesa, NvImageBlit, NV10_IMAGE_BLIT);
+               nouveauCreateContextObject(nmesa, NvImageBlit, NV11_IMAGE_BLIT);
        } else {
                nouveauCreateContextObject(nmesa, NvImageBlit, NV_IMAGE_BLIT);
        }
+       if ((nmesa->screen->card->type>=NV_10) && (nmesa->screen->card->type<NV_20)) {
+               nouveauCreateContextObject(nmesa, NvGdiRectText, NV04_GDI_RECTANGLE_TEXT);
+               nouveauCreateContextObject(nmesa, NvRasterOp, NV03_PRIMITIVE_RASTER_OP);
+               nouveauCreateContextObject(nmesa, NvPattern, NV04_IMAGE_PATTERN);
+       }
        nouveauCreateContextObject(nmesa, NvMemFormat, NV_MEMORY_TO_MEMORY_FORMAT);
 
        nouveauObjectOnSubchannel(nmesa, NvSubCtxSurf2D, NvCtxSurf2D);
@@ -51,11 +56,39 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
        OUT_RING(NvDmaFB);
 
        nouveauObjectOnSubchannel(nmesa, NvSubImageBlit, NvImageBlit);
-       BEGIN_RING_SIZE(NvSubImageBlit, NV10_IMAGE_BLIT_SET_CONTEXT_SURFACES_2D, 1);
+       BEGIN_RING_SIZE(NvSubImageBlit, NV_IMAGE_BLIT_SET_SURFACES_2D, 1);
        OUT_RING(NvCtxSurf2D);
-       BEGIN_RING_SIZE(NvSubImageBlit, NV10_IMAGE_BLIT_SET_OPERATION, 1);
+       BEGIN_RING_SIZE(NvSubImageBlit, NV_IMAGE_BLIT_OPERATION, 1);
        OUT_RING(3); /* SRCCOPY */
 
+       if ((nmesa->screen->card->type>=NV_10) && (nmesa->screen->card->type<NV_20)) {
+               nouveauObjectOnSubchannel(nmesa, NvSubPattern, NvPattern);
+
+               BEGIN_RING_SIZE(NvSubPattern, NV04_IMAGE_PATTERN_COLOR_FORMAT, 4);
+               OUT_RING(1);    /* A16R5G6B5 */
+               OUT_RING(1);    /* little endian */
+               OUT_RING(0);    /* 8x8 */
+               OUT_RING(1);    /* monochrome */
+
+               nouveauObjectOnSubchannel(nmesa, NvSubRasterOp, NvRasterOp);
+
+               BEGIN_RING_SIZE(NvSubRasterOp, NV03_PRIMITIVE_RASTER_OP_DMA_NOTIFY, 1);
+               OUT_RING(NvSyncNotify);
+
+               nouveauObjectOnSubchannel(nmesa, NvSubGdiRectText, NvGdiRectText);
+
+               BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_SET_DMA_NOTIFY, 1);
+               OUT_RING(NvSyncNotify);
+               BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_PATTERN, 2);
+               OUT_RING(NvPattern);
+               OUT_RING(NvRasterOp);
+               BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_SURFACE, 1);
+               OUT_RING(NvCtxSurf2D);
+               BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_FORMAT, 2);
+               OUT_RING(1);    /* X1R5G5B5 */
+               OUT_RING(1);    /* little endian */
+       }
+
        nouveauObjectOnSubchannel(nmesa, NvSubMemFormat, NvMemFormat);
 
        nouveauObjectOnSubchannel(nmesa, NvSub3D, Nv3D);