claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new Vulkan texture class (Refs #260)

Browse source
This commit is contained in:
saschawillems 2017-02-09 21:55:35 +01:00
parent 83ad186ce5
commit 9822cde6e2
32 changed files with 232 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

23
distancefieldfonts/distancefieldfonts.cpp
View file

@ -23,6 +23,7 @@
#include <vulkan/vulkan.h>
#include "vulkanexamplebase.h"
#include "VulkanTexture.hpp"
#include "vulkanbuffer.hpp"
#define VERTEX_BUFFER_BIND_ID 0
@ -65,8 +66,8 @@ public:
bool splitScreen = true;
struct {
vkTools::VulkanTexture fontSDF;
vkTools::VulkanTexture fontBitmap;
vks::Texture2D fontSDF;
vks::Texture2D fontBitmap;
} textures;
struct {
@ -121,8 +122,8 @@ public:
// Note : Inherited destructor cleans up resources stored in base class
// Clean up texture resources
textureLoader->destroyTexture(textures.fontSDF);
textureLoader->destroyTexture(textures.fontBitmap);
textures.fontSDF.destroy();
textures.fontBitmap.destroy();
vkDestroyPipeline(device, pipelines.sdf, nullptr);
vkDestroyPipeline(device, pipelines.bitmap, nullptr);
@ -196,16 +197,10 @@ public:
}
void loadTextures()
void loadAssets()
{
textureLoader->loadTexture(
getAssetPath() + "textures/font_sdf_rgba.ktx",
VK_FORMAT_R8G8B8A8_UNORM,
&textures.fontSDF);
textureLoader->loadTexture(
getAssetPath() + "textures/font_bitmap_rgba.ktx",
VK_FORMAT_R8G8B8A8_UNORM,
&textures.fontBitmap);
textures.fontSDF.loadFromFile(getAssetPath() + "textures/font_sdf_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue);
textures.fontBitmap.loadFromFile(getAssetPath() + "textures/font_bitmap_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue);
}
void reBuildCommandBuffers()
@ -659,7 +654,7 @@ public:
{
VulkanExampleBase::prepare();
parsebmFont();
loadTextures();
loadAssets();
generateText("Vulkan");
setupVertexDescriptions();
prepareUniformBuffers();