diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 16:59:53 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 16:59:53 +0200 |
| commit | 796c8e421fd9df658fd5b324fcaa5182566e6905 (patch) | |
| tree | 62258e6434873ca1efa8b131e393fed2b2bb84c2 /nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | |
| parent | c577775f9ff42b65d4f2cdb1d31cfa7073679065 (diff) | |
| parent | 5aee32e9d8db69fa0ce372e7b2b08696224e48ec (diff) | |
| download | nx-libs-796c8e421fd9df658fd5b324fcaa5182566e6905.tar.gz nx-libs-796c8e421fd9df658fd5b324fcaa5182566e6905.tar.bz2 nx-libs-796c8e421fd9df658fd5b324fcaa5182566e6905.zip | |
Merge branch 'uli42-pr/drop_faulty_render_check' into 3.6.x
Attributes GH PR #842: https://github.com/ArcticaProject/nx-libs/pull/842
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Pixmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 58fea6c05..7a0fcd535 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -322,41 +322,6 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height, pVirtualPriv -> pVirtualPixmap = NULL; pVirtualPriv -> pPicture = NULL; - /* - * Check that the virtual pixmap is created with - * the appropriate bits-per-plane, otherwise free - * everything and return. - */ - - if (pVirtual -> drawable.bitsPerPixel == 0) - { - #ifdef WARNING - - fprintf(stderr, "nxagentCreatePixmap: WARNING! Virtual pixmap at [%p] has invalid " - "bits per pixel.\n", (void *) pVirtual); - - fprintf(stderr, "nxagentCreatePixmap: WARNING! Real pixmap created with width [%d] " - "height [%d] depth [%d] bits per pixel [%d] and allocation hint [%d].\n", - pPixmap -> drawable.width, - pPixmap -> drawable.height = height, pPixmap -> drawable.depth, - pPixmap -> drawable.bitsPerPixel, - usage_hint); - #endif - - if (!nxagentRenderTrap) - { - #ifdef WARNING - fprintf(stderr, "Warning: Disabling render extension due to missing pixmap format.\n"); - #endif - - nxagentRenderTrap = 1; - } - - nxagentDestroyPixmap(pPixmap); - - return NullPixmap; - } - #ifdef TEST fprintf(stderr, "nxagentCreatePixmap: Created pixmap at [%p] virtual at [%p] with width [%d] " "height [%d] depth [%d] and allocation hint [%d].\n", |