Module Name: xsrc
Committed By: macallan
Date: Sun Aug 22 23:11:59 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c
Log Message:
set EXA_MIXED_PIXMAPS so we don't get pixmaps we can't handle in NVSolid()
while there shut up some related debug output and remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.6
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.5 Fri Oct 5 01:53:54 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c Sun Aug 22 23:11:58 2021
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: nv_exa.c,v 1.5 2018/10/05 01:53:54 macallan Exp $ */
+/* $NetBSD: nv_exa.c,v 1.6 2021/08/22 23:11:58 macallan Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -138,19 +138,23 @@ NvPrepareSolid(
uint32_t pitch, off;
ENTER;
- if (pPixmap->drawable.bitsPerPixel != 32)
+
+ if (pPixmap->drawable.bitsPerPixel != 32) {
+#ifdef DEBUG
xf86Msg(X_ERROR, "%s %d bpp\n", __func__, pPixmap->drawable.bitsPerPixel);
+#endif
+ return FALSE;
+ }
planemask |= ~0 << pNv->CurrentLayout.depth;
off = exaGetPixmapOffset(pPixmap);
/*
* XXX
* on my 6800 Ultra the drawing engine stalls when drawing at least
- * rectangles into off-screen memory. Draw them by software until I figure out
- * what's going on
+ * rectangles into off-screen memory. Draw them by software until I
+ * figure out what's going on
*/
if (off != 0) return FALSE;
-
NVSetRopSolid(pScrn, rop, planemask);
pitch = exaGetPixmapPitch(pPixmap);
@@ -278,7 +282,6 @@ NvInitExa(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
NVPtr pNv = NVPTR(pScrn);
ExaDriverPtr pExa;
- int surfaceFormat, rectFormat;
pExa = exaDriverAlloc();
if (!pExa)
@@ -298,8 +301,8 @@ NvInitExa(ScreenPtr pScreen)
pExa->pixmapOffsetAlign = 256;
pExa->pixmapPitchAlign = 256;
- pExa->flags = EXA_OFFSCREEN_PIXMAPS/* |
- EXA_MIXED_PIXMAPS*/;
+ pExa->flags = EXA_OFFSCREEN_PIXMAPS |
+ EXA_MIXED_PIXMAPS;
pExa->maxX = 4096;
pExa->maxY = 4096;
