Changeset c8c6da8 in opengl-game

Timestamp:

Aug 21, 2019, 8:19:09 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

e5d4aca

Parents:

ad31ec7

Message:

Create the overlay texture using different flags based on the SDL version (2.0.9 vs 2.0.10) and change compile.sh to compile all .vert and .frag files inside the shaders folder

Files:

• README.txt (modified) (1 diff)
• compile.sh (modified) (1 diff)
• makefile (modified) (1 diff)
• shaders/overlay.frag (moved) (moved from shaders/shader.frag )
• shaders/overlay.vert (moved) (moved from shaders/shader.vert )
• shaders/scene.frag (added)
• shaders/scene.vert (added)
• vulkan-game.cpp (modified) (3 diffs)

README.txt

@@ -87 +87 @@
 Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
 
-brew install sdl2
-brew install sdl2_image
-brew install sdl2_ttf
+brew install sdl2 sdl2_image sdl2_ttf
 
 make vulkangame && ./vulkangame

compile.sh

@@ -12 +12 @@
 echo $VULKAN_SDK_PATH
 
-$VULKAN_SDK_PATH/bin/glslangValidator -V shader.vert
-$VULKAN_SDK_PATH/bin/glslangValidator -V shader.frag
+shopt -s nullglob
+shopt -s extglob
+
+FILES=./!(*.spv)
+
+for f in $FILES
+do
+   shaderName=$(echo $f | sed 's/\.\/\(.*\)\..*/\1/')
+   shaderType=$(echo $f | sed 's/\.\/.*\.\(.*\)/\1/')
+   fOut="$shaderName-$shaderType.spv"
+
+   $VULKAN_SDK_PATH/bin/glslangValidator -V $f -o $fOut
+done

makefile

@@ -56 +56 @@
 
 .PHONY: shaders
-shaders: shaders/shader.vert shaders/shader.frag
+shaders:
         cd shaders && ../compile.sh && cd ..
 

vulkan-game.cpp

@@ -164 +164 @@
    private:
       GameGui* gui = new GameGui_SDL();
+      SDL_version sdlVersion;
       SDL_Window* window = nullptr;
 
@@ -260 +261 @@
          }
 
-         uiOverlay = SDL_CreateTexture(gRenderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, SCREEN_WIDTH, SCREEN_HEIGHT);
+         SDL_VERSION(&sdlVersion);
+
+         // In SDL 2.0.10 (currently, the latest), SDL_TEXTUREACCESS_TARGET is required to get a transparent overlay working
+         // However, the latest SDL version available through homebrew on Mac is 2.0.9, which requires SDL_TEXTUREACCESS_STREAMING
+         // I tried building sdl 2.0.10 (and sdl_image and sdl_ttf) from source on Mac, but had some issues, so this is easier
+         // until the homebrew recipe is updated
+         if (sdlVersion.major == 2 && sdlVersion.minor == 0 && sdlVersion.patch == 9) {
+            uiOverlay = SDL_CreateTexture(gRenderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, SCREEN_WIDTH, SCREEN_HEIGHT);
+         } else {
+            uiOverlay = SDL_CreateTexture(gRenderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, SCREEN_WIDTH, SCREEN_HEIGHT);
+         }
+
          if (uiOverlay == nullptr) {
             cout << "Unable to create blank texture! SDL Error: " << SDL_GetError() << endl;
@@ -1833 +1845 @@
          createRenderPass();
 
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", scenePipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", overlayPipeline);
+         createGraphicsPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv", scenePipeline);
+         createGraphicsPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv", overlayPipeline);
 
          createDepthResources();