Skip to content

MarkCallow/SDL

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Simple DirectMedia Layer

This is a fork of the SDL Mercurial repository at http://hg.libsdl.org/SDL.

Branch upstream_master reflects the most recent pull from that repo's master branch. The tip at the time was http://hg.libsdl.org/SDL/rev/924f8bdc008d.

See below for instructions on pulling from the SDL Mercurial repository. Also see below for special build instructions for this fork.

See the main SDL README for more information about SDL.

What is Different Here

This fork contains 2 changes from SDL 2.0.5+:

  1. Support for creating Vulkan surfaces on SDL_Windows. A patch has been filed in SDL Bugzilla issue 3591

  2. A script to create pre-built SDL libraries for Android, as described in SDL Bugzilla issue 2839

These fixes are needed by the KTX project; this fork provides the source it uses.

Fixes for SDL Bugzilla issues 2570 and 3145, which first appeared in this fork, have now been merged upstream and, as a result, are still included here.

Creating Vulkan Surfaces

Sample code

    SDL_window* window;
    const char** extensionNames;
    VkInstanceCreateInfo instanceInfo = {};
    VkInstance instance;
    VkSurfaceKHR surface;
    VkResult err;
    
    // Create the window as you would any non-GL SDL_window.
    // No special flags are needed.
    window = SDL_CreateWindow(...);
    
    // Note: use SDL_Vulkan_GetDrawableSize(...) for setting viewports,
    // scissor & etc.
   
    /* Build list of needed surface instance extensions */
    uint32_t c = SDL_Vulkan_GetInstanceExtensions(0, NULL);
    if (c == 0) {
        // Vulkan not supported in current platform
        exit();
    }
    extensionNames = (const char**)malloc(sizeof(char*) * (c + 1));
    extensionNames[0] = VK_KHR_SURFACE_EXTENSION_NAME;
    (void)SDL_Vulkan_GetInstanceExtensions(c, &extensionNames[1]);

    instanceInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
    instanceInfo.enabledExtensionCount = c;
    instanceInfo.ppEnabledExtensionNames = extensionNames;
    // Set up rest of instanceInfo
    
    err = VkCreateInstance(&instanceInfo, NULL, &instance);
    if (err != VK_SUCCESS)
        exit();

    // findPhysicalDevice();
    //
    
    if (SDL_Vulkan_CreateSurface(window, instance, &surface) < 0) {
        // Handle error. SDL_GetError() will return an explanation.
    }
    
    // findGraphicsQueueWithPresentCapability();
    // createDevice();
    // createSwapchain(physicalDevice, device, surface, width, height)
    
    // Continue application initialization.
    // ...
    // ...

For a working example see this fork of the KTX project. The code is in the vkloadtests branch. If that branch no longer exists, look in incoming or master. See VulkanAppSDL.cpp and VulkanSwapchain.cpp in tests/loadtests/appfwSDL/VulkanAppSDL/. The links point to the vkloadtests branch.

Building

To build for iOS or macOS you must install MoltenVK. If using the provided Xcode projects, you must set a VULKAN_SDK custom path in Xcode preferences whose value is the location where you have installed MoltenVK. Then follow the usual SDL build processes.

Pulling from Mercurial

If you want to pull libSDL 2.0.4 from the upstream Mercurial repo, you need to

Installing Mercurial

When installing Mercurial for Windows, choose the appropriate *py2.7 installer so that git-remote-hg can import mercurial from your Python installation.

Installing git-remote-hg

git-remote-hg can be installed from this GitHub project.

⭕ Note: this is a fork of the original project with fixes for compability with Mercurial 3.2+.

The example installation commands below copy git-remote-hg to /usr/local/bin.

sudo curl -o /usr/local/bin/git-remote-hg https://raw.githubusercontent.com/fingolfin/git-remote-hg/master/git-remote-hg
sudo chmod +x /usr/local/bin/git-remote-hg

If using Git Bash or Git Shell on Windows, create a ~/bin directory, making sure it is in your $PATH, and put it there instead of /usr/local/bin.

‼️ If using Git Bash, do not be tempted to use /bin. The file will end up in %USERPROFILE%\AppData\Local\VirtualStore\Program Files (x86)\Git\bin and will not be visible to the Windows version of python which will be told by env to run %SystemDrive%\Program Files (x86)\Git\bin\git-remote-hg. The latter is the canonical location of /bin. I do not know if Git Shell has a similar issue. ‼️

You need to ensure you have a python2 command in some directory in your $PATH.

On OS X, whether python2 exists depends on which distribution of Python 2 you are using. If it does not exist, make a link in /usr/local/bin to the python command.

On Windows, the standard Python installer does not create a python2 command. One solution is to make a copy of %SystemDrive%\Python27\python.exe (the default install location), e.g.

cp $SYSTEMDRIVE/Python27/python.exe ~/bin

As a last resort you can edit git-remote-hg and change the first line

- #!/usr/bin/env python2
+ #!/usr/bin/env python

Pulling the Source

Once Mercurial and git-remote-hg are installed, add a remote that points to the SDL Mercurial repo.

git remote add upstream hg::http://hg.libsdl.org/SDL

Then issue the following commands

git checkout upstream_master
git pull upstream master

{# vim: set ai ts=4 sts=4 sw=2 expandtab textwidth=75:}