supported half_float and 8bit unorm format at first_triangle example.

This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-02-21 18:35:08 +08:00
parent 2fb443bcb4
commit f990539633
4 changed files with 62 additions and 15 deletions

View File

@ -3,6 +3,7 @@
#include"VulkanAppFramework.h" #include"VulkanAppFramework.h"
#include<hgl/math/Math.h> #include<hgl/math/Math.h>
#include<hgl/math/HalfFloat.h>
#include<hgl/filesystem/FileSystem.h> #include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/SceneInfo.h> #include<hgl/graph/SceneInfo.h>
@ -14,19 +15,47 @@ constexpr uint32_t SCREEN_HEIGHT=720;
constexpr uint32_t VERTEX_COUNT=3; constexpr uint32_t VERTEX_COUNT=3;
constexpr float position_data[VERTEX_COUNT][2]= constexpr float position_data_float[VERTEX_COUNT*2]=
{ {
{ 0.0, -0.5}, 0.0, -0.5,
{-0.5, 0.5}, -0.5, 0.5,
{ 0.5, 0.5} 0.5, 0.5
}; };
constexpr float color_data[VERTEX_COUNT][4]= #define USE_HALF_FLOAT_POSITION
{ {1,0,0,1},
{0,1,0,1}, #ifdef USE_HALF_FLOAT_POSITION
{0,0,1,1} constexpr VkFormat PositionFormat=VF_V2HF;
half_float position_data_hf[VERTEX_COUNT*2];
#define position_data position_data_hf
#else
constexpr VkFormat PositionFormat=VF_V2F;
#define position_data position_data_float
#endif//USE_HALF_FLOAT_POSITION
#define USE_UNORM8_COLOR
#ifdef USE_UNORM8_COLOR
constexpr uint8 color_data[VERTEX_COUNT*4]=
{ 255,0,0,255,
0,255,0,255,
0,0,255,255
}; };
constexpr VkFormat ColorFormat=VF_V4UN8;
#else
constexpr float color_data[VERTEX_COUNT*4]=
{ 1,0,0,1,
0,1,0,1,
0,0,1,1
};
constexpr VkFormat ColorFormat=VF_V4F;
#endif//USE_UNORM8_COLOR
class TestApp:public VulkanApplicationFramework class TestApp:public VulkanApplicationFramework
{ {
private: private:
@ -40,7 +69,21 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
#if defined(USE_HALF_FLOAT_POSITION)||defined(USE_UNORM8_COLOR)
VILConfig vil_config;
#ifdef USE_HALF_FLOAT_POSITION
vil_config.Add(VAN::Position,PositionFormat);
#endif//USE_HALF_FLOAT_POSITION
#ifdef USE_UNORM8_COLOR
vil_config.Add(VAN::Color,ColorFormat);
#endif//USE_HALF_FLOAT_POSITION
material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2DNDC"),&vil_config);
#else
material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2DNDC")); material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2DNDC"));
#endif//
if(!material_instance) if(!material_instance)
return(false); return(false);
@ -56,8 +99,12 @@ private:
Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!primitive)return(false); if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); #ifdef USE_HALF_FLOAT_POSITION
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false); Float32toFloat16(position_data_hf,position_data_float,VERTEX_COUNT*2);
#endif//USE_HALF_FLOAT_POSITION
if(!primitive->Set(VAN::Position, db->CreateVBO(PositionFormat, VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(ColorFormat, VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline); render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(render_obj); return(render_obj);