From c2e5d2468ad6a38cdb8a067da0678302f6cc6066 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Fri, 13 Sep 2019 15:59:15 -0400
Subject: Refactor render-test to make cross platform (#1053)

* First pass of render-test refactor.

* Make window construction a function that can choose an implementation.

* Remove OpenGL as currently has windows dependency.

* Disable Vulkan as Renderer impl has dependency on windows.

* Pass Window in as parameter of 'update'.

* Add win-window.cpp as was missing.

* Fix warning on windows about signs during comparison.
---
 tools/gfx/vk-module.cpp | 76 -------------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 tools/gfx/vk-module.cpp

(limited to 'tools/gfx/vk-module.cpp')

diff --git a/tools/gfx/vk-module.cpp b/tools/gfx/vk-module.cpp
deleted file mode 100644
index 4e92a3d2c..000000000
--- a/tools/gfx/vk-module.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// module.cpp
-#include "vk-module.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#if SLANG_WINDOWS_FAMILY
-#   include <windows.h>
-#else
-#   include <dlfcn.h>
-#endif
-
-namespace gfx {
-using namespace Slang;
-
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! VulkanModule !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Slang::Result VulkanModule::init()
-{
-    if (isInitialized())
-    {
-        destroy();
-        return SLANG_OK;
-    }
-
-    const char* dynamicLibraryName = "Unknown";
-
-#if SLANG_WINDOWS_FAMILY
-    dynamicLibraryName = "vulkan-1.dll";
-    HMODULE module = ::LoadLibraryA(dynamicLibraryName);
-    m_module = (void*)module;
-#else
-    dynamicLibraryName = "libvulkan.so.1";
-    m_module = dlopen(dynamicLibraryName, RTLD_NOW);
-#endif
-
-    if (!m_module)
-    {
-        fprintf(stderr, "error: failed load '%s'\n", dynamicLibraryName);
-        return SLANG_FAIL;
-    }
-
-    return SLANG_OK;
-}
-
-PFN_vkVoidFunction VulkanModule::getFunction(const char* name) const
-{
-    assert(m_module);
-    if (!m_module)
-    {
-        return nullptr;
-    }
-#if SLANG_WINDOWS_FAMILY
-    return (PFN_vkVoidFunction)::GetProcAddress((HMODULE)m_module, name);
-#else
-    return (PFN_vkVoidFunction)dlsym(m_module, name);
-#endif
-}
-
-void VulkanModule::destroy()
-{
-    if (!isInitialized())
-    {
-        return;
-    }
-
-#if SLANG_WINDOWS_FAMILY
-    ::FreeLibrary((HMODULE)m_module);
-#else
-    dlclose(m_module);
-#endif
-    m_module = nullptr;
-}
-
-} // renderer_test
-- 
cgit v1.2.3