f5f4d32ac7
If windowsdriproto headers are available, build a Windows-DRI extension, which supports requests to enable local clients to directly render GL to a Windows drawable: - a query to check if WGL is being used on a screen - a query to map a fbconfigID to a native pixelformatindex - a query to map a drawable to a native handle Windows-DRI can only be useful if we are using WGL, so make an note if WGL is active on a screen. Make validGlxDrawable() public Adjust glxWinSetPixelFormat() so it doesn't require a context, just a screen and config. That enables factoring out the deferred drawable creation code as glxWinDeferredCreateDrawable() Enhance glxWinDeferredCreateDrawable(), so that pixmaps are placed into a file mapping, so they exist in memory which can be shared with the direct rendering process. Currently, this file mapping is accessed by a name generated from the XID. This will not be unique across multiple server instances. It would perhaps be better, although more complicated, to use an anonymous file mapping, and then duplicate the handle for the direct rendering process. Use glxWinDeferredCreateDrawable() to ensure the native handle exists for the Windows-DRI query to map a drawable to native handle. v2: Various printf format warning fixes v3: Fix format warnings on x86 Move some uninteresting windows-dri output to debug log level v4: check for windowsdriproto when --enable-windowsdri use windowsdriproto_CFLAGS Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
96 lines
3.0 KiB
C
96 lines
3.0 KiB
C
/*
|
|
* Copyright © 2014 Jon TURNEY
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef indirect_h
|
|
#define indirect_h
|
|
|
|
#include <X11/Xwindows.h>
|
|
#include <GL/wglext.h>
|
|
#include <glx/extension_string.h>
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/*
|
|
* structure definitions
|
|
*/
|
|
|
|
typedef struct __GLXWinContext __GLXWinContext;
|
|
typedef struct __GLXWinDrawable __GLXWinDrawable;
|
|
typedef struct __GLXWinScreen glxWinScreen;
|
|
typedef struct __GLXWinConfig GLXWinConfig;
|
|
|
|
struct __GLXWinContext {
|
|
__GLXcontext base;
|
|
HGLRC ctx; /* Windows GL Context */
|
|
__GLXWinContext *shareContext; /* Context with which we will share display lists and textures */
|
|
HWND hwnd; /* For detecting when HWND has changed */
|
|
};
|
|
|
|
struct __GLXWinDrawable {
|
|
__GLXdrawable base;
|
|
__GLXWinContext *drawContext;
|
|
__GLXWinContext *readContext;
|
|
|
|
/* If this drawable is GLX_DRAWABLE_PBUFFER */
|
|
HPBUFFERARB hPbuffer;
|
|
|
|
/* If this drawable is GLX_DRAWABLE_PIXMAP */
|
|
HDC dibDC;
|
|
HANDLE hSection; /* file mapping handle */
|
|
HBITMAP hDIB;
|
|
HBITMAP hOldDIB; /* original DIB for DC */
|
|
void *pOldBits; /* original pBits for this drawable's pixmap */
|
|
};
|
|
|
|
struct __GLXWinScreen {
|
|
__GLXscreen base;
|
|
|
|
/* Supported GLX extensions */
|
|
unsigned char glx_enable_bits[__GLX_EXT_BYTES];
|
|
|
|
Bool has_WGL_ARB_multisample;
|
|
Bool has_WGL_ARB_pixel_format;
|
|
Bool has_WGL_ARB_pbuffer;
|
|
Bool has_WGL_ARB_render_texture;
|
|
Bool has_WGL_ARB_make_current_read;
|
|
|
|
/* wrapped screen functions */
|
|
RealizeWindowProcPtr RealizeWindow;
|
|
UnrealizeWindowProcPtr UnrealizeWindow;
|
|
CopyWindowProcPtr CopyWindow;
|
|
};
|
|
|
|
struct __GLXWinConfig {
|
|
__GLXconfig base;
|
|
int pixelFormatIndex;
|
|
};
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/*
|
|
* function prototypes
|
|
*/
|
|
|
|
void
|
|
glxWinDeferredCreateDrawable(__GLXWinDrawable *draw, __GLXconfig *config);
|
|
|
|
#endif /* indirect_h */
|