Modify xcb_nvidia/nulldrv to also support nulldrv.

This allows LunarG and others without the NVIDIA XGL driver to use the nulldrv
on Windows.

diff --git a/demos/xcb_nvidia.cpp b/demos/xcb_nvidia.cpp
index 1e8f5bc..5ecd088 100644 (file)
--- a/demos/xcb_nvidia.cpp
+++ b/demos/xcb_nvidia.cpp
@@ -41,6 +41,11 @@ xcb_connection_t * xcb_connect(const char *displayname, int *screenp)
     xglNvidia += "\\xgl_nvidia.dll";
     HMODULE module = LoadLibrary(xglNvidia.c_str());
     if (!module) {
+        std::string xglNulldrv = getenv("LIBXGL_DRIVERS_PATH");
+        xglNulldrv += "\\xgl_nulldrv.dll";
+        module = LoadLibrary(xglNulldrv.c_str());
+    }
+    if (!module) {
         return 0;
     }
 

diff --git a/icd/nulldrv/XGL_nulldrv.def b/icd/nulldrv/XGL_nulldrv.def
index bd4b499..1f5d715 100644 (file)
--- a/icd/nulldrv/XGL_nulldrv.def
+++ b/icd/nulldrv/XGL_nulldrv.def
@@ -30,3 +30,7 @@ EXPORTS
    xglCreateInstance
    xglEnumerateGpus
    xglDestroyInstance
+   xcbCreateWindow
+   xcbDestroyWindow
+   xcbGetMessage
+   xcbQueuePresent

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 71dcf1c..8df3d8d 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -2029,3 +2029,29 @@ ICD_EXPORT void XGLAPI xglCmdEndRenderPass(
 {
     NULLDRV_LOG_FUNC;
 }
+
+ICD_EXPORT void* xcbCreateWindow(
+    uint16_t         width,
+    uint16_t         height)
+{
+    static uint32_t  window;  // Kludge to the max
+    NULLDRV_LOG_FUNC;
+    return &window;
+}
+
+// May not be needed, if we stub out stuf in tri.c
+ICD_EXPORT void xcbDestroyWindow()
+{
+    NULLDRV_LOG_FUNC;
+}
+
+ICD_EXPORT int xcbGetMessage(void *msg)
+{
+    NULLDRV_LOG_FUNC;
+    return 0;
+}
+
+ICD_EXPORT XGL_RESULT xcbQueuePresent(void *queue, void *image, void* fence)
+{
+    return XGL_SUCCESS;
+}