update to include dlib import flags
This commit is contained in:
parent
fe318c5f04
commit
b7674e43bd
2
test.sh
2
test.sh
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
glslc -fshader-stage=comp --target-env=vulkan1.2 convert.comp.glsl -oconvert.comp.spv
|
glslc -fshader-stage=comp --target-env=vulkan1.2 convert.comp.glsl -oconvert.comp.spv
|
||||||
|
|
||||||
ldc2 vulkan.d vulkan_funcs.d vulkan_logging.d vulkan_util.d -d-version=VULKAN_RENDERER_TEST -L-lvulkan --unittest -J./ -verrors=30
|
ldc2 vulkan.d vulkan_funcs.d vulkan_logging.d vulkan_util.d -d-version=NO_DLIB -d-version=VULKAN_RENDERER_TEST -L-lvulkan --unittest -J./ -verrors=30
|
||||||
|
|
||||||
rm convert.comp.spv
|
rm convert.comp.spv
|
||||||
rm vulkan.o
|
rm vulkan.o
|
||||||
|
|||||||
16
vulkan.d
16
vulkan.d
@ -1,3 +1,19 @@
|
|||||||
|
version(NO_DLIB) enum bool BUILD_NO_DLIB = true; else enum bool BUILD_NO_DLIB = false;
|
||||||
|
version(DLIB) enum bool BUILD_DLIB = true; else enum bool BUILD_DLIB = false;
|
||||||
|
|
||||||
|
static assert(!(BUILD_DLIB && BUILD_NO_DLIB) && (BUILD_NO_DLIB || BUILD_DLIB), "Must either build with or without DLib");
|
||||||
|
|
||||||
|
static if(BUILD_NO_DLIB)
|
||||||
|
{
|
||||||
|
import vulkan_includes;
|
||||||
|
}
|
||||||
|
|
||||||
|
static if(BUILD_DLIB)
|
||||||
|
{
|
||||||
|
import dlibincludes;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
import vulkan_funcs;
|
import vulkan_funcs;
|
||||||
import vulkan_logging;
|
import vulkan_logging;
|
||||||
import vulkan_util;
|
import vulkan_util;
|
||||||
|
|||||||
@ -1,6 +1,15 @@
|
|||||||
public import vulkan_includes;
|
|
||||||
import vulkan_util;
|
import vulkan_util;
|
||||||
import vulkan : Vulkan, VULKAN_LIBS, g_vk;
|
import vulkan;
|
||||||
|
|
||||||
|
static if(BUILD_NO_DLIB)
|
||||||
|
{
|
||||||
|
import vulkan_includes;
|
||||||
|
}
|
||||||
|
|
||||||
|
static if(BUILD_DLIB)
|
||||||
|
{
|
||||||
|
import dlibincludes;
|
||||||
|
}
|
||||||
|
|
||||||
// Global Functions
|
// Global Functions
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,21 @@
|
|||||||
import vulkan_funcs;
|
import vulkan_funcs;
|
||||||
import std.stdio;
|
import std.stdio;
|
||||||
import vulkan : Vulkan;
|
import vulkan : Vulkan;
|
||||||
|
import vulkan;
|
||||||
import std.conv;
|
import std.conv;
|
||||||
import std.string;
|
import std.string;
|
||||||
import core.stdc.string : strlen, strcmp;
|
import core.stdc.string : strlen, strcmp;
|
||||||
|
|
||||||
|
static if(BUILD_NO_DLIB)
|
||||||
|
{
|
||||||
|
import vulkan_includes;
|
||||||
|
}
|
||||||
|
|
||||||
|
static if(BUILD_DLIB)
|
||||||
|
{
|
||||||
|
import dlibincludes;
|
||||||
|
}
|
||||||
|
|
||||||
extern(System) VkBool32
|
extern(System) VkBool32
|
||||||
DebugCallback(
|
DebugCallback(
|
||||||
VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
|
VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
|
||||||
|
|||||||
@ -1,7 +1,18 @@
|
|||||||
|
import vulkan;
|
||||||
import std.stdio;
|
import std.stdio;
|
||||||
import core.stdc.string : memset;
|
import core.stdc.string : memset;
|
||||||
import core.memory;
|
import core.memory;
|
||||||
|
|
||||||
|
static if(BUILD_NO_DLIB)
|
||||||
|
{
|
||||||
|
import vulkan_includes;
|
||||||
|
}
|
||||||
|
|
||||||
|
static if(BUILD_DLIB)
|
||||||
|
{
|
||||||
|
import dlibincludes;
|
||||||
|
}
|
||||||
|
|
||||||
alias i8 = byte;
|
alias i8 = byte;
|
||||||
alias i16 = short;
|
alias i16 = short;
|
||||||
alias i32 = int;
|
alias i32 = int;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user