Added runtime mip map generation examples (wip) (refs #178)
This commit is contained in:
saschawillems
parent
2749b846b4
commit
2758c47b86
10 changed files with 1180 additions and 1 deletions
209
data/models/tunnel.dae
Normal file
209
data/models/tunnel.dae
Normal file
|
|
@ -0,0 +1,209 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
|
||||||
|
<asset>
|
||||||
|
<contributor>
|
||||||
|
<author>Blender User</author>
|
||||||
|
<authoring_tool>Blender 2.77.0 commit date:2016-03-18, commit time:12:34, hash:22a2853</authoring_tool>
|
||||||
|
</contributor>
|
||||||
|
<created>2016-08-14T23:02:23</created>
|
||||||
|
<modified>2016-08-14T23:02:23</modified>
|
||||||
|
<unit name="meter" meter="1"/>
|
||||||
|
<up_axis>Z_UP</up_axis>
|
||||||
|
</asset>
|
||||||
|
<library_cameras>
|
||||||
|
<camera id="Camera-camera" name="Camera">
|
||||||
|
<optics>
|
||||||
|
<technique_common>
|
||||||
|
<perspective>
|
||||||
|
<xfov sid="xfov">49.13434</xfov>
|
||||||
|
<aspect_ratio>1.777778</aspect_ratio>
|
||||||
|
<znear sid="znear">0.1</znear>
|
||||||
|
<zfar sid="zfar">100</zfar>
|
||||||
|
</perspective>
|
||||||
|
</technique_common>
|
||||||
|
</optics>
|
||||||
|
<extra>
|
||||||
|
<technique profile="blender">
|
||||||
|
<YF_dofdist>0</YF_dofdist>
|
||||||
|
<shiftx>0</shiftx>
|
||||||
|
<shifty>0</shifty>
|
||||||
|
</technique>
|
||||||
|
</extra>
|
||||||
|
</camera>
|
||||||
|
</library_cameras>
|
||||||
|
<library_lights>
|
||||||
|
<light id="Lamp-light" name="Lamp">
|
||||||
|
<technique_common>
|
||||||
|
<point>
|
||||||
|
<color sid="color">1 1 1</color>
|
||||||
|
<constant_attenuation>1</constant_attenuation>
|
||||||
|
<linear_attenuation>0</linear_attenuation>
|
||||||
|
<quadratic_attenuation>0.00111109</quadratic_attenuation>
|
||||||
|
</point>
|
||||||
|
</technique_common>
|
||||||
|
<extra>
|
||||||
|
<technique profile="blender">
|
||||||
|
<adapt_thresh>0.000999987</adapt_thresh>
|
||||||
|
<area_shape>1</area_shape>
|
||||||
|
<area_size>0.1</area_size>
|
||||||
|
<area_sizey>0.1</area_sizey>
|
||||||
|
<area_sizez>1</area_sizez>
|
||||||
|
<atm_distance_factor>1</atm_distance_factor>
|
||||||
|
<atm_extinction_factor>1</atm_extinction_factor>
|
||||||
|
<atm_turbidity>2</atm_turbidity>
|
||||||
|
<att1>0</att1>
|
||||||
|
<att2>1</att2>
|
||||||
|
<backscattered_light>1</backscattered_light>
|
||||||
|
<bias>1</bias>
|
||||||
|
<blue>1</blue>
|
||||||
|
<buffers>1</buffers>
|
||||||
|
<bufflag>0</bufflag>
|
||||||
|
<bufsize>2880</bufsize>
|
||||||
|
<buftype>2</buftype>
|
||||||
|
<clipend>30.002</clipend>
|
||||||
|
<clipsta>1.000799</clipsta>
|
||||||
|
<compressthresh>0.04999995</compressthresh>
|
||||||
|
<dist sid="blender_dist">29.99998</dist>
|
||||||
|
<energy sid="blender_energy">1</energy>
|
||||||
|
<falloff_type>2</falloff_type>
|
||||||
|
<filtertype>0</filtertype>
|
||||||
|
<flag>0</flag>
|
||||||
|
<gamma sid="blender_gamma">1</gamma>
|
||||||
|
<green>1</green>
|
||||||
|
<halo_intensity sid="blnder_halo_intensity">1</halo_intensity>
|
||||||
|
<horizon_brightness>1</horizon_brightness>
|
||||||
|
<mode>8192</mode>
|
||||||
|
<ray_samp>1</ray_samp>
|
||||||
|
<ray_samp_method>1</ray_samp_method>
|
||||||
|
<ray_samp_type>0</ray_samp_type>
|
||||||
|
<ray_sampy>1</ray_sampy>
|
||||||
|
<ray_sampz>1</ray_sampz>
|
||||||
|
<red>1</red>
|
||||||
|
<samp>3</samp>
|
||||||
|
<shadhalostep>0</shadhalostep>
|
||||||
|
<shadow_b sid="blender_shadow_b">0</shadow_b>
|
||||||
|
<shadow_g sid="blender_shadow_g">0</shadow_g>
|
||||||
|
<shadow_r sid="blender_shadow_r">0</shadow_r>
|
||||||
|
<sky_colorspace>0</sky_colorspace>
|
||||||
|
<sky_exposure>1</sky_exposure>
|
||||||
|
<skyblendfac>1</skyblendfac>
|
||||||
|
<skyblendtype>1</skyblendtype>
|
||||||
|
<soft>3</soft>
|
||||||
|
<spotblend>0.15</spotblend>
|
||||||
|
<spotsize>75</spotsize>
|
||||||
|
<spread>1</spread>
|
||||||
|
<sun_brightness>1</sun_brightness>
|
||||||
|
<sun_effect_type>0</sun_effect_type>
|
||||||
|
<sun_intensity>1</sun_intensity>
|
||||||
|
<sun_size>1</sun_size>
|
||||||
|
<type>0</type>
|
||||||
|
</technique>
|
||||||
|
</extra>
|
||||||
|
</light>
|
||||||
|
</library_lights>
|
||||||
|
<library_images/>
|
||||||
|
<library_effects>
|
||||||
|
<effect id="Material_001-effect">
|
||||||
|
<profile_COMMON>
|
||||||
|
<technique sid="common">
|
||||||
|
<phong>
|
||||||
|
<emission>
|
||||||
|
<color sid="emission">0 0 0 1</color>
|
||||||
|
</emission>
|
||||||
|
<ambient>
|
||||||
|
<color sid="ambient">0 0 0 1</color>
|
||||||
|
</ambient>
|
||||||
|
<diffuse>
|
||||||
|
<color sid="diffuse">0.64 0.64 0.64 1</color>
|
||||||
|
</diffuse>
|
||||||
|
<specular>
|
||||||
|
<color sid="specular">0.5 0.5 0.5 1</color>
|
||||||
|
</specular>
|
||||||
|
<shininess>
|
||||||
|
<float sid="shininess">50</float>
|
||||||
|
</shininess>
|
||||||
|
<index_of_refraction>
|
||||||
|
<float sid="index_of_refraction">1</float>
|
||||||
|
</index_of_refraction>
|
||||||
|
</phong>
|
||||||
|
</technique>
|
||||||
|
</profile_COMMON>
|
||||||
|
</effect>
|
||||||
|
</library_effects>
|
||||||
|
<library_materials>
|
||||||
|
<material id="Material_001-material" name="Material_001">
|
||||||
|
<instance_effect url="#Material_001-effect"/>
|
||||||
|
</material>
|
||||||
|
</library_materials>
|
||||||
|
<library_geometries>
|
||||||
|
<geometry id="Cube_001-mesh" name="Cube.001">
|
||||||
|
<mesh>
|
||||||
|
<source id="Cube_001-mesh-positions">
|
||||||
|
<float_array id="Cube_001-mesh-positions-array" count="24">-1 -1 -1 -1 -1 1 -1 1 -1 -1 1 1 1 -1 -1 1 -1 1 1 1 -1 1 1 1</float_array>
|
||||||
|
<technique_common>
|
||||||
|
<accessor source="#Cube_001-mesh-positions-array" count="8" stride="3">
|
||||||
|
<param name="X" type="float"/>
|
||||||
|
<param name="Y" type="float"/>
|
||||||
|
<param name="Z" type="float"/>
|
||||||
|
</accessor>
|
||||||
|
</technique_common>
|
||||||
|
</source>
|
||||||
|
<source id="Cube_001-mesh-normals">
|
||||||
|
<float_array id="Cube_001-mesh-normals-array" count="12">0 1 0 0 -1 0 0 0 -1 0 0 1</float_array>
|
||||||
|
<technique_common>
|
||||||
|
<accessor source="#Cube_001-mesh-normals-array" count="4" stride="3">
|
||||||
|
<param name="X" type="float"/>
|
||||||
|
<param name="Y" type="float"/>
|
||||||
|
<param name="Z" type="float"/>
|
||||||
|
</accessor>
|
||||||
|
</technique_common>
|
||||||
|
</source>
|
||||||
|
<source id="Cube_001-mesh-map-0">
|
||||||
|
<float_array id="Cube_001-mesh-map-0-array" count="48">0.9998999 9.998e-5 9.998e-5 0.9999001 1.0001e-4 1.00099e-4 0.9999999 0 0 1 0 0 1 1 0 0 1 0 0.9999001 0.9999001 9.998e-5 9.998e-5 0.9999001 9.998e-5 0.9998999 9.998e-5 0.9998999 0.9999001 9.998e-5 0.9999001 0.9999999 0 1 0.9999999 0 1 1 1 0 1 0 0 0.9999001 0.9999001 1.0004e-4 0.9999001 9.998e-5 9.998e-5</float_array>
|
||||||
|
<technique_common>
|
||||||
|
<accessor source="#Cube_001-mesh-map-0-array" count="24" stride="2">
|
||||||
|
<param name="S" type="float"/>
|
||||||
|
<param name="T" type="float"/>
|
||||||
|
</accessor>
|
||||||
|
</technique_common>
|
||||||
|
</source>
|
||||||
|
<vertices id="Cube_001-mesh-vertices">
|
||||||
|
<input semantic="POSITION" source="#Cube_001-mesh-positions"/>
|
||||||
|
</vertices>
|
||||||
|
<polylist material="Material_001-material" count="8">
|
||||||
|
<input semantic="VERTEX" source="#Cube_001-mesh-vertices" offset="0"/>
|
||||||
|
<input semantic="NORMAL" source="#Cube_001-mesh-normals" offset="1"/>
|
||||||
|
<input semantic="TEXCOORD" source="#Cube_001-mesh-map-0" offset="2" set="0"/>
|
||||||
|
<vcount>3 3 3 3 3 3 3 3 </vcount>
|
||||||
|
<p>7 0 0 2 0 1 3 0 2 1 1 3 4 1 4 5 1 5 2 2 6 4 2 7 0 2 8 7 3 9 1 3 10 5 3 11 7 0 12 6 0 13 2 0 14 1 1 15 0 1 16 4 1 17 2 2 18 6 2 19 4 2 20 7 3 21 3 3 22 1 3 23</p>
|
||||||
|
</polylist>
|
||||||
|
</mesh>
|
||||||
|
</geometry>
|
||||||
|
</library_geometries>
|
||||||
|
<library_controllers/>
|
||||||
|
<library_visual_scenes>
|
||||||
|
<visual_scene id="Scene" name="Scene">
|
||||||
|
<node id="Camera" name="Camera" type="NODE">
|
||||||
|
<matrix sid="transform">0.6858805 -0.3173701 0.6548619 7.481132 0.7276338 0.3124686 -0.6106656 -6.50764 -0.01081678 0.8953432 0.4452454 5.343665 0 0 0 1</matrix>
|
||||||
|
<instance_camera url="#Camera-camera"/>
|
||||||
|
</node>
|
||||||
|
<node id="Lamp" name="Lamp" type="NODE">
|
||||||
|
<matrix sid="transform">-0.2908646 -0.7711008 0.5663932 4.076245 0.9551712 -0.1998834 0.2183912 1.005454 -0.05518906 0.6045247 0.7946723 5.903862 0 0 0 1</matrix>
|
||||||
|
<instance_light url="#Lamp-light"/>
|
||||||
|
</node>
|
||||||
|
<node id="Cube" name="Cube" type="NODE">
|
||||||
|
<matrix sid="transform">10 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
|
||||||
|
<instance_geometry url="#Cube_001-mesh" name="Cube">
|
||||||
|
<bind_material>
|
||||||
|
<technique_common>
|
||||||
|
<instance_material symbol="Material_001-material" target="#Material_001-material"/>
|
||||||
|
</technique_common>
|
||||||
|
</bind_material>
|
||||||
|
</instance_geometry>
|
||||||
|
</node>
|
||||||
|
</visual_scene>
|
||||||
|
</library_visual_scenes>
|
||||||
|
<scene>
|
||||||
|
<instance_visual_scene url="#Scene"/>
|
||||||
|
</scene>
|
||||||
|
</COLLADA>
|
||||||
19
data/shaders/texturemipmapgen/texture.frag
Normal file
19
data/shaders/texturemipmapgen/texture.frag
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
layout (set = 0, binding = 1) uniform texture2D textureColor;
|
||||||
|
layout (set = 0, binding = 2) uniform sampler samplers[3];
|
||||||
|
|
||||||
|
layout (location = 0) in vec2 inUV;
|
||||||
|
layout (location = 1) in float inLodBias;
|
||||||
|
layout (location = 2) in float inSamplerIndex;
|
||||||
|
|
||||||
|
layout (location = 0) out vec4 outFragColor;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
highp int samplerIndex = int(inSamplerIndex);
|
||||||
|
outFragColor = texture(sampler2D(textureColor, samplers[samplerIndex]), inUV, inLodBias);
|
||||||
|
}
|
||||||
BIN
data/shaders/texturemipmapgen/texture.frag.spv
Normal file
BIN
data/shaders/texturemipmapgen/texture.frag.spv
Normal file
Binary file not shown.
35
data/shaders/texturemipmapgen/texture.vert
Normal file
35
data/shaders/texturemipmapgen/texture.vert
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
layout (location = 0) in vec3 inPos;
|
||||||
|
layout (location = 1) in vec2 inUV;
|
||||||
|
layout (location = 2) in vec3 inNormal;
|
||||||
|
|
||||||
|
layout (binding = 0) uniform UBO
|
||||||
|
{
|
||||||
|
mat4 projection;
|
||||||
|
mat4 model;
|
||||||
|
vec4 viewPos;
|
||||||
|
float lodBias;
|
||||||
|
float samplerIndex;
|
||||||
|
} ubo;
|
||||||
|
|
||||||
|
layout (location = 0) out vec2 outUV;
|
||||||
|
layout (location = 1) out float outLodBias;
|
||||||
|
layout (location = 2) out float outSamplerIndex;
|
||||||
|
|
||||||
|
out gl_PerVertex
|
||||||
|
{
|
||||||
|
vec4 gl_Position;
|
||||||
|
};
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
outUV = inUV;
|
||||||
|
outUV.s *= 10.0;
|
||||||
|
outLodBias = ubo.lodBias;
|
||||||
|
outSamplerIndex = ubo.samplerIndex;
|
||||||
|
gl_Position = ubo.projection * ubo.model * vec4(inPos, 1.0);
|
||||||
|
}
|
||||||
BIN
data/shaders/texturemipmapgen/texture.vert.spv
Normal file
BIN
data/shaders/texturemipmapgen/texture.vert.spv
Normal file
Binary file not shown.
BIN
data/textures/checkerboard_nomips_rgba.ktx
Normal file
BIN
data/textures/checkerboard_nomips_rgba.ktx
Normal file
Binary file not shown.
758
texturemipmapgen/texturemipmapgen.cpp
Normal file
758
texturemipmapgen/texturemipmapgen.cpp
Normal file
|
|
@ -0,0 +1,758 @@
|
||||||
|
/*
|
||||||
|
* Vulkan Example - Runtime mip map generation
|
||||||
|
*
|
||||||
|
* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de
|
||||||
|
*
|
||||||
|
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
|
||||||
|
*/
|
||||||
|
|
||||||
|
// todo: Fallback for sampler selection on devices that don't support shaderSampledImageArrayDynamicIndexing
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <vector>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
|
#define GLM_FORCE_RADIANS
|
||||||
|
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
|
|
||||||
|
#include <vulkan/vulkan.h>
|
||||||
|
#include "vulkanexamplebase.h"
|
||||||
|
#include "vulkandevice.hpp"
|
||||||
|
#include "vulkanbuffer.hpp"
|
||||||
|
|
||||||
|
#define VERTEX_BUFFER_BIND_ID 0
|
||||||
|
#define ENABLE_VALIDATION false
|
||||||
|
|
||||||
|
// Vertex layout for this example
|
||||||
|
struct Vertex {
|
||||||
|
float pos[3];
|
||||||
|
float uv[2];
|
||||||
|
float normal[3];
|
||||||
|
};
|
||||||
|
|
||||||
|
std::vector<vkMeshLoader::VertexLayout> vertexLayout =
|
||||||
|
{
|
||||||
|
vkMeshLoader::VERTEX_LAYOUT_POSITION,
|
||||||
|
vkMeshLoader::VERTEX_LAYOUT_UV,
|
||||||
|
vkMeshLoader::VERTEX_LAYOUT_NORMAL
|
||||||
|
};
|
||||||
|
class VulkanExample : public VulkanExampleBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
struct Texture {
|
||||||
|
VkImage image;
|
||||||
|
VkImageLayout imageLayout;
|
||||||
|
VkDeviceMemory deviceMemory;
|
||||||
|
VkImageView view;
|
||||||
|
uint32_t width, height;
|
||||||
|
uint32_t mipLevels;
|
||||||
|
} texture;
|
||||||
|
|
||||||
|
// To demonstrate mip mapping and filtering this example uses separate samplers
|
||||||
|
std::vector<std::string> samplerNames{ "No mip maps" , "With mip maps (bilinear)" , "With mip maps (anisotropic)" };
|
||||||
|
std::vector<VkSampler> samplers;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
vkMeshLoader::MeshBuffer tunnel;
|
||||||
|
} meshes;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
VkPipelineVertexInputStateCreateInfo inputState;
|
||||||
|
std::vector<VkVertexInputBindingDescription> bindingDescriptions;
|
||||||
|
std::vector<VkVertexInputAttributeDescription> attributeDescriptions;
|
||||||
|
} vertices;
|
||||||
|
|
||||||
|
vk::Buffer uniformBufferVS;
|
||||||
|
|
||||||
|
struct uboVS {
|
||||||
|
glm::mat4 projection;
|
||||||
|
glm::mat4 view;
|
||||||
|
glm::vec4 viewPos;
|
||||||
|
float lodBias = 0.0f;
|
||||||
|
float samplerIndex = 0.0f;
|
||||||
|
} uboVS;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
VkPipeline solid;
|
||||||
|
} pipelines;
|
||||||
|
|
||||||
|
VkPipelineLayout pipelineLayout;
|
||||||
|
VkDescriptorSet descriptorSet;
|
||||||
|
VkDescriptorSetLayout descriptorSetLayout;
|
||||||
|
|
||||||
|
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||||
|
{
|
||||||
|
title = "Vulkan Example - Texturing";
|
||||||
|
enableTextOverlay = true;
|
||||||
|
camera.type = Camera::CameraType::firstperson;
|
||||||
|
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||||
|
camera.setRotation(glm::vec3(0.0f, 90.0f, 0.0f));
|
||||||
|
camera.setTranslation(glm::vec3(10.0f, 0.0f, 0.0f));
|
||||||
|
camera.movementSpeed = 2.5f;
|
||||||
|
camera.rotationSpeed = 0.5f;
|
||||||
|
}
|
||||||
|
|
||||||
|
~VulkanExample()
|
||||||
|
{
|
||||||
|
destroyTextureImage(texture);
|
||||||
|
vkDestroyPipeline(device, pipelines.solid, nullptr);
|
||||||
|
vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
|
||||||
|
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
|
||||||
|
uniformBufferVS.destroy();
|
||||||
|
for (auto sampler : samplers)
|
||||||
|
{
|
||||||
|
vkDestroySampler(device, sampler, nullptr);
|
||||||
|
}
|
||||||
|
vkMeshLoader::freeMeshBufferResources(device, &meshes.tunnel);
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadTexture(std::string fileName, VkFormat format, bool forceLinearTiling)
|
||||||
|
{
|
||||||
|
#if defined(__ANDROID__)
|
||||||
|
// Textures are stored inside the apk on Android (compressed)
|
||||||
|
// So they need to be loaded via the asset manager
|
||||||
|
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, fileName.c_str(), AASSET_MODE_STREAMING);
|
||||||
|
assert(asset);
|
||||||
|
size_t size = AAsset_getLength(asset);
|
||||||
|
assert(size > 0);
|
||||||
|
|
||||||
|
void *textureData = malloc(size);
|
||||||
|
AAsset_read(asset, textureData, size);
|
||||||
|
AAsset_close(asset);
|
||||||
|
|
||||||
|
gli::texture2D tex2D(gli::load((const char*)textureData, size));
|
||||||
|
#else
|
||||||
|
gli::texture2D tex2D(gli::load(fileName));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
assert(!tex2D.empty());
|
||||||
|
|
||||||
|
VkFormatProperties formatProperties;
|
||||||
|
|
||||||
|
texture.width = static_cast<uint32_t>(tex2D[0].dimensions().x);
|
||||||
|
texture.height = static_cast<uint32_t>(tex2D[0].dimensions().y);
|
||||||
|
|
||||||
|
// calculate num of mip maps
|
||||||
|
// numLevels = 1 + floor(log2(max(w, h, d)))
|
||||||
|
// Calculated as log2(max(width, height, depth))c + 1 (see specs)
|
||||||
|
texture.mipLevels = floor(log2(std::max(texture.width, texture.height))) + 1;
|
||||||
|
|
||||||
|
// Get device properites for the requested texture format
|
||||||
|
vkGetPhysicalDeviceFormatProperties(physicalDevice, format, &formatProperties);
|
||||||
|
|
||||||
|
// todo check blit flags
|
||||||
|
|
||||||
|
VkMemoryAllocateInfo memAllocInfo = vkTools::initializers::memoryAllocateInfo();
|
||||||
|
VkMemoryRequirements memReqs = {};
|
||||||
|
|
||||||
|
// Create a host-visible staging buffer that contains the raw image data
|
||||||
|
VkBuffer stagingBuffer;
|
||||||
|
VkDeviceMemory stagingMemory;
|
||||||
|
|
||||||
|
VkBufferCreateInfo bufferCreateInfo = vkTools::initializers::bufferCreateInfo();
|
||||||
|
bufferCreateInfo.size = tex2D.size();
|
||||||
|
// This buffer is used as a transfer source for the buffer copy
|
||||||
|
bufferCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
|
||||||
|
bufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
|
||||||
|
VK_CHECK_RESULT(vkCreateBuffer(device, &bufferCreateInfo, nullptr, &stagingBuffer));
|
||||||
|
vkGetBufferMemoryRequirements(device, stagingBuffer, &memReqs);
|
||||||
|
memAllocInfo.allocationSize = memReqs.size;
|
||||||
|
memAllocInfo.memoryTypeIndex = vulkanDevice->getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
|
||||||
|
VK_CHECK_RESULT(vkAllocateMemory(device, &memAllocInfo, nullptr, &stagingMemory));
|
||||||
|
VK_CHECK_RESULT(vkBindBufferMemory(device, stagingBuffer, stagingMemory, 0));
|
||||||
|
|
||||||
|
// Copy texture data into staging buffer
|
||||||
|
uint8_t *data;
|
||||||
|
VK_CHECK_RESULT(vkMapMemory(device, stagingMemory, 0, memReqs.size, 0, (void **)&data));
|
||||||
|
memcpy(data, tex2D.data(), tex2D.size());
|
||||||
|
vkUnmapMemory(device, stagingMemory);
|
||||||
|
|
||||||
|
// Create optimal tiled target image
|
||||||
|
VkImageCreateInfo imageCreateInfo = vkTools::initializers::imageCreateInfo();
|
||||||
|
imageCreateInfo.imageType = VK_IMAGE_TYPE_2D;
|
||||||
|
imageCreateInfo.format = format;
|
||||||
|
imageCreateInfo.mipLevels = texture.mipLevels;
|
||||||
|
imageCreateInfo.arrayLayers = 1;
|
||||||
|
imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;
|
||||||
|
imageCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
|
||||||
|
imageCreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT;
|
||||||
|
imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
|
||||||
|
imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
|
||||||
|
imageCreateInfo.extent = { texture.width, texture.height, 1 };
|
||||||
|
imageCreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
|
||||||
|
VK_CHECK_RESULT(vkCreateImage(device, &imageCreateInfo, nullptr, &texture.image));
|
||||||
|
vkGetImageMemoryRequirements(device, texture.image, &memReqs);
|
||||||
|
memAllocInfo.allocationSize = memReqs.size;
|
||||||
|
memAllocInfo.memoryTypeIndex = vulkanDevice->getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||||
|
VK_CHECK_RESULT(vkAllocateMemory(device, &memAllocInfo, nullptr, &texture.deviceMemory));
|
||||||
|
VK_CHECK_RESULT(vkBindImageMemory(device, texture.image, texture.deviceMemory, 0));
|
||||||
|
|
||||||
|
VkCommandBuffer copyCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
|
||||||
|
|
||||||
|
VkImageSubresourceRange subresourceRange = {};
|
||||||
|
subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
subresourceRange.levelCount = 1;
|
||||||
|
subresourceRange.layerCount = 1;
|
||||||
|
|
||||||
|
// Optimal image will be used as destination for the copy, so we must transfer from our initial undefined image layout to the transfer destination layout
|
||||||
|
vkTools::setImageLayout(copyCmd, texture.image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, subresourceRange);
|
||||||
|
|
||||||
|
// Copy the first mip of the chain, remaining mips will be generated
|
||||||
|
VkBufferImageCopy bufferCopyRegion = {};
|
||||||
|
bufferCopyRegion.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
bufferCopyRegion.imageSubresource.mipLevel = 0;
|
||||||
|
bufferCopyRegion.imageSubresource.baseArrayLayer = 0;
|
||||||
|
bufferCopyRegion.imageSubresource.layerCount = 1;
|
||||||
|
bufferCopyRegion.imageExtent.width = texture.width;
|
||||||
|
bufferCopyRegion.imageExtent.height = texture.height;
|
||||||
|
bufferCopyRegion.imageExtent.depth = 1;
|
||||||
|
|
||||||
|
vkCmdCopyBufferToImage(copyCmd, stagingBuffer, texture.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &bufferCopyRegion);
|
||||||
|
|
||||||
|
// Transition first mip level to transfer source for read during blit
|
||||||
|
texture.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||||
|
vkTools::setImageLayout(
|
||||||
|
copyCmd,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
|
subresourceRange);
|
||||||
|
|
||||||
|
VulkanExampleBase::flushCommandBuffer(copyCmd, queue, true);
|
||||||
|
|
||||||
|
// Clean up staging resources
|
||||||
|
vkFreeMemory(device, stagingMemory, nullptr);
|
||||||
|
vkDestroyBuffer(device, stagingBuffer, nullptr);
|
||||||
|
|
||||||
|
// Generate the mip chain
|
||||||
|
// ---------------------------------------------------------------
|
||||||
|
// We copy down the whole mip chain doint a blit from mip-1 to mip
|
||||||
|
// An alternative way would be to always blit from the first mip level and sample that one down
|
||||||
|
// todo: comment
|
||||||
|
|
||||||
|
VkCommandBuffer blitCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
|
||||||
|
|
||||||
|
// Copy down mips from n-1 to n
|
||||||
|
for (int32_t i = 1; i < texture.mipLevels; i++)
|
||||||
|
{
|
||||||
|
int32_t mipWidth = texture.width >> i;
|
||||||
|
int32_t mipHeight = texture.height >> i;
|
||||||
|
|
||||||
|
VkImageBlit imageBlit{};
|
||||||
|
|
||||||
|
// Source
|
||||||
|
imageBlit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
imageBlit.srcSubresource.layerCount = 1;
|
||||||
|
imageBlit.srcSubresource.mipLevel = i-1;
|
||||||
|
imageBlit.srcOffsets[1].x = int32_t(texture.width >> (i - 1));
|
||||||
|
imageBlit.srcOffsets[1].y = int32_t(texture.height >> (i - 1));
|
||||||
|
imageBlit.srcOffsets[1].z = 1;
|
||||||
|
|
||||||
|
// Destination
|
||||||
|
imageBlit.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
imageBlit.dstSubresource.layerCount = 1;
|
||||||
|
imageBlit.dstSubresource.mipLevel = i;
|
||||||
|
imageBlit.dstOffsets[1].x = int32_t(texture.width >> i);
|
||||||
|
imageBlit.dstOffsets[1].y = int32_t(texture.height >> i);
|
||||||
|
imageBlit.dstOffsets[1].z = 1;
|
||||||
|
|
||||||
|
VkImageSubresourceRange mipSubRange = {};
|
||||||
|
mipSubRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
mipSubRange.baseMipLevel = i;
|
||||||
|
mipSubRange.levelCount = 1;
|
||||||
|
mipSubRange.layerCount = 1;
|
||||||
|
|
||||||
|
// Transiton current mip level to transfer dest
|
||||||
|
vkTools::setImageLayout(
|
||||||
|
blitCmd,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||||
|
VK_IMAGE_LAYOUT_UNDEFINED,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||||
|
mipSubRange);
|
||||||
|
|
||||||
|
// Blit from previous level
|
||||||
|
vkCmdBlitImage(
|
||||||
|
blitCmd,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||||
|
1,
|
||||||
|
&imageBlit,
|
||||||
|
VK_FILTER_LINEAR);
|
||||||
|
|
||||||
|
// Transiton current mip level to transfer source for read in next iteration
|
||||||
|
vkTools::setImageLayout(
|
||||||
|
blitCmd,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
|
mipSubRange);
|
||||||
|
}
|
||||||
|
|
||||||
|
// After the loop, all mip layers are in TRANSFER_SRC layout, so transition all to SHADER_READ
|
||||||
|
subresourceRange.levelCount = texture.mipLevels;
|
||||||
|
vkTools::setImageLayout(
|
||||||
|
blitCmd,
|
||||||
|
texture.image,
|
||||||
|
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||||
|
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
|
texture.imageLayout,
|
||||||
|
subresourceRange);
|
||||||
|
|
||||||
|
VulkanExampleBase::flushCommandBuffer(blitCmd, queue, true);
|
||||||
|
// ---------------------------------------------------------------
|
||||||
|
|
||||||
|
// Create samplers
|
||||||
|
samplers.resize(3);
|
||||||
|
VkSamplerCreateInfo sampler = vkTools::initializers::samplerCreateInfo();
|
||||||
|
sampler.magFilter = VK_FILTER_LINEAR;
|
||||||
|
sampler.minFilter = VK_FILTER_LINEAR;
|
||||||
|
sampler.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
|
||||||
|
sampler.addressModeU = VK_SAMPLER_ADDRESS_MODE_REPEAT;
|
||||||
|
sampler.addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT;
|
||||||
|
sampler.addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT;
|
||||||
|
sampler.mipLodBias = 0.0f;
|
||||||
|
sampler.compareOp = VK_COMPARE_OP_NEVER;
|
||||||
|
sampler.minLod = 0.0f;
|
||||||
|
sampler.maxLod = 0.0f;
|
||||||
|
sampler.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
|
||||||
|
sampler.maxAnisotropy = 1.0;
|
||||||
|
sampler.anisotropyEnable = VK_FALSE;
|
||||||
|
|
||||||
|
// Without mip mapping
|
||||||
|
VK_CHECK_RESULT(vkCreateSampler(device, &sampler, nullptr, &samplers[0]));
|
||||||
|
|
||||||
|
// With mip mapping
|
||||||
|
sampler.maxLod = (float)texture.mipLevels;
|
||||||
|
VK_CHECK_RESULT(vkCreateSampler(device, &sampler, nullptr, &samplers[1]));
|
||||||
|
|
||||||
|
// With mip mapping and anisotropic filtering
|
||||||
|
if (vulkanDevice->features.samplerAnisotropy)
|
||||||
|
{
|
||||||
|
sampler.maxAnisotropy = vulkanDevice->properties.limits.maxSamplerAnisotropy;
|
||||||
|
sampler.anisotropyEnable = VK_TRUE;
|
||||||
|
}
|
||||||
|
VK_CHECK_RESULT(vkCreateSampler(device, &sampler, nullptr, &samplers[2]));
|
||||||
|
|
||||||
|
// Create image view
|
||||||
|
VkImageViewCreateInfo view = vkTools::initializers::imageViewCreateInfo();
|
||||||
|
view.image = texture.image;
|
||||||
|
view.viewType = VK_IMAGE_VIEW_TYPE_2D;
|
||||||
|
view.format = format;
|
||||||
|
view.components = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A };
|
||||||
|
view.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
view.subresourceRange.baseMipLevel = 0;
|
||||||
|
view.subresourceRange.baseArrayLayer = 0;
|
||||||
|
view.subresourceRange.layerCount = 1;
|
||||||
|
view.subresourceRange.levelCount = texture.mipLevels;
|
||||||
|
VK_CHECK_RESULT(vkCreateImageView(device, &view, nullptr, &texture.view));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Free all Vulkan resources used a texture object
|
||||||
|
void destroyTextureImage(Texture texture)
|
||||||
|
{
|
||||||
|
vkDestroyImageView(device, texture.view, nullptr);
|
||||||
|
vkDestroyImage(device, texture.image, nullptr);
|
||||||
|
vkFreeMemory(device, texture.deviceMemory, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void buildCommandBuffers()
|
||||||
|
{
|
||||||
|
VkCommandBufferBeginInfo cmdBufInfo = vkTools::initializers::commandBufferBeginInfo();
|
||||||
|
|
||||||
|
VkClearValue clearValues[2];
|
||||||
|
clearValues[0].color = defaultClearColor;
|
||||||
|
clearValues[1].depthStencil = { 1.0f, 0 };
|
||||||
|
|
||||||
|
VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo();
|
||||||
|
renderPassBeginInfo.renderPass = renderPass;
|
||||||
|
renderPassBeginInfo.renderArea.offset.x = 0;
|
||||||
|
renderPassBeginInfo.renderArea.offset.y = 0;
|
||||||
|
renderPassBeginInfo.renderArea.extent.width = width;
|
||||||
|
renderPassBeginInfo.renderArea.extent.height = height;
|
||||||
|
renderPassBeginInfo.clearValueCount = 2;
|
||||||
|
renderPassBeginInfo.pClearValues = clearValues;
|
||||||
|
|
||||||
|
for (int32_t i = 0; i < drawCmdBuffers.size(); ++i)
|
||||||
|
{
|
||||||
|
// Set target frame buffer
|
||||||
|
renderPassBeginInfo.framebuffer = frameBuffers[i];
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo));
|
||||||
|
|
||||||
|
vkCmdBeginRenderPass(drawCmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
|
||||||
|
|
||||||
|
VkViewport viewport = vkTools::initializers::viewport((float)width, (float)height, 0.0f, 1.0f);
|
||||||
|
vkCmdSetViewport(drawCmdBuffers[i], 0, 1, &viewport);
|
||||||
|
|
||||||
|
VkRect2D scissor = vkTools::initializers::rect2D(width, height, 0, 0);
|
||||||
|
vkCmdSetScissor(drawCmdBuffers[i], 0, 1, &scissor);
|
||||||
|
|
||||||
|
vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL);
|
||||||
|
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.solid);
|
||||||
|
|
||||||
|
VkDeviceSize offsets[1] = { 0 };
|
||||||
|
vkCmdBindVertexBuffers(drawCmdBuffers[i], VERTEX_BUFFER_BIND_ID, 1, &meshes.tunnel.vertices.buf, offsets);
|
||||||
|
vkCmdBindIndexBuffer(drawCmdBuffers[i], meshes.tunnel.indices.buf, 0, VK_INDEX_TYPE_UINT32);
|
||||||
|
|
||||||
|
vkCmdDrawIndexed(drawCmdBuffers[i], meshes.tunnel.indexCount, 1, 0, 0, 0);
|
||||||
|
|
||||||
|
vkCmdEndRenderPass(drawCmdBuffers[i]);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void draw()
|
||||||
|
{
|
||||||
|
VulkanExampleBase::prepareFrame();
|
||||||
|
|
||||||
|
// Command buffer to be sumitted to the queue
|
||||||
|
submitInfo.commandBufferCount = 1;
|
||||||
|
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
|
||||||
|
|
||||||
|
// Submit to queue
|
||||||
|
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
|
||||||
|
|
||||||
|
VulkanExampleBase::submitFrame();
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadAssets()
|
||||||
|
{
|
||||||
|
loadMesh(getAssetPath() + "models/tunnel.dae", &meshes.tunnel, vertexLayout, 1.0f);
|
||||||
|
loadTexture(getAssetPath() + "textures/checkerboard_nomips_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupVertexDescriptions()
|
||||||
|
{
|
||||||
|
// Binding description
|
||||||
|
vertices.bindingDescriptions.resize(1);
|
||||||
|
vertices.bindingDescriptions[0] =
|
||||||
|
vkTools::initializers::vertexInputBindingDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
sizeof(Vertex),
|
||||||
|
VK_VERTEX_INPUT_RATE_VERTEX);
|
||||||
|
|
||||||
|
// Attribute descriptions
|
||||||
|
// Describes memory layout and shader positions
|
||||||
|
vertices.attributeDescriptions.resize(3);
|
||||||
|
// Location 0 : Position
|
||||||
|
vertices.attributeDescriptions[0] =
|
||||||
|
vkTools::initializers::vertexInputAttributeDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
0,
|
||||||
|
VK_FORMAT_R32G32B32_SFLOAT,
|
||||||
|
offsetof(Vertex, pos));
|
||||||
|
// Location 1 : Texture coordinates
|
||||||
|
vertices.attributeDescriptions[1] =
|
||||||
|
vkTools::initializers::vertexInputAttributeDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
1,
|
||||||
|
VK_FORMAT_R32G32_SFLOAT,
|
||||||
|
offsetof(Vertex, uv));
|
||||||
|
// Location 1 : Vertex normal
|
||||||
|
vertices.attributeDescriptions[2] =
|
||||||
|
vkTools::initializers::vertexInputAttributeDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
2,
|
||||||
|
VK_FORMAT_R32G32B32_SFLOAT,
|
||||||
|
offsetof(Vertex, normal));
|
||||||
|
|
||||||
|
vertices.inputState = vkTools::initializers::pipelineVertexInputStateCreateInfo();
|
||||||
|
vertices.inputState.vertexBindingDescriptionCount = static_cast<uint32_t>(vertices.bindingDescriptions.size());
|
||||||
|
vertices.inputState.pVertexBindingDescriptions = vertices.bindingDescriptions.data();
|
||||||
|
vertices.inputState.vertexAttributeDescriptionCount = static_cast<uint32_t>(vertices.attributeDescriptions.size());
|
||||||
|
vertices.inputState.pVertexAttributeDescriptions = vertices.attributeDescriptions.data();
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorPool()
|
||||||
|
{
|
||||||
|
std::vector<VkDescriptorPoolSize> poolSizes =
|
||||||
|
{
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1), // Vertex shader UBO
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1), // Sampled image
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_SAMPLER, 3), // 3 samplers (array)
|
||||||
|
};
|
||||||
|
|
||||||
|
VkDescriptorPoolCreateInfo descriptorPoolInfo =
|
||||||
|
vkTools::initializers::descriptorPoolCreateInfo(
|
||||||
|
static_cast<uint32_t>(poolSizes.size()),
|
||||||
|
poolSizes.data(),
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorSetLayout()
|
||||||
|
{
|
||||||
|
std::vector<VkDescriptorSetLayoutBinding> setLayoutBindings;
|
||||||
|
|
||||||
|
// Binding 0: Vertex shader uniform buffer
|
||||||
|
setLayoutBindings.push_back(vkTools::initializers::descriptorSetLayoutBinding(
|
||||||
|
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||||
|
VK_SHADER_STAGE_VERTEX_BIT,
|
||||||
|
0));
|
||||||
|
|
||||||
|
// Binding 1: Sampled image
|
||||||
|
setLayoutBindings.push_back(vkTools::initializers::descriptorSetLayoutBinding(
|
||||||
|
VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
|
||||||
|
VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||||
|
1));
|
||||||
|
|
||||||
|
// Binding 2: Sampler array (3 descriptors)
|
||||||
|
setLayoutBindings.push_back(vkTools::initializers::descriptorSetLayoutBinding(
|
||||||
|
VK_DESCRIPTOR_TYPE_SAMPLER,
|
||||||
|
VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||||
|
2,
|
||||||
|
3));
|
||||||
|
|
||||||
|
VkDescriptorSetLayoutCreateInfo descriptorLayout =
|
||||||
|
vkTools::initializers::descriptorSetLayoutCreateInfo(
|
||||||
|
setLayoutBindings.data(),
|
||||||
|
static_cast<uint32_t>(setLayoutBindings.size()));
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout));
|
||||||
|
|
||||||
|
VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo =
|
||||||
|
vkTools::initializers::pipelineLayoutCreateInfo(
|
||||||
|
&descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayout));
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorSet()
|
||||||
|
{
|
||||||
|
VkDescriptorSetAllocateInfo allocInfo =
|
||||||
|
vkTools::initializers::descriptorSetAllocateInfo(
|
||||||
|
descriptorPool,
|
||||||
|
&descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSet));
|
||||||
|
|
||||||
|
std::vector<VkWriteDescriptorSet> writeDescriptorSets;
|
||||||
|
|
||||||
|
// Binding 0: Vertex shader uniform buffer
|
||||||
|
writeDescriptorSets.push_back(vkTools::initializers::writeDescriptorSet(
|
||||||
|
descriptorSet,
|
||||||
|
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||||
|
0,
|
||||||
|
&uniformBufferVS.descriptor));
|
||||||
|
|
||||||
|
// Binding 1: Sampled image
|
||||||
|
VkDescriptorImageInfo texDescriptor = vkTools::initializers::descriptorImageInfo(VK_NULL_HANDLE, texture.view, VK_IMAGE_LAYOUT_GENERAL);
|
||||||
|
writeDescriptorSets.push_back(vkTools::initializers::writeDescriptorSet(
|
||||||
|
descriptorSet,
|
||||||
|
VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
|
||||||
|
1,
|
||||||
|
&texDescriptor));
|
||||||
|
|
||||||
|
// Binding 2: Sampler array
|
||||||
|
std::vector<VkDescriptorImageInfo> samplerDescriptors;
|
||||||
|
for (auto i = 0; i < samplers.size(); i++)
|
||||||
|
{
|
||||||
|
samplerDescriptors.push_back(vkTools::initializers::descriptorImageInfo(samplers[i], VK_NULL_HANDLE, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL));
|
||||||
|
}
|
||||||
|
VkWriteDescriptorSet samplerDescriptorWrite{};
|
||||||
|
samplerDescriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
|
||||||
|
samplerDescriptorWrite.dstSet = descriptorSet;
|
||||||
|
samplerDescriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
|
||||||
|
samplerDescriptorWrite.descriptorCount = static_cast<uint32_t>(samplerDescriptors.size());
|
||||||
|
samplerDescriptorWrite.pImageInfo = samplerDescriptors.data();
|
||||||
|
samplerDescriptorWrite.dstBinding = 2;
|
||||||
|
samplerDescriptorWrite.dstArrayElement = 0;
|
||||||
|
writeDescriptorSets.push_back(samplerDescriptorWrite);
|
||||||
|
|
||||||
|
vkUpdateDescriptorSets(device, static_cast<uint32_t>(writeDescriptorSets.size()), writeDescriptorSets.data(), 0, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void preparePipelines()
|
||||||
|
{
|
||||||
|
VkPipelineInputAssemblyStateCreateInfo inputAssemblyState =
|
||||||
|
vkTools::initializers::pipelineInputAssemblyStateCreateInfo(
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,
|
||||||
|
0,
|
||||||
|
VK_FALSE);
|
||||||
|
|
||||||
|
VkPipelineRasterizationStateCreateInfo rasterizationState =
|
||||||
|
vkTools::initializers::pipelineRasterizationStateCreateInfo(
|
||||||
|
VK_POLYGON_MODE_FILL,
|
||||||
|
VK_CULL_MODE_BACK_BIT,
|
||||||
|
VK_FRONT_FACE_COUNTER_CLOCKWISE,
|
||||||
|
0);
|
||||||
|
|
||||||
|
VkPipelineColorBlendAttachmentState blendAttachmentState =
|
||||||
|
vkTools::initializers::pipelineColorBlendAttachmentState(
|
||||||
|
0xf,
|
||||||
|
VK_FALSE);
|
||||||
|
|
||||||
|
VkPipelineColorBlendStateCreateInfo colorBlendState =
|
||||||
|
vkTools::initializers::pipelineColorBlendStateCreateInfo(
|
||||||
|
1,
|
||||||
|
&blendAttachmentState);
|
||||||
|
|
||||||
|
VkPipelineDepthStencilStateCreateInfo depthStencilState =
|
||||||
|
vkTools::initializers::pipelineDepthStencilStateCreateInfo(
|
||||||
|
VK_TRUE,
|
||||||
|
VK_TRUE,
|
||||||
|
VK_COMPARE_OP_LESS_OR_EQUAL);
|
||||||
|
|
||||||
|
VkPipelineViewportStateCreateInfo viewportState =
|
||||||
|
vkTools::initializers::pipelineViewportStateCreateInfo(1, 1, 0);
|
||||||
|
|
||||||
|
VkPipelineMultisampleStateCreateInfo multisampleState =
|
||||||
|
vkTools::initializers::pipelineMultisampleStateCreateInfo(
|
||||||
|
VK_SAMPLE_COUNT_1_BIT,
|
||||||
|
0);
|
||||||
|
|
||||||
|
std::vector<VkDynamicState> dynamicStateEnables = {
|
||||||
|
VK_DYNAMIC_STATE_VIEWPORT,
|
||||||
|
VK_DYNAMIC_STATE_SCISSOR
|
||||||
|
};
|
||||||
|
VkPipelineDynamicStateCreateInfo dynamicState =
|
||||||
|
vkTools::initializers::pipelineDynamicStateCreateInfo(
|
||||||
|
dynamicStateEnables.data(),
|
||||||
|
static_cast<uint32_t>(dynamicStateEnables.size()),
|
||||||
|
0);
|
||||||
|
|
||||||
|
// Load shaders
|
||||||
|
std::array<VkPipelineShaderStageCreateInfo,2> shaderStages;
|
||||||
|
|
||||||
|
shaderStages[0] = loadShader(getAssetPath() + "shaders/texturemipmapgen/texture.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
|
||||||
|
shaderStages[1] = loadShader(getAssetPath() + "shaders/texturemipmapgen/texture.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||||
|
|
||||||
|
VkGraphicsPipelineCreateInfo pipelineCreateInfo =
|
||||||
|
vkTools::initializers::pipelineCreateInfo(
|
||||||
|
pipelineLayout,
|
||||||
|
renderPass,
|
||||||
|
0);
|
||||||
|
|
||||||
|
pipelineCreateInfo.pVertexInputState = &vertices.inputState;
|
||||||
|
pipelineCreateInfo.pInputAssemblyState = &inputAssemblyState;
|
||||||
|
pipelineCreateInfo.pRasterizationState = &rasterizationState;
|
||||||
|
pipelineCreateInfo.pColorBlendState = &colorBlendState;
|
||||||
|
pipelineCreateInfo.pMultisampleState = &multisampleState;
|
||||||
|
pipelineCreateInfo.pViewportState = &viewportState;
|
||||||
|
pipelineCreateInfo.pDepthStencilState = &depthStencilState;
|
||||||
|
pipelineCreateInfo.pDynamicState = &dynamicState;
|
||||||
|
pipelineCreateInfo.stageCount = static_cast<uint32_t>(shaderStages.size());
|
||||||
|
pipelineCreateInfo.pStages = shaderStages.data();
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.solid));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare and initialize uniform buffer containing shader uniforms
|
||||||
|
void prepareUniformBuffers()
|
||||||
|
{
|
||||||
|
// Vertex shader uniform buffer block
|
||||||
|
VK_CHECK_RESULT(vulkanDevice->createBuffer(
|
||||||
|
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||||
|
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||||
|
&uniformBufferVS,
|
||||||
|
sizeof(uboVS),
|
||||||
|
&uboVS));
|
||||||
|
|
||||||
|
updateUniformBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateUniformBuffers()
|
||||||
|
{
|
||||||
|
uboVS.projection = camera.matrices.perspective;
|
||||||
|
uboVS.view = camera.matrices.view;
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(uniformBufferVS.map());
|
||||||
|
memcpy(uniformBufferVS.mapped, &uboVS, sizeof(uboVS));
|
||||||
|
uniformBufferVS.unmap();
|
||||||
|
}
|
||||||
|
|
||||||
|
void prepare()
|
||||||
|
{
|
||||||
|
VulkanExampleBase::prepare();
|
||||||
|
loadAssets();
|
||||||
|
setupVertexDescriptions();
|
||||||
|
prepareUniformBuffers();
|
||||||
|
setupDescriptorSetLayout();
|
||||||
|
preparePipelines();
|
||||||
|
setupDescriptorPool();
|
||||||
|
setupDescriptorSet();
|
||||||
|
buildCommandBuffers();
|
||||||
|
prepared = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void render()
|
||||||
|
{
|
||||||
|
if (!prepared)
|
||||||
|
return;
|
||||||
|
draw();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void viewChanged()
|
||||||
|
{
|
||||||
|
updateUniformBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
void changeLodBias(float delta)
|
||||||
|
{
|
||||||
|
uboVS.lodBias += delta;
|
||||||
|
if (uboVS.lodBias < 0.0f)
|
||||||
|
{
|
||||||
|
uboVS.lodBias = 0.0f;
|
||||||
|
}
|
||||||
|
if (uboVS.lodBias > texture.mipLevels)
|
||||||
|
{
|
||||||
|
uboVS.lodBias = (float)texture.mipLevels;
|
||||||
|
}
|
||||||
|
updateUniformBuffers();
|
||||||
|
updateTextOverlay();
|
||||||
|
}
|
||||||
|
|
||||||
|
void toggleSampler()
|
||||||
|
{
|
||||||
|
uboVS.samplerIndex = (uboVS.samplerIndex < static_cast<uint32_t>(samplers.size()) - 1) ? uboVS.samplerIndex + 1 : 0;
|
||||||
|
updateUniformBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void keyPressed(uint32_t keyCode)
|
||||||
|
{
|
||||||
|
switch (keyCode)
|
||||||
|
{
|
||||||
|
case KEY_KPADD:
|
||||||
|
case GAMEPAD_BUTTON_R1:
|
||||||
|
changeLodBias(0.1f);
|
||||||
|
break;
|
||||||
|
case KEY_KPSUB:
|
||||||
|
case GAMEPAD_BUTTON_L1:
|
||||||
|
changeLodBias(-0.1f);
|
||||||
|
break;
|
||||||
|
case KEY_F:
|
||||||
|
case GAMEPAD_BUTTON_A:
|
||||||
|
toggleSampler();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void getOverlayText(VulkanTextOverlay *textOverlay)
|
||||||
|
{
|
||||||
|
std::stringstream ss;
|
||||||
|
ss << std::setprecision(2) << std::fixed << uboVS.lodBias;
|
||||||
|
#if defined(__ANDROID__)
|
||||||
|
textOverlay->addText("LOD bias: " + ss.str() + " (Buttons L1/R1 to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft);
|
||||||
|
textOverlay->addText("Sampler: " + samplerNames[uboVS.samplerIndex] + " (\"Button A\" to toggle)", 5.0f, 105.0f, VulkanTextOverlay::alignLeft);
|
||||||
|
#else
|
||||||
|
textOverlay->addText("LOD bias: " + ss.str() + " (numpad +/- to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft);
|
||||||
|
textOverlay->addText("Sampler: " + samplerNames[uboVS.samplerIndex] + " (\"f\" to toggle)", 5.0f, 105.0f, VulkanTextOverlay::alignLeft);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
VULKAN_EXAMPLE_MAIN()
|
||||||
99
texturemipmapgen/texturemipmapgen.vcxproj
Normal file
99
texturemipmapgen/texturemipmapgen.vcxproj
Normal file
|
|
@ -0,0 +1,99 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{24AD09B4-6ABE-4A82-83E7-6A7799A88762}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\bin\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName)</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\bin\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName)</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<AdditionalIncludeDirectories>..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<AdditionalDependencies>..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<AdditionalIncludeDirectories>..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<AdditionalDependencies>..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\base\vulkandebug.cpp" />
|
||||||
|
<ClCompile Include="..\base\vulkanexamplebase.cpp" />
|
||||||
|
<ClCompile Include="..\base\vulkantools.cpp" />
|
||||||
|
<ClCompile Include="texturemipmapgen.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\base\vulkandebug.h" />
|
||||||
|
<ClInclude Include="..\base\vulkanexamplebase.h" />
|
||||||
|
<ClInclude Include="..\base\vulkantools.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\data\shaders\texturemipmapgen\texture.frag" />
|
||||||
|
<None Include="..\data\shaders\texturemipmapgen\texture.vert" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
53
texturemipmapgen/texturemipmapgen.vcxproj.filters
Normal file
53
texturemipmapgen/texturemipmapgen.vcxproj.filters
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Shaders">
|
||||||
|
<UniqueIdentifier>{abe06c5e-339d-4f7b-b3c6-186a7240f658}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\base\vulkandebug.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\base\vulkanexamplebase.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\base\vulkantools.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="texturemipmapgen.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\base\vulkandebug.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\base\vulkanexamplebase.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\base\vulkantools.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\data\shaders\texturemipmapgen\texture.frag">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\data\shaders\texturemipmapgen\texture.vert">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 14
|
# Visual Studio 14
|
||||||
VisualStudioVersion = 14.0.24720.0
|
VisualStudioVersion = 14.0.25420.1
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tessellation", "tessellation\tessellation.vcxproj", "{015C3F70-FFCE-45DA-80E0-5DED015868D7}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tessellation", "tessellation\tessellation.vcxproj", "{015C3F70-FFCE-45DA-80E0-5DED015868D7}"
|
||||||
EndProject
|
EndProject
|
||||||
|
|
@ -97,6 +97,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indirectdraw", "indirectdraw\indirectdraw.vcxproj", "{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indirectdraw", "indirectdraw\indirectdraw.vcxproj", "{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texturemipmapgen", "texturemipmapgen\texturemipmapgen.vcxproj", "{24AD09B4-6ABE-4A82-83E7-6A7799A88762}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
|
@ -247,6 +249,10 @@ Global
|
||||||
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Debug|x64.Build.0 = Debug|x64
|
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Debug|x64.Build.0 = Debug|x64
|
||||||
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.ActiveCfg = Release|x64
|
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.ActiveCfg = Release|x64
|
||||||
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.Build.0 = Release|x64
|
{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.Build.0 = Release|x64
|
||||||
|
{24AD09B4-6ABE-4A82-83E7-6A7799A88762}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{24AD09B4-6ABE-4A82-83E7-6A7799A88762}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{24AD09B4-6ABE-4A82-83E7-6A7799A88762}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{24AD09B4-6ABE-4A82-83E7-6A7799A88762}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue